Merge pull request #4285 from pixelfed/staging

Staging

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)

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);

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;
+			}
 		}
 	}
 

resources/views/emails/admin/new_autospam.blade.php

@@ -13,20 +13,6 @@ Review Autospam Report
 <x-mail::panel>
 <p style="font-size: 13px; color: #cccccc; text-align: center; font-weight: bold;margin-bottom: 10px;">Reported Status</p>
 <div style="display: flex; align-items: center;gap: 10px;">
-@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'])
-)
-<img
-	src="{{$reported_status['media_attachments'][0]['url']}}"
-	width="100"
-	height="100"
-	alt="Media preview"
-	style="object-fit: cover; border: 1px solid #cccccc; border-radius: 10px; margin-bottom: 10px;"
-	onerror="this.src='{{url('/storage/no-preview.png')}}';this.onerror=null;" />
-@endif
 @if(isset($reported_status['content']))
 <div style="font-size: 12px !important;">{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}</div>
 @endif

resources/views/emails/admin/new_report.blade.php

@@ -11,20 +11,6 @@ View Report
 <x-mail::panel>
 <p style="font-size: 13px; color: #cccccc; text-align: center; font-weight: bold;margin-bottom: 10px;">Reported Status</p>
 <div style="display: flex; align-items: center;gap: 10px;">
-@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'])
-)
-<img
-	src="{{$reported_status['media_attachments'][0]['url']}}"
-	width="100"
-	height="100"
-	alt="Media preview"
-	style="object-fit: cover; border: 1px solid #cccccc; border-radius: 10px; margin-bottom: 10px;"
-	onerror="this.src='{{url('/storage/no-preview.png')}}';this.onerror=null;" />
-@endif
 @if(isset($reported_status['content']))
 <div style="font-size: 12px !important;">{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}</div>
 @endif