Merge pull request #5850 from pixelfed/staging

Staging

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.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"
+        ],
         "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
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1a540edf20e887435191171ce89d190c",
+    "content-hash": "5ae05d16c496cc43cf1393f0340714e2",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.342.0",
+            "version": "3.342.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd"
+                "reference": "65cc842b9998d415b05d635b6146d0728934ff4a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
-                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/65cc842b9998d415b05d635b6146d0728934ff4a",
+                "reference": "65cc842b9998d415b05d635b6146d0728934ff4a",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.4"
             },
-            "time": "2025-03-05T19:20:14+00:00"
+            "time": "2025-03-11T18:27:07+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1289,16 +1289,16 @@
         },
         {
             "name": "endroid/qr-code",
-            "version": "6.0.4",
+            "version": "6.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/endroid/qr-code.git",
-                "reference": "74b62f4aba2f2ffd30d80bccb10947c04cfe1b98"
+                "reference": "238baddf22500bbfeb2fa1ddc1eb2bd9374a6998"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/endroid/qr-code/zipball/74b62f4aba2f2ffd30d80bccb10947c04cfe1b98",
-                "reference": "74b62f4aba2f2ffd30d80bccb10947c04cfe1b98",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/238baddf22500bbfeb2fa1ddc1eb2bd9374a6998",
+                "reference": "238baddf22500bbfeb2fa1ddc1eb2bd9374a6998",
                 "shasum": ""
             },
             "require": {
@@ -1349,7 +1349,7 @@
             ],
             "support": {
                 "issues": "https://github.com/endroid/qr-code/issues",
-                "source": "https://github.com/endroid/qr-code/tree/6.0.4"
+                "source": "https://github.com/endroid/qr-code/tree/6.0.5"
             },
             "funding": [
                 {
@@ -1357,7 +1357,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-04T12:23:14+00:00"
+            "time": "2025-03-07T08:15:43+00:00"
         },
         {
             "name": "evenement/evenement",
@@ -10979,16 +10979,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.21.0",
+            "version": "v1.21.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "531fa0871fbde719c51b12afa3a443b8f4e4b425"
+                "reference": "c44bffbb2334e90fba560933c45948fa4a3f3e86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/531fa0871fbde719c51b12afa3a443b8f4e4b425",
-                "reference": "531fa0871fbde719c51b12afa3a443b8f4e4b425",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/c44bffbb2334e90fba560933c45948fa4a3f3e86",
+                "reference": "c44bffbb2334e90fba560933c45948fa4a3f3e86",
                 "shasum": ""
             },
             "require": {
@@ -10999,9 +10999,9 @@
                 "php": "^8.2.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.68.5",
-                "illuminate/view": "^11.42.0",
-                "larastan/larastan": "^3.0.4",
+                "friendsofphp/php-cs-fixer": "^3.70.2",
+                "illuminate/view": "^11.44.1",
+                "larastan/larastan": "^3.1.0",
                 "laravel-zero/framework": "^11.36.1",
                 "mockery/mockery": "^1.6.12",
                 "nunomaduro/termwind": "^2.3",
@@ -11041,7 +11041,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2025-02-18T03:18:57+00:00"
+            "time": "2025-03-11T03:22:21+00:00"
         },
         {
             "name": "laravel/telescope",
@@ -11796,16 +11796,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.11",
+            "version": "11.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3946ac38410be7440186c6e74584f31b15107fc7"
+                "reference": "d42785840519401ed2113292263795eb4c0f95da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3946ac38410be7440186c6e74584f31b15107fc7",
-                "reference": "3946ac38410be7440186c6e74584f31b15107fc7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da",
+                "reference": "d42785840519401ed2113292263795eb4c0f95da",
                 "shasum": ""
             },
             "require": {
@@ -11826,7 +11826,7 @@
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.2",
-                "sebastian/comparator": "^6.3.0",
+                "sebastian/comparator": "^6.3.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
@@ -11877,7 +11877,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.11"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12"
             },
             "funding": [
                 {
@@ -11893,7 +11893,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-05T07:36:02+00:00"
+            "time": "2025-03-07T07:31:03+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -12067,16 +12067,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.3.0",
+            "version": "6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
+                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
-                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
+                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
                 "shasum": ""
             },
             "require": {
@@ -12095,7 +12095,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.2-dev"
+                    "dev-main": "6.3-dev"
                 }
             },
             "autoload": {
@@ -12135,7 +12135,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1"
             },
             "funding": [
                 {
@@ -12143,7 +12143,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-06T10:28:19+00:00"
+            "time": "2025-03-07T06:57:01+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -12930,7 +12930,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.2|^8.3",
+        "php": "^8.2|^8.3|^8.4",
         "ext-bcmath": "*",
         "ext-ctype": "*",
         "ext-curl": "*",

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",

public/js/vendor.js.LICENSE.txt

@@ -158,6 +158,8 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
+/*! Axios v1.8.2 Copyright (c) 2025 Matt Zabriskie and contributors */
+
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

resources/assets/components/Post.vue

@@ -203,6 +203,9 @@
                     this.post = res.data;
                     this.media = this.post.media_attachments;
                     this.profile = this.post.account;
+                    if(res.data.account && res.data.account.local) {
+                        window.history.pushState({}, '', `/p/${res.data.account.acct}/${res.data.id}`);
+                    }
                     if(this.post.in_reply_to_id) {
                         this.fetchReply();
                     } else {

resources/assets/components/Profile.vue

@@ -131,6 +131,9 @@
                     // this.fetchPosts();
                     // this.isLoaded = true;
                     this.fetchRelationship();
+                    if(this.cachedProfile && this.cachedProfile.local) {
+                        window.history.pushState({}, '', `/${this.cachedProfile.acct}`);
+                    }
                 } else {
                     this.curUser = window._sharedData.user;
                     this.fetchProfile();
@@ -164,6 +167,10 @@
                         this.owner = false;
                         this.fetchRelationship();
                     }
+
+                    if(res.data && res.data.local) {
+                        window.history.pushState({}, '', `/${res.data.acct}`);
+                    }
                 })
                 .catch(err => {
                     this.$router.push('/i/web/404');

resources/assets/js/components/CollectionComponent.vue

@@ -49,7 +49,7 @@
 							</span>
 							<span>·</span>
 						</span>
-						<span>{{collection.post_count}} photos</span>
+						<span>{{collection.post_count}} posts</span>
 						<span>·</span>
 						<span>by <a :href="'/' + profileUsername" class="font-weight-bold text-white">{{profileUsername}}</a></span>
 					</p>