From f262e02ff1fc7a0e7e81dea45b417df34ab4bf3a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 1 Mar 2021 19:42:55 +0000 Subject: [PATCH 1/2] More unescaping --- epicyon.py | 8 +++++--- inbox.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/epicyon.py b/epicyon.py index 4c6d2a354..25ac354ed 100644 --- a/epicyon.py +++ b/epicyon.py @@ -6,6 +6,7 @@ __maintainer__ = "Bob Mottram" __email__ = "bob@freedombone.net" __status__ = "Production" +import html from person import createPerson from person import createGroup from person import setProfileImage @@ -1940,16 +1941,17 @@ if args.speaker: True, __version__) if speakerJson: if speakerJson['say'] != prevSay: - print(speakerJson['name'] + ': ' + speakerJson['say'] + '\n') + print(html.unescape(speakerJson['name']) + ': ' + + html.unescape(speakerJson['say']) + '\n') pitch = getSpeakerPitch(speakerJson['name']) espeak.set_parameter(espeak.Parameter.Pitch, pitch) rate = getSpeakerRate(speakerJson['name']) espeak.set_parameter(espeak.Parameter.Rate, 110) srange = getSpeakerRange(speakerJson['name']) espeak.set_parameter(espeak.Parameter.Range, srange) - espeak.synth(speakerJson['name']) + espeak.synth(html.unescape(speakerJson['name'])) time.sleep(3) - espeak.synth(speakerJson['say']) + espeak.synth(html.unescape(speakerJson['say'])) prevSay = speakerJson['say'] time.sleep(20) sys.exit() diff --git a/inbox.py b/inbox.py index b126e9c3b..532a7dba9 100644 --- a/inbox.py +++ b/inbox.py @@ -2157,12 +2157,13 @@ def _updateSpeaker(baseDir: str, nickname: str, domain: str, content = urllib.parse.unquote_plus(postJsonObject['object']['content']) content = html.unescape(content) content = removeHtml(htmlReplaceQuoteMarks(content)) - content = content.replace('"', '"') + content = content.replace('"', '"').replace(''', "'") summary = '' if postJsonObject['object'].get('summary'): if isinstance(postJsonObject['object']['summary'], str): summary = \ urllib.parse.unquote_plus(postJsonObject['object']['summary']) + summary = html.unescape(summary) speakerName = \ getDisplayName(baseDir, postJsonObject['actor'], personCache) speakerJson = { From 5e85887cd1a58c52956c7a9c7060d63363daa044 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 1 Mar 2021 19:43:33 +0000 Subject: [PATCH 2/2] Excessive unescaping --- inbox.py | 1 - 1 file changed, 1 deletion(-) diff --git a/inbox.py b/inbox.py index 532a7dba9..2a33b621f 100644 --- a/inbox.py +++ b/inbox.py @@ -2157,7 +2157,6 @@ def _updateSpeaker(baseDir: str, nickname: str, domain: str, content = urllib.parse.unquote_plus(postJsonObject['object']['content']) content = html.unescape(content) content = removeHtml(htmlReplaceQuoteMarks(content)) - content = content.replace('"', '"').replace(''', "'") summary = '' if postJsonObject['object'].get('summary'): if isinstance(postJsonObject['object']['summary'], str):