Merge pull request #1008 from glensc/emoji

eventum · Mar 10, 2021 · 088c5e9 · 088c5e9
2 parents 4fc8a28 + 3249cdd
commit 088c5e9
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 See [Upgrading] for details on how to upgrade.
 
 - Fix: Remove post note debug, #1009
+- Add emoji parsing to markdown areas, #1008
 
 [3.9.12]: https://github.com/eventum/eventum/compare/v3.9.11...master
 

diff --git a/composer.json b/composer.json
@@ -40,6 +40,7 @@
         "enrise/urihelper": "^1.0",
         "ezyang/htmlpurifier": "^4.10",
         "fonts/liberation": "*",
+        "giberti/commonmark-emoji-extension": "^0.2.0",
         "glen/filename-normalizer": "^2.0",
         "horde/text-flowed": "dev-patch-1 as 2.0.3",
         "horde/util": "dev-patch-1 as 2.5.8",

diff --git a/composer.lock b/composer.lock
diff --git a/src/ServiceProvider/MarkdownServiceProvider.php b/src/ServiceProvider/MarkdownServiceProvider.php
@@ -18,6 +18,7 @@
 use Eventum\EventDispatcher\EventManager;
 use Eventum\Markdown;
 use Eventum\Markdown\CommonMark\UserMentionGenerator;
+use Giberti\EmojiExtension\EmojiExtension;
 use HTMLPurifier;
 use HTMLPurifier_HTML5Config;
 use League\CommonMark\Block\Element\FencedCode;
@@ -126,6 +127,7 @@ private function applyExtensions(Environment $environment): void
         $environment->addExtension(new AttributesExtension());
         $environment->addExtension(new FootnoteExtension());
         $environment->addExtension(new MentionExtension());
+        $environment->addExtension(new EmojiExtension());
 
         // allow extensions to apply behaviour
         $event = new GenericEvent($environment);

diff --git a/symfony.lock b/symfony.lock
@@ -95,6 +95,12 @@
     "fonts/liberation": {
         "version": "2.00.1"
     },
+    "giberti/commonmark-emoji-extension": {
+        "version": "0.2"
+    },
+    "giberti/emoji-data": {
+        "version": "v0.1"
+    },
     "glen/filename-normalizer": {
         "version": "2.0.1"
     },