diff --git a/app/Http/Controllers/Api/AdminApiController.php b/app/Http/Controllers/Api/AdminApiController.php index bc47dd893..94fa32738 100644 --- a/app/Http/Controllers/Api/AdminApiController.php +++ b/app/Http/Controllers/Api/AdminApiController.php @@ -282,6 +282,10 @@ class AdminApiController extends Controller $r['status'] = $status; + if ($status['local'] && isset($status['account']['id'])) { + $status['user_id'] = (string) AccountService::getUserIdFromProfileId($status['account']['id']); + } + if (isset($status['in_reply_to_id'])) { $r['parent'] = StatusService::get($status['in_reply_to_id'], false); } @@ -289,8 +293,11 @@ class AdminApiController extends Controller if ($report->object_type === Profile::class) { $acct = AccountService::get($report->object_id, true); - if ($acct) { + if ($acct && isset($acct['local'])) { $r['account'] = $acct; + if ($acct['local']) { + $r['account']['user_id'] = (string) AccountService::getUserIdFromProfileId($acct['id']); + } } } diff --git a/app/Services/AccountService.php b/app/Services/AccountService.php index d8dce3267..f6cedeea6 100644 --- a/app/Services/AccountService.php +++ b/app/Services/AccountService.php @@ -325,6 +325,11 @@ class AccountService } } + public static function getUserIdFromProfileId($profileId): ?int + { + return Profile::whereKey($profileId)->value('user_id'); + } + public static function getMetaDescription($id) { $account = self::get($id, true);