Merge pull request #3474 from pixelfed/staging

Staging

CHANGELOG.md

@@ -16,7 +16,8 @@
 - Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
 - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
 - Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
-- Update home timeline, redirect to /i/web unless force_old_ui is presen ([5ff4730f](https://github.com/pixelfed/pixelfed/commit/5ff4730f))
+- Update home timeline, redirect to /i/web unless force_old_ui is present ([5ff4730f](https://github.com/pixelfed/pixelfed/commit/5ff4730f))
+- Update adminReportController, fix mail verification request 500 bug by changing filter precedence to catch deleted users that may still be cached in AccountService ([3f322e29](https://github.com/pixelfed/pixelfed/commit/3f322e29))
 
 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)
 

app/Http/Controllers/Admin/AdminReportController.php

@@ -528,11 +528,14 @@ trait AdminReportController
 					return !in_array($id, $ignored);
 				})
 				->map(function($id) {
-					$account = AccountService::get($id);
 					$user = User::whereProfileId($id)->first();
 					if(!$user) {
 						return [];
 					}
+					$account = AccountService::get($id);
+					if(!$account) {
+						return [];
+					}
 					$account['email'] = $user->email;
 					return $account;
 				})

app/Transformer/Api/StatusTransformer.php

@@ -53,7 +53,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
 				'website'   => null
 			 ],
 			'language'                  => null,
-			'pinned'                    => null,
 			'mentions'                  => StatusMentionService::get($status->id),
 			'pf_type'                   => $status->type ?? $status->setType(),
 			'reply_count'               => (int) $status->reply_count,