From 751a0f1f0246e04adaf9ca2571621b44c0f8af6e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 4 Jul 2021 12:02:08 +0100 Subject: [PATCH] Duplicate permitted outbox types --- newswire.py | 10 ++++++---- outbox.py | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/newswire.py b/newswire.py index 427f7a151..544d17577 100644 --- a/newswire.py +++ b/newswire.py @@ -818,8 +818,9 @@ def getRSSfromDict(baseDir: str, newswire: {}, except Exception as e: print('WARN: Unable to convert date ' + published + ' ' + str(e)) continue - rssStr += '\n' - rssStr += ' ' + fields[0] + '\n' + rssStr += \ + '\n' + \ + ' ' + fields[0] + '\n' description = removeHtml(firstParagraphFromString(fields[4])) rssStr += ' ' + description + '\n' url = fields[1] @@ -829,8 +830,9 @@ def getRSSfromDict(baseDir: str, newswire: {}, rssStr += ' ' + url + '\n' rssDateStr = pubDate.strftime("%a, %d %b %Y %H:%M:%S UT") - rssStr += ' ' + rssDateStr + '\n' - rssStr += '\n' + rssStr += \ + ' ' + rssDateStr + '\n' + \ + '\n' rssStr += rss2Footer() return rssStr diff --git a/outbox.py b/outbox.py index 156de5ace..69d5acaab 100644 --- a/outbox.py +++ b/outbox.py @@ -311,8 +311,7 @@ def postMessageToOutbox(session, translate: {}, permittedOutboxTypes = ('Create', 'Announce', 'Like', 'Follow', 'Undo', 'Update', 'Add', 'Remove', 'Block', 'Delete', - 'Skill', 'Add', 'Remove', 'Event', - 'Ignore') + 'Skill', 'Ignore') if messageJson['type'] not in permittedOutboxTypes: if debug: print('DEBUG: POST to outbox - ' + messageJson['type'] +