From 9a89a2b751be2711926fd0a381c2ccf8a3b32839 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 2 Dec 2022 02:30:19 -0700 Subject: [PATCH 1/3] Update AP helpers --- app/Util/ActivityPub/Helpers.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 1516478d0..d49ff0cdd 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -496,7 +496,8 @@ class Helpers { $status->in_reply_to_id === null && $status->reblog_of_id === null && in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) && - $status->created_at->gt(now()->subHours(config('instance.timeline.network.max_hours_old'))) + $status->created_at->gt(now()->subHours(config('instance.timeline.network.max_hours_old'))) && + (config('instance.hide_nsfw_on_public_feeds') == true ? $status->is_nsfw == false : true) ) { NetworkTimelineService::add($status->id); } @@ -544,7 +545,7 @@ class Helpers { public static function getScope($activity, $url) { $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url); - $url = isset($activity['url']) ? self::pluckval($activity['url']) : $id; + $url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id); $urlDomain = parse_url($url, PHP_URL_HOST); $scope = 'private'; From 02edd19d4d875956ae20251a2f0fbb200dd13f82 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 2 Dec 2022 02:45:35 -0700 Subject: [PATCH 2/3] Update Avatar pipeline, fix cloud storage media_path --- app/Console/Commands/AvatarStorage.php | 4 ++-- app/Jobs/AvatarPipeline/AvatarOptimize.php | 3 ++- app/Services/MediaStorageService.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/AvatarStorage.php b/app/Console/Commands/AvatarStorage.php index 4ebbc26d8..054802f42 100644 --- a/app/Console/Commands/AvatarStorage.php +++ b/app/Console/Commands/AvatarStorage.php @@ -196,8 +196,8 @@ class AvatarStorage extends Command continue; } $newMediaPath = $disk->put($newPath, $existing); - $avatar->media_path = $newMediaPath; - $avatar->cdn_url = $disk->url($newMediaPath); + $avatar->media_path = $newPath; + $avatar->cdn_url = $disk->url($newPath); $avatar->save(); } diff --git a/app/Jobs/AvatarPipeline/AvatarOptimize.php b/app/Jobs/AvatarPipeline/AvatarOptimize.php index cae4456e8..4464dff4e 100644 --- a/app/Jobs/AvatarPipeline/AvatarOptimize.php +++ b/app/Jobs/AvatarPipeline/AvatarOptimize.php @@ -93,8 +93,9 @@ class AvatarOptimize implements ShouldQueue $base = 'cache/avatars/' . $avatar->profile_id; $disk = Storage::disk(config('filesystems.cloud')); $disk->deleteDirectory($base); - $path = $base . '/' . 'a' . strtolower(Str::random(random_int(3,6))) . $avatar->change_count . '.' . pathinfo($avatar->media_path, PATHINFO_EXTENSION); + $path = $base . '/' . 'avatar_' . strtolower(Str::random(random_int(3,6))) . $avatar->change_count . '.' . pathinfo($avatar->media_path, PATHINFO_EXTENSION); $url = $disk->put($path, Storage::get($avatar->media_path)); + $avatar->media_path = $path; $avatar->cdn_url = $disk->url($path); $avatar->save(); Storage::delete($avatar->media_path); diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php index 8dd8319e7..016700d0c 100644 --- a/app/Services/MediaStorageService.php +++ b/app/Services/MediaStorageService.php @@ -229,7 +229,7 @@ class MediaStorageService { $base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id; $ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png'; - $path = Str::random(20) . '_avatar.' . $ext; + $path = 'avatar_' . strtolower(Str::random(random_int(3,6))) . '.' . $ext; $tmpBase = storage_path('app/remcache/'); $tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path; $tmpName = $tmpBase . $tmpPath; From 253d5a9a6ba7a6ca5404e820077307cb97d3b271 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 2 Dec 2022 02:46:38 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed278567..73a944328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Refactor AvatarStorage to support migrating avatars to cloud storage, fix remote avatar refetching and merge AvatarSync commands and add deprecation notice to avatar:sync command ([223aea47](https://github.com/pixelfed/pixelfed/commit/223aea47)) - Update AvatarStorage, improve overview calculations ([733b9fd0](https://github.com/pixelfed/pixelfed/commit/733b9fd0)) - Update filesystem config, fix DO Spaces root default ([720b6eb3](https://github.com/pixelfed/pixelfed/commit/720b6eb3)) +- Update Avatar pipeline, fix cloud storage media_path ([02edd19d](https://github.com/pixelfed/pixelfed/commit/02edd19d)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)