From be58f833efb6775c9ea90be9b78e11f6be4f8cec Mon Sep 17 00:00:00 2001 From: rimu <3310831+rimu@users.noreply.github.com> Date: Tue, 18 Jun 2024 20:12:20 +0800 Subject: [PATCH] prefer mime type to avoid having to parse messy urls --- app/activitypub/util.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/activitypub/util.py b/app/activitypub/util.py index f39bb357..7e1af065 100644 --- a/app/activitypub/util.py +++ b/app/activitypub/util.py @@ -974,13 +974,13 @@ def make_image_sizes_async(file_id, thumbnail_width, medium_width, directory): source_image = source_image_response.content source_image_response.close() - file_ext = os.path.splitext(file.source_url)[1] - # fall back to parsing the http content type if the url does not contain a file extension - if file_ext == '': - content_type_parts = content_type.split('/') - if content_type_parts: - file_ext = '.' + content_type_parts[-1] + content_type_parts = content_type.split('/') + if content_type_parts: + file_ext = '.' + content_type_parts[-1] + if file_ext == '.jpeg': + file_ext = '.jpg' else: + file_ext = os.path.splitext(file.source_url)[1] file_ext = file_ext.replace('%3f', '?') # sometimes urls are not decoded properly if '?' in file_ext: file_ext = file_ext.split('?')[0]