diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a9a4bca..d9d3a5630 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ - Update filesystems, store all files as public by default and add default permissions. Fixes #4273, #4275. Closes #3825 ([22da2647](https://github.com/pixelfed/pixelfed/commit/22da2647)) - Update Profile model, fix avatar url path generation. Fixes #4041, Fixes #4031, Fixes #3523 ([28bf8649](https://github.com/pixelfed/pixelfed/commit/28bf8649)) - Update filesystem config, change FILESYSTEM_DRIVER env variable to DANGEROUSLY_SET_FILESYSTEM_DRIVER and remove from default env configs. Changing the default filesystem should be avoided, use FILESYSTEM_CLOUD for s3 support, otherwise you can break things ([573c88d7](https://github.com/pixelfed/pixelfed/commit/573c88d7)) +- Update MediaS3GarbageCollector, fix handle ([2eee36cf](https://github.com/pixelfed/pixelfed/commit/2eee36cf)) +- Update StatusController, allow users to delete replies to posts ([738925c2](https://github.com/pixelfed/pixelfed/commit/738925c2)) +- Update admin autospam/report email templates, remove image previews ([76be49ac](https://github.com/pixelfed/pixelfed/commit/76be49ac)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 087f679e0..4762c3f84 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -219,7 +219,17 @@ class StatusController extends Controller $u->save(); } - if ($status->profile_id == $user->profile->id || $user->is_admin == true) { + if($status->in_reply_to_id) { + $parent = Status::find($status->in_reply_to_id); + if($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) { + Cache::forget('_api:statuses:recent_9:' . $status->profile_id); + Cache::forget('profile:status_count:' . $status->profile_id); + Cache::forget('profile:embed:' . $status->profile_id); + StatusService::del($status->id, true); + Cache::forget('profile:status_count:'.$status->profile_id); + StatusDelete::dispatch($status); + } + } else if ($status->profile_id == $user->profile_id || $user->is_admin == true) { Cache::forget('_api:statuses:recent_9:' . $status->profile_id); Cache::forget('profile:status_count:' . $status->profile_id); Cache::forget('profile:embed:' . $status->profile_id); diff --git a/public/css/landing.css b/public/css/landing.css index 5cfc430f2..f52fd36d9 100644 Binary files a/public/css/landing.css and b/public/css/landing.css differ diff --git a/public/js/daci.chunk.3f13ec9fc49e9d2b.js b/public/js/daci.chunk.3f13ec9fc49e9d2b.js new file mode 100644 index 000000000..42f453e93 Binary files /dev/null and b/public/js/daci.chunk.3f13ec9fc49e9d2b.js differ diff --git a/public/js/daci.chunk.afde7c4a5fcab6df.js b/public/js/daci.chunk.afde7c4a5fcab6df.js deleted file mode 100644 index 7a17f4a6d..000000000 Binary files a/public/js/daci.chunk.afde7c4a5fcab6df.js and /dev/null differ diff --git a/public/js/discover~findfriends.chunk.1aabfedaab1849ba.js b/public/js/discover~findfriends.chunk.1aabfedaab1849ba.js new file mode 100644 index 000000000..6ed8a0034 Binary files /dev/null and b/public/js/discover~findfriends.chunk.1aabfedaab1849ba.js differ diff --git a/public/js/discover~findfriends.chunk.a740588ad1724793.js b/public/js/discover~findfriends.chunk.a740588ad1724793.js deleted file mode 100644 index e7172ef16..000000000 Binary files a/public/js/discover~findfriends.chunk.a740588ad1724793.js and /dev/null differ diff --git a/public/js/discover~memories.chunk.70b04c7698c2172b.js b/public/js/discover~memories.chunk.70b04c7698c2172b.js new file mode 100644 index 000000000..d01487e44 Binary files /dev/null and b/public/js/discover~memories.chunk.70b04c7698c2172b.js differ diff --git a/public/js/discover~memories.chunk.e7d0bff764b64064.js b/public/js/discover~memories.chunk.e7d0bff764b64064.js deleted file mode 100644 index 2bd03b31d..000000000 Binary files a/public/js/discover~memories.chunk.e7d0bff764b64064.js and /dev/null differ diff --git a/public/js/discover~myhashtags.chunk.089b7465b2359979.js b/public/js/discover~myhashtags.chunk.089b7465b2359979.js new file mode 100644 index 000000000..0cc8aeaa4 Binary files /dev/null and b/public/js/discover~myhashtags.chunk.089b7465b2359979.js differ diff --git a/public/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js b/public/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js deleted file mode 100644 index 8b9c0b0c9..000000000 Binary files a/public/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js and /dev/null differ diff --git a/public/js/discover~serverfeed.chunk.cac5527f5b83302b.js b/public/js/discover~serverfeed.chunk.cac5527f5b83302b.js deleted file mode 100644 index 98486fa98..000000000 Binary files a/public/js/discover~serverfeed.chunk.cac5527f5b83302b.js and /dev/null differ diff --git a/public/js/discover~serverfeed.chunk.ff59ca12d08bb810.js b/public/js/discover~serverfeed.chunk.ff59ca12d08bb810.js new file mode 100644 index 000000000..0e7b1f388 Binary files /dev/null and b/public/js/discover~serverfeed.chunk.ff59ca12d08bb810.js differ diff --git a/public/js/discover~settings.chunk.5757ad3940569422.js b/public/js/discover~settings.chunk.5757ad3940569422.js new file mode 100644 index 000000000..1e34fb753 Binary files /dev/null and b/public/js/discover~settings.chunk.5757ad3940569422.js differ diff --git a/public/js/discover~settings.chunk.c7fe4bae81961b13.js b/public/js/discover~settings.chunk.c7fe4bae81961b13.js deleted file mode 100644 index f911d2ab9..000000000 Binary files a/public/js/discover~settings.chunk.c7fe4bae81961b13.js and /dev/null differ diff --git a/public/js/home.chunk.07ca9c4759ba59dd.js b/public/js/home.chunk.07ca9c4759ba59dd.js new file mode 100644 index 000000000..3ac47dbc1 Binary files /dev/null and b/public/js/home.chunk.07ca9c4759ba59dd.js differ diff --git a/public/js/home.chunk.0cd2b4778c793399.js b/public/js/home.chunk.0cd2b4778c793399.js deleted file mode 100644 index 1c3acd4b1..000000000 Binary files a/public/js/home.chunk.0cd2b4778c793399.js and /dev/null differ diff --git a/public/js/manifest.js b/public/js/manifest.js index 86268d7b1..e851ca911 100644 Binary files a/public/js/manifest.js and b/public/js/manifest.js differ diff --git a/public/js/post.chunk.881f8b0a9934e053.js b/public/js/post.chunk.881f8b0a9934e053.js new file mode 100644 index 000000000..370f1459b Binary files /dev/null and b/public/js/post.chunk.881f8b0a9934e053.js differ diff --git a/public/js/post.chunk.c1d1dd0b53c97ee5.js b/public/js/post.chunk.c1d1dd0b53c97ee5.js deleted file mode 100644 index 39b386246..000000000 Binary files a/public/js/post.chunk.c1d1dd0b53c97ee5.js and /dev/null differ diff --git a/public/js/profile.chunk.0f947cc09af5c8c3.js b/public/js/profile.chunk.0f947cc09af5c8c3.js new file mode 100644 index 000000000..a2bdf3278 Binary files /dev/null and b/public/js/profile.chunk.0f947cc09af5c8c3.js differ diff --git a/public/js/profile.chunk.45a990056083f92b.js b/public/js/profile.chunk.45a990056083f92b.js deleted file mode 100644 index 7f4bfffa6..000000000 Binary files a/public/js/profile.chunk.45a990056083f92b.js and /dev/null differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 066b4cafd..fdef32cdc 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/sass/landing.scss b/resources/assets/sass/landing.scss index 11857186a..bcef1a8a7 100644 --- a/resources/assets/sass/landing.scss +++ b/resources/assets/sass/landing.scss @@ -30,7 +30,13 @@ body { span { font-weight: bold; - font-size: 24px; + font-size: 14px; + display: none; + + @include media-breakpoint-up(sm) { + display: block; + font-size: 18px; + } } } diff --git a/resources/views/emails/admin/new_autospam.blade.php b/resources/views/emails/admin/new_autospam.blade.php index 99c226ad6..776657f61 100644 --- a/resources/views/emails/admin/new_autospam.blade.php +++ b/resources/views/emails/admin/new_autospam.blade.php @@ -13,20 +13,6 @@ Review Autospam Report

Reported Status

-@if( - isset($reported_status['media_attachments']) && - isset($reported_status['pf_type']) && - count($reported_status['media_attachments']) && - in_array($reported_status['pf_type'], ['photo', 'photo:album']) -) -Media preview -@endif @if(isset($reported_status['content']))
{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}
@endif diff --git a/resources/views/emails/admin/new_report.blade.php b/resources/views/emails/admin/new_report.blade.php index 3d4d0da5c..4b43c0d2a 100644 --- a/resources/views/emails/admin/new_report.blade.php +++ b/resources/views/emails/admin/new_report.blade.php @@ -11,20 +11,6 @@ View Report

Reported Status

-@if( - isset($reported_status['media_attachments']) && - isset($reported_status['pf_type']) && - count($reported_status['media_attachments']) && - in_array($reported_status['pf_type'], ['photo', 'photo:album']) -) -Media preview -@endif @if(isset($reported_status['content']))
{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}
@endif