Check we have the correct model when using events

Author: oddvalue

src/Concerns/HasDrafts.php

@@ -94,7 +94,11 @@ protected function newRevision(): void
 
         $revision = $this->fresh()?->replicate();
 
-        static::saved(function () use ($revision) {
+        static::saved(function (Model $model) use ($revision): void {
+            if ($model->isNot($this)) {
+                return;
+            }
+
             $revision->created_at = $this->created_at;
             $revision->updated_at = $this->updated_at;
             $revision->is_current = false;
@@ -126,22 +130,24 @@ public function setCurrent(): void
     {
         $oldCurrent = $this->revisions()->withDrafts()->current()->excludeRevision($this)->first();
 
-        static::saved(function () use ($oldCurrent) {
-            if ($oldCurrent) {
-                $oldCurrent->{$this->getIsCurrentColumn()} = false;
-                $oldCurrent->timestamps = false;
-                $oldCurrent->saveQuietly();
+        static::saved(function (Model $model) use ($oldCurrent): void {
+            if ($model->isNot($this) || ! $oldCurrent) {
+                return;
             }
+
+            $oldCurrent->{$this->getIsCurrentColumn()} = false;
+            $oldCurrent->timestamps = false;
+            $oldCurrent->saveQuietly();
         });
 
         $this->{$this->getIsCurrentColumn()} = true;
     }
 
     public function setLive(): void
     {
-        $published = $this->revisions()->excludeRevision($this)->published()->first();
+        $published = $this->revisions()->published()->first();
 
-        if (! $published) {
+        if (! $published || $this->is($published)) {
             $this->{$this->getPublishedAtColumn()} ??= now();
             $this->{$this->getIsPublishedColumn()} = true;
             $this->setCurrent();
@@ -157,7 +163,11 @@ public function setLive(): void
         $published->forceFill($newAttributes);
         $this->forceFill($oldAttributes);
 
-        static::saved(function () use ($published) {
+        static::saved(function (Model $model) use ($published): void {
+            if ($model->isNot($this)) {
+                return;
+            }
+
             $published->{$this->getIsPublishedColumn()} = true;
             $published->{$this->getPublishedAtColumn()} ??= now();
             $published->setCurrent();

src/Concerns/Publishes.php

@@ -2,6 +2,7 @@
 
 namespace Oddvalue\LaravelDrafts\Concerns;
 
+use Illuminate\Database\Eloquent\Model;
 use Oddvalue\LaravelDrafts\Scopes\PublishingScope;
 
 /**
@@ -48,7 +49,11 @@ public function publish(): static
         $this->{$this->getPublishedAtColumn()} ??= now();
         $this->{$this->getIsPublishedColumn()} = true;
 
-        static::saved(function () {
+        static::saved(function (Model $record): void {
+            if ($record->getKey() !== $this->getKey()) {
+                return;
+            }
+
             $this->fireModelEvent('published');
         });