summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2021-01-24 11:33:57 +0100
committermathieui <mathieui@mathieui.net>2021-01-24 11:33:57 +0100
commit4cb679ae2acd3c106cff010eb5278765c688f8f6 (patch)
tree753e2aafd3f87f76ec7e3ee0882fc3847a97d433
parent0193667ace375ee03ed79f8faca33d2b6fd69318 (diff)
parentab280b44cc5c85d179dc655183e211587d586207 (diff)
downloadslixmpp-4cb679ae2acd3c106cff010eb5278765c688f8f6.tar.gz
slixmpp-4cb679ae2acd3c106cff010eb5278765c688f8f6.tar.bz2
slixmpp-4cb679ae2acd3c106cff010eb5278765c688f8f6.tar.xz
slixmpp-4cb679ae2acd3c106cff010eb5278765c688f8f6.zip
Merge branch 'fix-emoji-update' into 'master'
XEP-0444: Fix emoji detection See merge request poezio/slixmpp!103
-rw-r--r--slixmpp/plugins/xep_0444/stanza.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/slixmpp/plugins/xep_0444/stanza.py b/slixmpp/plugins/xep_0444/stanza.py
index 338a244e..4d652116 100644
--- a/slixmpp/plugins/xep_0444/stanza.py
+++ b/slixmpp/plugins/xep_0444/stanza.py
@@ -10,6 +10,8 @@ from typing import Set, Iterable
from slixmpp.xmlstream import ElementBase
try:
from emoji import UNICODE_EMOJI
+ if UNICODE_EMOJI.get('en'):
+ UNICODE_EMOJI = UNICODE_EMOJI['en']
except ImportError:
UNICODE_EMOJI = None