From 45e008ec9e0a48a2765fc197a7fc4b0955ddefd5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 4 Mar 2021 10:11:30 +0000
Subject: [PATCH] Tidying

---
 speaker.py | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/speaker.py b/speaker.py
index 79297298d..e9ec57cd9 100644
--- a/speaker.py
+++ b/speaker.py
@@ -338,11 +338,13 @@ def getSSMLbox(baseDir: str, path: str,
                                 instanceTitle, gender)
 
 
-def updateSpeaker(baseDir: str, nickname: str, domain: str,
-                  postJsonObject: {}, personCache: {},
-                  translate: {}, announcingActor: str) -> None:
-    """ Generates a json file which can be used for TTS announcement
-    of incoming inbox posts
+def _postToSpeakerJson(baseDir: str, nickname: str, domain: str,
+                       postJsonObject: {}, personCache: {},
+                       translate: {}, announcingActor: str) -> {}:
+    """Converts an ActivityPub post into some Json containing
+    speech synthesis parameters.
+    NOTE: There currently appears to be no standardized json
+    format for speech synthesis
     """
     if not postJsonObject.get('object'):
         return
@@ -352,8 +354,6 @@ def updateSpeaker(baseDir: str, nickname: str, domain: str,
         return
     if not isinstance(postJsonObject['object']['content'], str):
         return
-    speakerFilename = \
-        baseDir + '/accounts/' + nickname + '@' + domain + '/speaker.json'
     detectedLinks = []
     content = urllib.parse.unquote_plus(postJsonObject['object']['content'])
     content = html.unescape(content)
@@ -397,7 +397,21 @@ def updateSpeaker(baseDir: str, nickname: str, domain: str,
             announcedHandle = announcedNickname + '@' + announcedDomain
             content = \
                 translate['announces'] + ' ' + announcedHandle + '. ' + content
-    speakerJson = _speakerEndpointJson(speakerName, summary,
-                                       content, imageDescription,
-                                       detectedLinks, gender)
+    return _speakerEndpointJson(speakerName, summary,
+                                content, imageDescription,
+                                detectedLinks, gender)
+
+
+def updateSpeaker(baseDir: str, nickname: str, domain: str,
+                  postJsonObject: {}, personCache: {},
+                  translate: {}, announcingActor: str) -> None:
+    """ Generates a json file which can be used for TTS announcement
+    of incoming inbox posts
+    """
+    speakerJson = \
+        _postToSpeakerJson(baseDir, nickname, domain,
+                           postJsonObject, personCache,
+                           translate, announcingActor)
+    speakerFilename = \
+        baseDir + '/accounts/' + nickname + '@' + domain + '/speaker.json'
     saveJson(speakerJson, speakerFilename)