diff --git a/daemon.py b/daemon.py index aaf591af1..e7a1b1209 100644 --- a/daemon.py +++ b/daemon.py @@ -302,7 +302,7 @@ from utils import save_json from utils import is_suspended from utils import dangerousMarkup from utils import refresh_newswire -from utils import isImageFile +from utils import is_image_file from utils import has_group_type from manualapprove import manualDenyFollowRequestThread from manualapprove import manualApproveFollowRequestThread @@ -7208,7 +7208,7 @@ class PubServer(BaseHTTPRequestHandler): GETstartTime) -> None: """Returns a media file """ - if isImageFile(path) or \ + if is_image_file(path) or \ pathIsVideo(path) or \ pathIsAudio(path): mediaStr = path.split('/media/')[1] @@ -7294,7 +7294,7 @@ class PubServer(BaseHTTPRequestHandler): base_dir: str, GETstartTime) -> None: """Returns an emoji image """ - if isImageFile(path): + if is_image_file(path): emojiStr = path.split('/emoji/')[1] emojiFilename = base_dir + '/emoji/' + emojiStr if not os.path.isfile(emojiFilename): @@ -7385,7 +7385,7 @@ class PubServer(BaseHTTPRequestHandler): base_dir: str, GETstartTime) -> None: """Shows a help screen image """ - if not isImageFile(path): + if not is_image_file(path): return mediaStr = path.split('/helpimages/')[1] if '/' not in mediaStr: @@ -12745,7 +12745,7 @@ class PubServer(BaseHTTPRequestHandler): base_dir: str, GETstartTime) -> bool: """Show a shared item image """ - if not isImageFile(path): + if not is_image_file(path): self._404() return True @@ -12791,7 +12791,7 @@ class PubServer(BaseHTTPRequestHandler): '/accounts/avatars/' not in path and \ '/accounts/headers/' not in path: return False - if not isImageFile(path): + if not is_image_file(path): return False if '/system/accounts/avatars/' in path: avatarStr = path.split('/system/accounts/avatars/')[1] @@ -14576,7 +14576,7 @@ class PubServer(BaseHTTPRequestHandler): # if not authorized then show the login screen if htmlGET and self.path != '/login' and \ - not isImageFile(self.path) and \ + not is_image_file(self.path) and \ self.path != '/' and \ self.path != '/users/news/linksmobile' and \ self.path != '/users/news/newswiremobile': @@ -14686,7 +14686,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.debug) # image on login screen or qrcode - if (isImageFile(self.path) and + if (is_image_file(self.path) and (self.path.startswith('/login.') or self.path.startswith('/qrcode.png'))): iconFilename = \ @@ -16397,7 +16397,7 @@ class PubServer(BaseHTTPRequestHandler): fileLength = -1 if '/media/' in self.path: - if isImageFile(self.path) or \ + if is_image_file(self.path) or \ pathIsVideo(self.path) or \ pathIsAudio(self.path): mediaStr = self.path.split('/media/')[1] @@ -16506,7 +16506,7 @@ class PubServer(BaseHTTPRequestHandler): print('DEBUG: no media filename in POST') if filename: - if isImageFile(filename): + if is_image_file(filename): postImageFilename = filename.replace('.temp', '') print('Removing metadata from ' + postImageFilename) city = getSpoofedCity(self.server.city, diff --git a/person.py b/person.py index 61852b3e1..7e9244f0f 100644 --- a/person.py +++ b/person.py @@ -54,7 +54,7 @@ from utils import refresh_newswire from utils import getProtocolPrefixes from utils import has_users_path from utils import get_image_extensions -from utils import isImageFile +from utils import is_image_file from utils import acct_dir from utils import get_user_paths from utils import get_group_paths @@ -100,7 +100,7 @@ def setProfileImage(base_dir: str, http_prefix: str, image for the given person """ image_filename = image_filename.replace('\n', '').replace('\r', '') - if not isImageFile(image_filename): + if not is_image_file(image_filename): print('Profile image must be png, jpg, gif or svg format') return False diff --git a/session.py b/session.py index a1455687c..9ecdcc547 100644 --- a/session.py +++ b/session.py @@ -10,7 +10,7 @@ __module_group__ = "Session" import os import requests from utils import urlPermitted -from utils import isImageFile +from utils import is_image_file from httpsig import createSignedHeader import json from socket import error as SocketError @@ -398,7 +398,7 @@ def postImage(session, attachImageFilename: str, federation_list: [], print('postJson: ' + inboxUrl + ' not permitted') return None - if not isImageFile(attachImageFilename): + if not is_image_file(attachImageFilename): print('Image must be png, jpg, webp, avif, gif or svg') return None if not os.path.isfile(attachImageFilename): diff --git a/utils.py b/utils.py index 48196bd80..7f0db0bce 100644 --- a/utils.py +++ b/utils.py @@ -417,7 +417,7 @@ def get_image_formats() -> str: return imageFormats -def isImageFile(filename: str) -> bool: +def is_image_file(filename: str) -> bool: """Is the given filename an image? """ for ext in get_image_extensions(): @@ -432,12 +432,12 @@ def get_media_formats() -> str: """ media_ext = get_media_extensions() - mediaFormats = '' + media_formats = '' for ext in media_ext: - if mediaFormats: - mediaFormats += ', ' - mediaFormats += '.' + ext - return mediaFormats + if media_formats: + media_formats += ', ' + media_formats += '.' + ext + return media_formats def remove_html(content: str) -> str: