Merge branch 'staging' into translate-notifications

CHANGELOG.md

@@ -48,6 +48,9 @@
 - Update CuratedOnboarding, add new app:curated-onboarding command, extend email verification window to 7 days and fix resend verification mails ([49604210](https://github.com/pixelfed/pixelfed/commit/49604210))
 - Update DirectMessageController, fix performance issue ([4ec9f99](https://github.com/pixelfed/pixelfed/commit/4ec9f99))
 - Update App Register to expire codes after 4 hours instead of 60 minutes ([0844094b](https://github.com/pixelfed/pixelfed/commit/0844094b))
+- Update ApiV1Controller, fix max_id pagination on home and public timeline feeds ([38e17a06e](https://github.com/pixelfed/pixelfed/commit/38e17a06e))
+- Update Post component, rewrite local post urls ([d2f2a1b1c](https://github.com/pixelfed/pixelfed/commit/d2f2a1b1c))
+- Update Profile component, rewrite local profile urls ([dfbccaa19](https://github.com/pixelfed/pixelfed/commit/dfbccaa19))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)

README.md

@@ -51,6 +51,12 @@ Discovery](https://nlnet.nl/discovery/), part of the [Next Generation
 Internet](https://ngi.eu) initiative.
 
 <p>This project is supported by:</p>
+<p>
+  <a href="https://www.fastly.com/fast-forward">
+    <img src="https://github.com/user-attachments/assets/f1499b1f-c05f-480a-a5d5-dbebcb0e20fd">
+  </a>
+</p>
+
 <p>
   <a href="https://www.digitalocean.com/?utm_medium=opensource&utm_source=pixelfed">
     <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">

app/Http/Controllers/Api/ApiV1Controller.php

@@ -2554,7 +2554,7 @@ class ApiV1Controller extends Controller
                 $minId = null;
             }
 
-            if ($maxId) {
+            if ($maxId && $res->count() >= $limit) {
                 $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
             }
 
@@ -2977,7 +2977,7 @@ class ApiV1Controller extends Controller
             $minId = null;
         }
 
-        if ($maxId) {
+        if ($maxId && $res->count() >= $limit) {
             $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
         }
 

app/Services/LikeService.php

@@ -79,13 +79,13 @@ class LikeService {
 
 		$res = Cache::remember('pf:services:likes:liked_by:' . $status->id, 86400, function() use($status, $empty) {
 			$like = Like::whereStatusId($status->id)->first();
-			if(!$like) {
+			if(!$like || !$like->profile_id) {
 				return $empty;
 			}
 			$id = $like->profile_id;
-			$profile = ProfileService::get($id, true);
+			$profile = AccountService::get($id, true);
 			if(!$profile) {
-				return [];
+				return $empty;
 			}
 			$profileUrl = "/i/web/profile/{$profile['id']}";
 			$res = [

composer.json

@@ -1,105 +1,105 @@
 {
-	"name": "pixelfed/pixelfed",
-	"description": "Open and ethical photo sharing platform, powered by ActivityPub federation.",
-	"keywords": ["framework", "laravel", "pixelfed", "activitypub", "social", "network", "federation"],
-	"license": "AGPL-3.0-only",
-	"type": "project",
-	"require": {
-		"php": "^8.2|^8.3",
-		"ext-bcmath": "*",
-		"ext-ctype": "*",
-		"ext-curl": "*",
-		"ext-intl": "*",
-		"ext-json": "*",
-		"ext-mbstring": "*",
-		"ext-openssl": "*",
-		"bacon/bacon-qr-code": "^3.0",
-		"brick/math": "^0.9.3",
-		"buzz/laravel-h-captcha": "^1.0.4",
-		"doctrine/dbal": "^3.0",
-		"endroid/qr-code": "^6.0",
-		"intervention/image": "^2.4",
-		"jenssegers/agent": "^2.6",
-		"laravel-notification-channels/expo": "~1.3.0|~2.0.0",
-		"laravel-notification-channels/webpush": "^8.0",
-		"laravel/framework": "^11.0",
-		"laravel/helpers": "^1.1",
-		"laravel/horizon": "^5.0",
-		"laravel/passport": "^12.0",
-		"laravel/pulse": "^1.3",
-		"laravel/tinker": "^2.9",
-		"laravel/ui": "^4.2",
-		"league/flysystem-aws-s3-v3": "^3.0",
-		"league/iso3166": "^2.1|^4.0",
-		"league/uri": "^7.4",
-		"pbmedia/laravel-ffmpeg": "^8.0",
-		"phpseclib/phpseclib": "~2.0",
-		"pixelfed/fractal": "^0.18.0",
-		"pixelfed/laravel-snowflake": "^2.0",
-		"pragmarx/google2fa": "^8.0",
-		"predis/predis": "^2.0",
-		"pusher/pusher-php-server": "^7.2",
-		"resend/resend-php": "^0.13.0",
-		"spatie/laravel-backup": "^8.0.0",
-		"spatie/laravel-image-optimizer": "^1.8.0",
-		"stevebauman/purify": "^6.2.0",
-		"symfony/http-client": "^6.1",
-		"symfony/mailgun-mailer": "^6.1"
-	},
-	"require-dev": {
-		"fakerphp/faker": "^1.23",
-		"laravel/pint": "^1.13",
-		"laravel/telescope": "^5.0",
-		"mockery/mockery": "^1.6",
-		"nunomaduro/collision": "^8.1",
-		"phpunit/phpunit": "^11.0.1"
-	},
-	"autoload": {
-		"classmap": [
-			"database/seeds",
-			"database/factories"
-		],
-		"psr-4": {
-			"App\\": "app/"
-		},
-		"files": [
-			"app/helpers.php"
-		]
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Tests\\": "tests/"
-		},
-		"files": [
-			"app/helpers.php"
-		]
-	},
-	"extra": {
-		"laravel": {
-			"dont-discover": [
-				"laravel/passport"
-			]
-		}
-	},
-	"scripts": {
-		"post-root-package-install": [
-			"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-		],
-		"post-create-project-cmd": [
-			"@php artisan key:generate --ansi"
-		],
+    "name": "pixelfed/pixelfed",
+    "description": "Open and ethical photo sharing platform, powered by ActivityPub federation.",
+    "keywords": ["framework", "laravel", "pixelfed", "activitypub", "social", "network", "federation"],
+    "license": "AGPL-3.0-only",
+    "type": "project",
+    "require": {
+        "php": "^8.2|^8.3|^8.4",
+        "ext-bcmath": "*",
+        "ext-ctype": "*",
+        "ext-curl": "*",
+        "ext-intl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "bacon/bacon-qr-code": "^3.0",
+        "brick/math": "^0.11",
+        "buzz/laravel-h-captcha": "^1.0.4",
+        "doctrine/dbal": "^3.0",
+        "endroid/qr-code": "^6.0",
+        "intervention/image": "^2.4",
+        "jenssegers/agent": "^2.6",
+        "laravel-notification-channels/expo": "^2.0.0",
+        "laravel-notification-channels/webpush": "^10.2",
+        "laravel/framework": "^12.0",
+        "laravel/helpers": "^1.1",
+        "laravel/horizon": "^5.0",
+        "laravel/passport": "^12.0",
+        "laravel/pulse": "^1.3",
+        "laravel/tinker": "^2.9",
+        "laravel/ui": "^4.2",
+        "league/flysystem-aws-s3-v3": "^3.0",
+        "league/iso3166": "^2.1|^4.0",
+        "league/uri": "^7.4",
+        "pbmedia/laravel-ffmpeg": "^8.0",
+        "phpseclib/phpseclib": "~2.0",
+        "pixelfed/fractal": "^0.18.0",
+        "pixelfed/laravel-snowflake": "^2.0",
+        "pragmarx/google2fa": "^8.0",
+        "predis/predis": "^2.0",
+        "pusher/pusher-php-server": "^7.2",
+        "resend/resend-php": "^0.13.0",
+        "spatie/laravel-backup": "^9.2.9",
+        "spatie/laravel-image-optimizer": "^1.8.2",
+        "stevebauman/purify": "^6.2.0",
+        "symfony/http-client": "^6.1",
+        "symfony/mailgun-mailer": "^6.1"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.23",
+        "laravel/pint": "^1.13",
+        "laravel/telescope": "^5.5",
+        "mockery/mockery": "^1.6",
+        "nunomaduro/collision": "^8.1",
+        "phpunit/phpunit": "^11.0.1"
+    },
+    "autoload": {
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ],
+        "psr-4": {
+            "App\\": "app/"
+        },
+        "files": [
+            "app/helpers.php"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        },
+        "files": [
+            "app/helpers.php"
+        ]
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": [
+                "laravel/passport"
+            ]
+        }
+    },
+    "scripts": {
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ],
         "post-update-cmd": [
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
-		"post-autoload-dump": [
-			"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-			"@php artisan package:discover --ansi"
-		]
-	},
-	"config": {
-		"preferred-install": "dist",
-		"sort-packages": true,
-		"optimize-autoloader": true
-	},
-	"prefer-stable": true
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ]
+    },
+    "config": {
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "optimize-autoloader": true
+    },
+    "prefer-stable": true
 }

config/backup.php

@@ -152,7 +152,7 @@ return [
         'notifiable' => \Spatie\Backup\Notifications\Notifiable::class,
 
         'mail' => [
-            'to' => env('BACKUP_EMAIL_ADDRESS', ''),
+            'to' => env('BACKUP_EMAIL_ADDRESS', 'noreply@example.com'),
 
             'from' => [
                 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),

config/filesystems.php

@@ -53,7 +53,7 @@ return [
                 ],
                 'dir' => [
                     'public' => 0755,
-                    'private' => 0700,
+                    'private' => 0711,
                 ],
             ],
         ],

package.json

@@ -13,6 +13,7 @@
 		"axios": ">=1.6.0",
 		"bootstrap": "^4.5.2",
 		"cross-env": "^5.2.1",
+		"esbuild": "^0.25.1",
 		"jquery": "^3.6.0",
 		"laravel-echo": "^1.12.0",
 		"laravel-mix-make-file-hash": "^2.2.0",