Support emojis in webhook/group names

Author: brandonkelly

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Added
 - Added support for webhooks that send GET requests.
+- Webhook names and group names can now contain emojis, even if using MySQL.
 
 ## 1.0.1 - 2018-12-13
 

src/WebhookManager.php

@@ -4,6 +4,7 @@
 
 use Craft;
 use craft\db\Query;
+use craft\helpers\StringHelper;
 use yii\base\InvalidArgumentException;
 
 /**
@@ -31,8 +32,13 @@ public function getAllGroups(): array
             ->all();
 
         $groups = [];
+        $isMysql = Craft::$app->getDb()->getIsMysql();
 
         foreach ($results as $result) {
+            if ($isMysql) {
+                $result['name'] = html_entity_decode($result['name'], ENT_QUOTES | ENT_HTML5);
+            }
+
             $groups[] = new Group($result);
         }
 
@@ -55,18 +61,24 @@ public function saveGroup(Group $group, bool $runValidation = true): bool
 
         $db = Craft::$app->getDb();
 
+        if ($db->getIsMysql()) {
+            $name = StringHelper::encodeMb4($group->name);
+        } else {
+            $name = $group->name;
+        }
+
         if ($group->id) {
             $db->createCommand()
                 ->update('{{%webhookgroups}}', [
-                    'name' => $group->name,
+                    'name' => $name,
                 ], [
                     'id' => $group->id,
                 ])
                 ->execute();
         } else {
             $db->createCommand()
                 ->insert('{{%webhookgroups}}', [
-                    'name' => $group->name,
+                    'name' => $name,
                 ])
                 ->execute();
 
@@ -153,7 +165,7 @@ public function getWebhookById(int $id): Webhook
             throw new InvalidArgumentException('Invalid webhook ID: ' . $id);
         }
 
-        return new Webhook($result);
+        return $this->_createWebhook($result);
     }
 
     /**
@@ -170,10 +182,18 @@ public function saveWebhook(Webhook $webhook, bool $runValidation = true): bool
             return false;
         }
 
+        $db = Craft::$app->getDb();
+
+        if ($db->getIsMysql()) {
+            $name = StringHelper::encodeMb4($webhook->name);
+        } else {
+            $name = $webhook->name;
+        }
+
         $data = [
             'groupId' => $webhook->groupId,
             'enabled' => (bool)$webhook->enabled,
-            'name' => $webhook->name,
+            'name' => $name,
             'class' => $webhook->class,
             'event' => $webhook->event,
             'type' => $webhook->type,
@@ -183,8 +203,6 @@ public function saveWebhook(Webhook $webhook, bool $runValidation = true): bool
             'eventAttributes' => $webhook->eventAttributes,
         ];
 
-        $db = Craft::$app->getDb();
-
         if ($webhook->id) {
             $db->createCommand()
                 ->update('{{%webhooks}}', $data, ['id' => $webhook->id])
@@ -221,16 +239,31 @@ private function _createWebhookQuery(): Query
             ->from(['{{%webhooks}}']);
     }
 
+    /**
+     * @param array $result
+     * @param bool|null $isMysql
+     * @return Webhook
+     */
+    private function _createWebhook(array $result, bool $isMysql = null): Webhook
+    {
+        if ($isMysql ?? Craft::$app->getDb()->getIsMysql()) {
+            $result['name'] = html_entity_decode($result['name'], ENT_QUOTES | ENT_HTML5);
+        }
+
+        return new Webhook($result);
+    }
+
     /**
      * @param array
      * @return Webhook[]
      */
     private function _createWebhooks(array $results): array
     {
         $webhooks = [];
+        $isMysql = Craft::$app->getDb()->getIsMysql();
 
         foreach ($results as $result) {
-            $webhooks[] = new Webhook($result);
+            $webhooks[] = $this->_createWebhook($result, $isMysql);
         }
 
         return $webhooks;