From 22cc0ef8c37ebc2ab82480882648b70af35818cb Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 28 Nov 2020 20:52:13 +0000 Subject: [PATCH] Tidying --- outbox.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/outbox.py b/outbox.py index 3bc96ad96..93d5c5cb9 100644 --- a/outbox.py +++ b/outbox.py @@ -117,24 +117,23 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str, fileExtension = 'png' mediaTypeStr = \ attach['mediaType'] - if mediaTypeStr.endswith('jpeg'): - fileExtension = 'jpg' - elif mediaTypeStr.endswith('gif'): - fileExtension = 'gif' - elif mediaTypeStr.endswith('webp'): - fileExtension = 'webp' - elif mediaTypeStr.endswith('avif'): - fileExtension = 'avif' - elif mediaTypeStr.endswith('audio/mpeg'): - fileExtension = 'mp3' - elif mediaTypeStr.endswith('ogg'): - fileExtension = 'ogg' - elif mediaTypeStr.endswith('mp4'): - fileExtension = 'mp4' - elif mediaTypeStr.endswith('webm'): - fileExtension = 'webm' - elif mediaTypeStr.endswith('ogv'): - fileExtension = 'ogv' + + extensions = { + "jpeg": "jpg", + "gif": "gif", + "webp": "webp", + "avif": "avif", + "audio/mpeg": "mp3", + "ogg": "ogg", + "mp4": "mp4", + "webm": "webm", + "ogv": "ogv" + } + for matchExt, ext in extensions.items(): + if mediaTypeStr.endswith(matchExt): + fileExtension = ext + break + mediaDir = \ baseDir + '/accounts/' + \ postToNickname + '@' + domain