Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

inbox.py

@@ -86,6 +86,7 @@ from content import htmlReplaceQuoteMarks
 from speaker import speakerReplaceLinks
 from speaker import speakerPronounce
 from speaker import speakerEndpointJson
+from speaker import removeEmojiFromText
 
 
 def storeHashTags(baseDir: str, nickname: str, postJsonObject: {}) -> None:
@@ -2199,10 +2200,11 @@ def _updateSpeaker(baseDir: str, nickname: str, domain: str,
 
     speakerName = \
         getDisplayName(baseDir, postJsonObject['actor'], personCache)
-    gender = getGenderFromBio(baseDir, postJsonObject['actor'],
-                              personCache, translate)
     if not speakerName:
         return
+    speakerName = removeEmojiFromText(speakerName)
+    gender = getGenderFromBio(baseDir, postJsonObject['actor'],
+                              personCache, translate)
     if announcingActor:
         announcedNickname = getNicknameFromActor(announcingActor)
         announcedDomain = getDomainFromActor(announcingActor)

speaker.py

@@ -171,6 +171,25 @@ def _addSSMLemphasis(sayText: str) -> str:
     return sayText
 
 
+def removeEmojiFromText(sayText: str) -> str:
+    """Removes :emoji: from the given text
+    """
+    if '*' not in sayText:
+        return sayText
+    text = sayText
+    for ch in speakerRemoveChars:
+        text = text.replace(ch, ' ')
+    wordsList = text.split(' ')
+    replacements = {}
+    for word in wordsList:
+        if word.startswith(':'):
+            if word.endswith(':'):
+                replacements[word] = word.replace('*', '')
+    for replaceStr, newStr in replacements.items():
+        sayText = sayText.replace(replaceStr, newStr)
+    return sayText.replace('  ', ' ').strip()
+
+
 def getSpeakerFromServer(baseDir: str, session,
                          nickname: str, password: str,
                          domain: str, port: int,