fix tapActivity being called twice

src/Traits/LogsActivity.php

@@ -75,17 +75,12 @@ protected static function bootLogsActivity(): void
                     ->thenReturn();
 
                 // Actual logging
-                $logger = app(ActivityLogger::class)
+                app(ActivityLogger::class)
                     ->useLog($logName)
                     ->event($eventName)
                     ->performedOn($model)
-                    ->withProperties($event->changes);
-
-                if (method_exists($model, 'tapActivity')) {
-                    $logger->tap([$model, 'tapActivity'], $eventName);
-                }
-
-                $logger->log($description);
+                    ->withProperties($event->changes)
+                    ->log($description);
 
                 // Reset log options so the model can be serialized.
                 $model->activitylogOptions = null;
@@ -148,7 +143,7 @@ protected static function eventsToBeRecorded(): Collection
         $reject = collect(static::$doNotRecordEvents ?? []);
 
         if (isset(static::$recordEvents)) {
-            return collect(static::$recordEvents)->reject(fn(string $eventName) => $reject->contains($eventName));
+            return collect(static::$recordEvents)->reject(fn (string $eventName) => $reject->contains($eventName));
         }
 
         $events = collect([
@@ -161,7 +156,7 @@ protected static function eventsToBeRecorded(): Collection
             $events->push('restored');
         }
 
-        return $events->reject(fn(string $eventName) => $reject->contains($eventName));
+        return $events->reject(fn (string $eventName) => $reject->contains($eventName));
     }
 
     protected function shouldLogEvent(string $eventName): bool

tests/LogsActivityTest.php

@@ -409,6 +409,32 @@ public function tapActivity(Activity $activity, string $eventName)
     $this->assertEquals('my custom event', $firstActivity->event);
 });
 
+it('will only call tapActivity once', function () {
+    $callCount = 0;
+
+    $model = new class() extends Article {
+        use LogsActivity;
+
+        public static $tapCallCount = 0;
+
+        public function getActivitylogOptions(): LogOptions
+        {
+            return LogOptions::defaults();
+        }
+
+        public function tapActivity(Activity $activity, string $eventName)
+        {
+            static::$tapCallCount++;
+        }
+    };
+
+    $model::$tapCallCount = 0;
+    $entity = new $model();
+    $entity->save();
+
+    $this->assertEquals(1, $model::$tapCallCount);
+});
+
 it('will not submit log when there is no changes', function () {
     $model = new class() extends Article {
         use LogsActivity;