3.7 + filters for provisional drafts & first saves

# Conflicts:
#	CHANGELOG.md

Author: brandonkelly

CHANGELOG.md

@@ -3,9 +3,13 @@
 ## Unreleased
 
 ### Added
+- Added new “Element is being saved for the first time” and “Element is a provisional draft” webhook filters.
 - Some webhook filters now disable other mutually-exclusive filters when active and enabled.
 - Added `craft\webhooks\filters\ExclusiveFilterInterface`.
 
+### Changed
+- Webhooks now requires Craft 3.7 or later.
+
 ## 2.3.3 - 2021-04-01
 
 ### Fixed

composer.json

@@ -25,7 +25,7 @@
     "rss": "https://github.com/craftcms/webhooks/commits/master.atom"
   },
   "require": {
-    "craftcms/cms": "^3.1.19"
+    "craftcms/cms": "^3.7.0"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -12,9 +12,11 @@
 use craft\helpers\StringHelper;
 use craft\web\UrlManager;
 use craft\webhooks\filters\DraftFilter;
+use craft\webhooks\filters\ProvisionalDraftFilter;
 use craft\webhooks\filters\DuplicatingFilter;
 use craft\webhooks\filters\ElementEnabledFilter;
 use craft\webhooks\filters\FilterInterface;
+use craft\webhooks\filters\FirstSaveFilter;
 use craft\webhooks\filters\NewElementFilter;
 use craft\webhooks\filters\PropagatingFilter;
 use craft\webhooks\filters\ResavingFilter;
@@ -486,7 +488,9 @@ public function getAllFilters(): array
             NewElementFilter::class,
             ElementEnabledFilter::class,
             DraftFilter::class,
+            ProvisionalDraftFilter::class,
             RevisionFilter::class,
+            FirstSaveFilter::class,
             DuplicatingFilter::class,
             PropagatingFilter::class,
             ResavingFilter::class,

src/Plugin.php

@@ -23,6 +23,7 @@ public static function excludes(): array
     {
         return [
             RevisionFilter::class,
+            FirstSaveFilter::class,
         ];
     }
 

src/filters/DraftFilter.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace craft\webhooks\filters;
+
+use Craft;
+use craft\base\ElementInterface;
+
+/**
+ * Filters events based on whether the element is propagating
+ *
+ * @author Pixel & Tonic, Inc. <[email protected]>
+ * @since 2.4.0
+ */
+class FirstSaveFilter extends BaseElementFilter
+{
+    public static function displayName(): string
+    {
+        return Craft::t('webhooks', 'Element is being saved for the first time');
+    }
+
+    public static function excludes(): array
+    {
+        return [
+            NewElementFilter::class,
+            DraftFilter::class,
+            ProvisionalDraftFilter::class,
+            RevisionFilter::class,
+            ResavingFilter::class,
+        ];
+    }
+
+    protected static function checkElement(ElementInterface $element, bool $value): bool
+    {
+        return $element->firstSave;
+    }
+}

src/filters/FirstSaveFilter.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace craft\webhooks\filters;
+
+use Craft;
+use craft\base\ElementInterface;
+use craft\helpers\ElementHelper;
+
+/**
+ * Filters events based on whether the element is a draft
+ *
+ * @author Pixel & Tonic, Inc. <[email protected]>
+ * @since 2.4.0
+ */
+class ProvisionalDraftFilter extends BaseElementFilter
+{
+    public static function displayName(): string
+    {
+        return Craft::t('webhooks', 'Element is a provisional draft');
+    }
+
+    public static function excludes(): array
+    {
+        return [
+            DraftFilter::class,
+            RevisionFilter::class,
+            FirstSaveFilter::class,
+        ];
+    }
+
+    protected static function checkElement(ElementInterface $element, bool $value): bool
+    {
+        $root = ElementHelper::rootElement($element);
+        return $root->isProvisionalDraft;
+    }
+}

src/filters/ProvisionalDraftFilter.php

@@ -19,6 +19,13 @@ public static function displayName(): string
         return Craft::t('webhooks', 'Element is being bulk-resaved');
     }
 
+    public static function excludes(): array
+    {
+        return [
+            FirstSaveFilter::class,
+        ];
+    }
+
     protected static function checkElement(ElementInterface $element, bool $value): bool
     {
         /** @var Element $element */

src/filters/ResavingFilter.php

@@ -23,6 +23,8 @@ public static function excludes(): array
     {
         return [
             DraftFilter::class,
+            ProvisionalDraftFilter::class,
+            FirstSaveFilter::class,
         ];
     }