Fix rendering feeds for discussions/posts with deleted users (#8)

imorland · Aug 12, 2022 · 262d392 · 262d392
1 parent 14d80ee
commit 262d392
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Controller/DiscussionFeedController.php b/src/Controller/DiscussionFeedController.php
@@ -102,7 +102,7 @@ protected function getFeedContent(Request $request)
                 'content'     => $this->summarize($this->stripHTML($post->attributes->contentHtml)),
                 'permalink'   => $this->url->to('forum')->route('discussion', ['id' => $discussion->attributes->slug, 'near' => $post->attributes->number]),
                 'pubdate'     => $this->parseDate($post->attributes->createdAt),
-                'author'      => $this->getRelationship($posts, $post->relationships->user)->username,
+                'author'      => isset($post->relationships->user) ? $this->getRelationship($posts, $post->relationships->user)->username : '[deleted]',
             ];
 
             $modified = $this->parseDate(Arr::get($post->attributes, 'editedAt', $post->attributes->createdAt));

diff --git a/src/Controller/DiscussionsActivityFeedController.php b/src/Controller/DiscussionsActivityFeedController.php
@@ -125,13 +125,18 @@ protected function getFeedContent(Request $request)
                 $content->contentHtml = '';
             }
 
+            if ($this->lastTopics) {
+                $author = isset($discussion->relationships->user) ? $this->getRelationship($last_discussions, $discussion->relationships->user)->username : '[deleted]';
+            } else {
+                $author = isset($discussion->relationships->lastPostedUser) ? $this->getRelationship($last_discussions, $discussion->relationships->lastPostedUser)->username : '[deleted]';
+            }
             $entries[] = [
                 'title'       => $discussion->attributes->title,
                 'content'     => $this->summarize($this->stripHTML($content->contentHtml)),
                 'id'          => $this->url->to('forum')->route('discussion', ['id' => $discussion->id.'-'.$discussion->attributes->slug]),
                 'permalink'   => $this->url->to('forum')->route('discussion', ['id' => $discussion->attributes->slug, 'near' => $content->number]),
                 'pubdate'     => $this->parseDate($this->lastTopics ? $discussion->attributes->createdAt : $discussion->attributes->lastPostedAt),
-                'author'      => $this->getRelationship($last_discussions, $this->lastTopics ? $discussion->relationships->user : $discussion->relationships->lastPostedUser)->username,
+                'author'      => $author,
             ];
 
             $modified = $this->parseDate($this->lastTopics ? $discussion->attributes->createdAt : $discussion->attributes->lastPostedAt);