Update last post meta when editing time and removing user

clarkwinkelmann · May 28, 2021 · da8773d · da8773d
1 parent 6118d52
commit da8773d
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/Listeners/AbstractSaveAuthor.php b/src/Listeners/AbstractSaveAuthor.php
@@ -45,23 +45,20 @@ protected function saveAuthor(AbstractModel $model, User $actor, array $data)
                 $newUser = User::query()->findOrFail($userId);
 
                 $model->user()->associate($newUser);
-
-                // Update discussion meta when editing a post
-                if ($model instanceof Post) {
-                    $model->afterSave(function () use ($model) {
-                        $model->discussion->refreshParticipantCount();
-
-                        if ($model->id === $model->discussion->last_post_id) {
-                            $model->discussion->setLastPost($model);
-                        }
-
-                        $model->discussion->save();
-                    });
-                }
             } else if (empty($data['relationships']['user']['data'])) {
                 $model->user()->dissociate();
             }
 
+            // Update discussion metadata
+            if ($model instanceof Post) {
+                $model->afterSave(function () use ($model) {
+                    $model->discussion
+                        ->refreshParticipantCount()
+                        ->refreshLastPost()
+                        ->save();
+                });
+            }
+
             // Update user metadata
             $model->afterSave(function () use ($model, $oldUser, $newUser) {
                 if ($oldUser) {
@@ -95,6 +92,11 @@ protected function saveAuthor(AbstractModel $model, User $actor, array $data)
 
             if ($model instanceof Post) {
                 $model->raise(new Event\PostCreateDateChanged($model, $model->created_at));
+
+                // Update discussion metadata
+                $model->afterSave(function (Post $post) {
+                    $post->discussion->refreshLastPost()->save();
+                });
             } else {
                 $model->raise(new Event\DiscussionCreateDateChanged($model, $model->created_at));
             }