0.1.1 release

README.md

@@ -11,8 +11,6 @@ As i promised in @Kylo#121339, this is a preparation for next version of my [Dif
 
 It raises new events for developers, called `PostWasRevisedQuietly` & `PostWasRevisedLoudly`
 
-**! Attention: Diff for Flarum & Edit Notifications extensions are incompatible with this right now and they're planned to be compatible on their next releases.**
-
 ![Settings](https://i.ibb.co/nsX8nrX/shsh.png)
 
 ## Requirements

composer.json

@@ -18,8 +18,8 @@
     "source": "https://github.com/the-turk/flarum-quiet-edits"
   },
   "require": {
-    "flarum/core": ">=0.1.0-beta.10 <0.1.0-beta.12",
-    "jfcherng/php-diff": "^6.4.7"
+    "flarum/core": ">=0.1.0-beta.10 <0.1.0-beta.13",
+    "jfcherng/php-diff": "^6.5.1"
   },
   "autoload": {
     "psr-4": {

src/Listeners/PostActions.php

@@ -4,14 +4,19 @@
 use Flarum\Post\Event\Revised as PostRevised;
 use Flarum\Post\Event\Saving as PostSaving;
 use Jfcherng\Diff\DiffHelper;
-use Illuminate\Events\Dispatcher;
+use Illuminate\Contracts\Events\Dispatcher;
 use Flarum\Settings\SettingsRepositoryInterface;
 use TheTurk\QuietEdits\Events\PostWasRevisedQuietly;
 use TheTurk\QuietEdits\Events\PostWasRevisedLoudly;
 use Carbon\Carbon;
 
 class PostActions
 {
+    /**
+     * @var Dispatcher
+     */
+    protected $events;
+
     /**
      * @var SettingsRepositoryInterface
      */
@@ -23,10 +28,15 @@ class PostActions
     private $oldPost = [];
 
     /**
-     * @param SettingsRepositoryInterface $settings,
+     * @param Dispatcher $events
+     * @param SettingsRepositoryInterface $settings
      */
-    public function __construct(SettingsRepositoryInterface $settings)
+    public function __construct(
+      Dispatcher $events,
+      SettingsRepositoryInterface $settings
+    )
     {
+        $this->events = $events;
         $this->settings = $settings;
     }
 
@@ -75,9 +85,12 @@ public function whenPostRevised(PostRevised $event)
         $diff = json_decode($differ, true);
 
         $gracePeriod = $this->settings->get('the-turk-quiet-edits.gracePeriod', '120');
-        $creationTime = new Carbon($post->created_at);
+        $creationTime = ($this->oldPost['edited_at'] !== null
+                          ? new Carbon($this->oldPost['edited_at'])
+                          : new Carbon($post->created_at)
+                        );
 
-        if ($creationTime->diffInSeconds(Carbon::now()) <= $gracePeriod || empty($diff)) {
+        if ($creationTime->diffInSeconds(Carbon::now()) < $gracePeriod || empty($diff)) {
             if ($this->oldPost['edited_at'] === null) {
                 $post->edited_at = null;
             } else {
@@ -92,9 +105,13 @@ public function whenPostRevised(PostRevised $event)
 
             $post->save();
 
-            $post->raise(new PostWasRevisedQuietly($post, $actor));
+            $this->events->dispatch(
+                new PostWasRevisedQuietly($post, $actor)
+            );
         } else {
-            $post->raise(new PostWasRevisedLoudly($post, $actor));
+            $this->events->dispatch(
+                new PostWasRevisedLoudly($post, $actor)
+            );
         }
     }
 }