Skip to content

Commit d76b326

Browse files
committed
Merge branch 'master' into assisted-vision-frontend
2 parents 50334b5 + b3c1d88 commit d76b326

30 files changed

Lines changed: 1851 additions & 1651 deletions

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ updates:
1818
dependency-type: "production"
1919
development-dependencies:
2020
dependency-type: "development"
21+
ignore:
22+
- dependency-name: "typescript"
23+
versions: [ ">=6.0.0" ]
2124

2225
- package-ecosystem: composer
2326
directory: /
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: "Copilot Setup Steps"
2+
3+
# Automatically run the setup steps when they are changed to allow for easy validation, and
4+
# allow manual testing through the repository's "Actions" tab
5+
on:
6+
workflow_dispatch:
7+
push:
8+
paths:
9+
- .github/workflows/copilot-setup-steps.yml
10+
pull_request:
11+
paths:
12+
- .github/workflows/copilot-setup-steps.yml
13+
14+
jobs:
15+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
16+
copilot-setup-steps:
17+
runs-on: ubuntu-latest
18+
19+
# Set the permissions to the lowest permissions possible needed for your steps.
20+
# Copilot will be given its own token for its operations.
21+
permissions:
22+
# If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission.
23+
# If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
24+
contents: read
25+
26+
# You can define any steps you want, and they will run before the agent starts.
27+
# If you do not check out your code, Copilot will do this for you.
28+
steps:
29+
- name: Setup PHP Action
30+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
31+
with:
32+
php-version: 8.4
33+
extensions: bcmath, curl, dom, gd, imagick, json, libxml, mbstring, pcntl, pdo, pdo_sqlite, pdo_mysql, pdo_pgsql, pgsql, sqlite3, zip
34+
coverage: xdebug
35+
tools: pecl, composer
36+
37+
- name: Checkout code
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
40+
- name: Install Php dependencies
41+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
42+
43+
- name: Use Node.js
44+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
45+
with:
46+
node-version: 22
47+
48+
- name: Install Js dependencies
49+
run: npm ci -D
50+
51+
- name: Set up uv
52+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
53+
with:
54+
enable-cache: true
55+
56+
# - name: Install Python dependencies
57+
# run: uv sync --frozen

.github/workflows/php_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ jobs:
115115
run: php artisan migrate:rollback
116116

117117
- name: Codecov
118-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
118+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
119119
env:
120120
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

app/Actions/RSS/Generate.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use App\Services\UrlGenerator;
2121
use Carbon\Exceptions\InvalidFormatException;
2222
use Carbon\Exceptions\UnitException;
23+
use GrahamCampbell\Markdown\Facades\Markdown;
2324
use Illuminate\Contracts\Container\BindingResolutionException;
2425
use Illuminate\Support\Carbon;
2526
use Illuminate\Support\Collection;
@@ -54,7 +55,7 @@ private function toFeedItem(object $data): FeedItem
5455
$feed_item = [
5556
'id' => $page_link,
5657
'title' => $data->title,
57-
'summary' => $data->description ?? '',
58+
'summary' => Markdown::convert($data->description ?? '')->getContent(),
5859
'updated' => $this->asDateTime($data->updated_at),
5960
'link' => $page_link,
6061
'enclosure' => $this->url_generator->pathToUrl($data->short_path, $data->storage_disk, SizeVariantType::ORIGINAL),

app/Console/Commands/FixTree.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use App\Models\Album;
1212
use Illuminate\Console\Command;
13+
use Illuminate\Database\Eloquent\Model;
1314

1415
class FixTree extends Command
1516
{
@@ -54,7 +55,11 @@ public function handle(): int
5455
}
5556

5657
$this->line('Found ' . $total_errors . ' errors.');
58+
// Normally we would not want that.
59+
// But here we need to disable strict mode to be able to fix the tree.
60+
Model::shouldBeStrict(false);
5761
$fixed_nodes = $query->fixTree();
62+
Model::shouldBeStrict(true);
5863
$this->line('Fixed ' . $fixed_nodes . ' nodes.');
5964

6065
return 0;

composer.lock

Lines changed: 21 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
/**
4+
* SPDX-License-Identifier: MIT
5+
* Copyright (c) 2017-2018 Tobias Reich
6+
* Copyright (c) 2018-2026 LycheeOrg.
7+
*/
8+
9+
use Illuminate\Database\Migrations\Migration;
10+
use Illuminate\Support\Facades\Artisan;
11+
use Illuminate\Support\Facades\DB;
12+
use Symfony\Component\Console\Output\ConsoleOutput;
13+
use Symfony\Component\Console\Output\ConsoleSectionOutput;
14+
15+
return new class() extends Migration {
16+
private ConsoleOutput $output;
17+
private ConsoleSectionOutput $msg_section;
18+
19+
public function __construct()
20+
{
21+
$this->output = new ConsoleOutput();
22+
$this->msg_section = $this->output->section();
23+
}
24+
25+
/**
26+
* Run the migrations.
27+
*
28+
* @return void
29+
*/
30+
public function up(): void
31+
{
32+
DB::table('configs')->where('key', 'version')->update(['value' => '070503']);
33+
try {
34+
Artisan::call('cache:clear');
35+
} catch (\Throwable $e) {
36+
$this->msg_section->writeln('<error>Warning:</error> Failed to clear cache for version 7.5.3');
37+
38+
return;
39+
}
40+
$this->msg_section->writeln('<info>Info:</info> Cleared cache for version 7.5.3');
41+
}
42+
43+
/**
44+
* Reverse the migrations.
45+
*
46+
* @return void
47+
*/
48+
public function down(): void
49+
{
50+
DB::table('configs')->where('key', 'version')->update(['value' => '070502']);
51+
}
52+
};

lang/de/aspect_ratio.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
| Aspect Ratio lines.
66
|--------------------------------------------------------------------------
77
*/
8-
'5by4' => '5/4 (instagram Querformat)',
9-
'4by5' => '4/5 (instagram Portrait)',
8+
'5by4' => '5/4 (Instagram Querformat)',
9+
'4by5' => '4/5 (Instagram Portrait)',
1010
'2by3' => '2/3 (Portrait)',
1111
'3by2' => '3/2 (Querformat)',
1212
'1by1' => 'Quadrat',

0 commit comments

Comments
 (0)