Merge branch 'release/9.0.5'

Author: BracketSpaceWorker

compat/register-hooks.php

@@ -35,6 +35,7 @@
 add_action('notification/settings/register', [$this->component('BracketSpace\Notification\Admin\Settings'), 'carriersSettings'], 30, 1);
 add_action('notification/settings/register', [$this->component('BracketSpace\Notification\Admin\Settings'), 'emailsSettings'], 40, 1);
 add_filter('notification/settings/triggers/valid_post_types', [$this->component('BracketSpace\Notification\Admin\Settings'), 'filterPostTypes'], 10, 1);
+add_filter('wp_kses_allowed_html', [$this->component('BracketSpace\Notification\Admin\Settings'), 'filterAllowedDescriptionHtml'], 10, 2);
 add_filter('post_row_actions', [$this->component('BracketSpace\Notification\Admin\NotificationDuplicator'), 'addDuplicateRowAction'], 50, 2);
 add_action('admin_post_notification_duplicate', [$this->component('BracketSpace\Notification\Admin\NotificationDuplicator'), 'notificationDuplicate'], 10, 0);
 add_action('init', [$this->component('BracketSpace\Notification\Admin\PostType'), 'register'], 10, 0);
@@ -110,3 +111,8 @@
 add_action('rest_api_init', [$this->component('BracketSpace\Notification\Api\Api'), 'restApiInit'], 10, 0);
 add_action('admin_notices', [$this->component('BracketSpace\Notification\Compat\WebhookCompat'), 'displayNotice'], 10, 0);
 add_action('admin_notices', [$this->component('BracketSpace\Notification\Compat\RestApiCompat'), 'testRestApi'], 10, 0);
+add_filter('notification/from/json', [$this->component('BracketSpace\Notification\Repository\Converter\JsonConverter'), 'from'], 10, 1);
+add_filter('notification/to/json', [$this->component('BracketSpace\Notification\Repository\Converter\JsonConverter'), 'to'], 10, 2);
+add_filter('notification/from/array', [$this->component('BracketSpace\Notification\Repository\Converter\ArrayConverter'), 'from'], 10, 1);
+add_filter('notification/to/array', [$this->component('BracketSpace\Notification\Repository\Converter\ArrayConverter'), 'to'], 10, 2);
+add_filter('notification/carrier/form/data/values', [$this->component('BracketSpace\Notification\Repository\Carrier\Email'), 'allowUnfilteredHtmlBody'], 10, 2);

notification.php

@@ -4,7 +4,7 @@
  * Description: Customisable email and webhook notifications with powerful developer friendly API for custom triggers and notifications. Send alerts easily.
  * Author: BracketSpace
  * Author URI: https://bracketspace.com
- * Version: 9.0.4
+ * Version: 9.0.5
  * Requires PHP: 7.4
  * Requires at least: 5.8
  * License: GPL3

readme.txt

@@ -3,7 +3,7 @@ Contributors: notification, bracketspace, Kubitomakita, tomaszadamowicz, insejn,
 Tags: notification, notify, alert, email, mail, webhook, API, developer, framework
 Requires at least: 4.9
 Tested up to: 6.6
-Stable tag: 9.0.4
+Stable tag: 9.0.5
 Requires PHP: 7.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -297,8 +297,12 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo
 
 == Changelog ==
 
+= 9.0.5 =
+* [Fixed] Dochooks compatibility file has been updated.
+
 = 9.0.4 =
 * [Fixed] Fix issues with invalid JSON of Notification in wp_posts table.
+* [Fixed] Duplicate email prevention not working for custom post types.
 
 = 9.0.3 =
 * [Fixed] No license activated in v8 being displayed in the admin.

src/Integration/WordPressIntegration.php

@@ -49,7 +49,7 @@ public function loadDatabaseNotifications()
 	/**
 	 * Prevents the duplicate notifications
 	 *
-	 * Gutenberg or other editors, especiallyu when used within other
+	 * Gutenberg or other editors, especially when used within other
 	 * plugins which manipulate the data.
 	 *
 	 * @filter notification/background_processing/trigger_key
@@ -63,7 +63,7 @@ public function identifyTrigger($triggerKey, Triggerable $trigger)
 	{
 		$coveredTriggers = [
 			'BracketSpace\Notification\Repository\Trigger\Post\PostTrigger' => static function ($trigger) {
-				return $trigger->{$trigger->getPostType()}->ID;
+				return $trigger->post->ID;
 			},
 			'BracketSpace\Notification\Repository\Trigger\User\UserTrigger' => static function ($trigger) {
 				return $trigger->userId;

src/Repository/CarrierRepository.php

@@ -13,8 +13,6 @@
 use BracketSpace\Notification\Defaults\Carrier\Webhook;
 use BracketSpace\Notification\Defaults\Carrier\WebhookJson;
 use BracketSpace\Notification\Register;
-use BracketSpace\Notification\Dependencies\Micropackage\DocHooks\Helper as DocHooksHelper;
-
 /**
  * Carrier Repository.
  */
@@ -26,7 +24,7 @@ class CarrierRepository
 	public static function register()
 	{
 		if (\Notification::settings()->getSetting('carriers/email/enable')) {
-			Register::carrier(DocHooksHelper::hook(new Carrier\Email()));
+			Register::carrier(\Notification::component(Carrier\Email::class));
 		}
 
 		if (
@@ -36,7 +34,7 @@ public static function register()
 			return;
 		}
 
-		Register::carrier(DocHooksHelper::hook(new Webhook('Webhook')));
-		Register::carrier(DocHooksHelper::hook(new WebhookJson('Webhook JSON')));
+		Register::carrier(new Webhook('Webhook'));
+		Register::carrier(new WebhookJson('Webhook JSON'));
 	}
 }

src/Repository/ConverterRepository.php

@@ -274,6 +274,12 @@ public function singletons()
 		$this->addComponent(new Api\Api());
 		$this->addComponent(new Compat\WebhookCompat());
 		$this->addComponent(new Compat\RestApiCompat());
+
+		$this->addComponent(new Repository\Converter\JsonConverter());
+		$this->addComponent(new Repository\Converter\ArrayConverter());
+
+		// Defaults
+		$this->addComponent(new Repository\Carrier\Email());
 	}
 
 	/**
@@ -313,15 +319,13 @@ public function defaults()
 				'carriers',
 				'recipients',
 				'triggers',
-				'converters',
 			],
 			[
 				Repository\GlobalMergeTagRepository::class,
 				Repository\ResolverRepository::class,
 				Repository\CarrierRepository::class,
 				Repository\RecipientRepository::class,
 				Repository\TriggerRepository::class,
-				Repository\ConverterRepository::class,
 			]
 		);
 	}