fix: custom eloquent events

flarum · Oct 18, 2023 · 87f4716 · 87f4716
1 parent 52043a9
commit 87f4716
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/framework/core/src/Database/AbstractModel.php b/framework/core/src/Database/AbstractModel.php
@@ -237,4 +237,14 @@ public function newCollection(array $models = []): Collection
     {
         return new Collection($models);
     }
+
+    public function __sleep()
+    {
+        // Closures cannot be serialized.
+        // We should not need them if we are serializing a model.
+        $this->afterSaveCallbacks = [];
+        $this->afterDeleteCallbacks = [];
+
+        return parent::__sleep();
+    }
 }
diff --git a/framework/core/src/Discussion/Discussion.php b/framework/core/src/Discussion/Discussion.php
@@ -146,8 +146,10 @@ public function hide(?User $actor = null): static
 
             $this->raise(new Hidden($this));
 
-            $this->afterSave(function () {
-                $this->fireModelEvent('hidden', false);
+            $this->saved(function (self $model) {
+                if ($model === $this) {
+                    $model->fireModelEvent('hidden', false);
+                }
             });
         }
 
@@ -162,8 +164,10 @@ public function restore(): static
 
             $this->raise(new Restored($this));
 
-            $this->afterSave(function () {
-                $this->fireModelEvent('restored', false);
+            $this->saved(function (self $model) {
+               if ($model === $this) {
+                   $model->fireModelEvent('restored', false);
+               }
             });
         }
 

diff --git a/framework/core/src/Search/Listener/ModelObserver.php b/framework/core/src/Search/Listener/ModelObserver.php
@@ -54,7 +54,7 @@ public function restored(AbstractModel $model): void
 
     private function runIndexJob(AbstractModel $model, string $operation): void
     {
-        if ($this->search->indexable($model)) {
+        if ($this->search->indexable($model::class)) {
             foreach ($this->search->indexers($model::class) as $indexerClass) {
                 $queue = property_exists($indexerClass, 'queue') ? $indexerClass::$queue : null;