From 6232d35d9053a2b21a9e3b99602484eed2bafccf Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 13 Sep 2026 01:46:18 -0600
Subject: [PATCH] Update AccountService and AdminApiController

---
 app/Http/Controllers/Api/AdminApiController.php | 9 ++++++++-
 app/Services/AccountService.php                 | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

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