Fix opengraph on legacy comment with nonexistent user

ppy · Nov 7, 2023 · 3f37f65 · 3f37f65
1 parent 4540200
commit 3f37f65
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/app/Libraries/Opengraph/CommentOpengraph.php b/app/Libraries/Opengraph/CommentOpengraph.php
@@ -17,13 +17,17 @@ public function __construct(private Comment $comment)
 
     public function get(): array
     {
+        if (!priv_check_user(null, 'CommentShow', $this->comment)->can()) {
+            return [];
+        }
+
         $user = $this->comment->user;
+        $username = $user?->username ?? $this->comment->legacyName() ?? osu_trans('users.deleted');
 
-        return priv_check_user(null, 'CommentShow', $this->comment)->can()
-            ? [
-                'description' => blade_safe(html_excerpt($this->comment->message_html, 100)),
-                'image' => $user->user_avatar,
-                'title' => osu_trans('comments.ogp.title', ['user' => $user->username]),
-            ] : [];
+        return [
+            'description' => blade_safe(html_excerpt($this->comment->message_html, 100)),
+            'image' => $user?->user_avatar,
+            'title' => osu_trans('comments.ogp.title', ['user' => $username]),
+        ];
     }
 }