diff --git a/media.py b/media.py index 74a78babe..64dad4906 100644 --- a/media.py +++ b/media.py @@ -19,7 +19,7 @@ from utils import get_base_content_from_post from utils import get_full_domain from utils import getImageExtensions from utils import get_video_extensions -from utils import getAudioExtensions +from utils import get_audio_extensions from utils import getMediaExtensions from utils import has_object_dict from utils import acct_dir @@ -254,7 +254,7 @@ def getAttachmentMediaType(filename: str) -> str: for mType in videoTypes: if filename.endswith('.' + mType): return 'video' - audioTypes = getAudioExtensions() + audioTypes = get_audio_extensions() for mType in audioTypes: if filename.endswith('.' + mType): return 'audio' diff --git a/utils.py b/utils.py index edff361ba..51dc3e41c 100644 --- a/utils.py +++ b/utils.py @@ -348,7 +348,7 @@ def get_video_extensions() -> []: return ('mp4', 'webm', 'ogv') -def getAudioExtensions() -> []: +def get_audio_extensions() -> []: """Returns a list of the possible audio file extensions """ return ('mp3', 'ogg', 'flac') @@ -399,7 +399,8 @@ def getImageExtensionFromMimeType(contentType: str) -> str: def getMediaExtensions() -> []: """Returns a list of the possible media file extensions """ - return getImageExtensions() + get_video_extensions() + getAudioExtensions() + return getImageExtensions() + \ + get_video_extensions() + get_audio_extensions() def getImageFormats() -> str: diff --git a/webapp_utils.py b/webapp_utils.py index 4b32013cc..36800be74 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -20,7 +20,7 @@ from utils import get_config_param from utils import acct_dir from utils import getNicknameFromActor from utils import isfloat -from utils import getAudioExtensions +from utils import get_audio_extensions from utils import get_video_extensions from utils import getImageExtensions from utils import local_actor_url @@ -969,7 +969,7 @@ def _isAudioMimeType(mimeType: str) -> bool: return True if not mimeType.startswith('audio/'): return False - extensions = getAudioExtensions() + extensions = get_audio_extensions() ext = mimeType.split('/')[1] if ext in extensions: return True