UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-22 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3474 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-05-16 02:18:10 -06:00 committed by GitHub
commit 9a8dea28b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -16,7 +16,8 @@
- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450)) - 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)) - 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 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) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

5
app/Http/Controllers/Admin/AdminReportController.php
View file

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

1
app/Transformer/Api/StatusTransformer.php
View file

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