From 53dee7fce33c059d8d575dcc2248bf4bf84eb359 Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Thu, 20 Nov 2025 01:35:26 +0800 Subject: [PATCH] get_user_upload_previews: Rename to a more accurate name. This better reflects what the function does - it's not just a fetch, it actively causes the generation of previews. --- zerver/actions/message_edit.py | 4 ++-- zerver/actions/message_send.py | 4 ++-- zerver/lib/import_realm.py | 4 ++-- zerver/lib/markdown/__init__.py | 4 ++-- zerver/lib/thumbnail.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zerver/actions/message_edit.py b/zerver/actions/message_edit.py index 1e97da84b5..53397d51c6 100644 --- a/zerver/actions/message_edit.py +++ b/zerver/actions/message_edit.py @@ -64,7 +64,7 @@ from zerver.lib.streams import ( notify_stream_is_recently_active_update, ) from zerver.lib.string_validation import check_stream_topic -from zerver.lib.thumbnail import get_user_upload_previews, rewrite_thumbnailed_images +from zerver.lib.thumbnail import manifest_and_get_user_upload_previews, rewrite_thumbnailed_images from zerver.lib.timestamp import datetime_to_timestamp from zerver.lib.topic import ( ORIG_TOPIC, @@ -1741,7 +1741,7 @@ def re_thumbnail( ) -> None: message = message_class.objects.select_for_update().get(id=message_id) assert message.rendered_content is not None - image_metadata = get_user_upload_previews( + image_metadata = manifest_and_get_user_upload_previews( message.realm_id, message.rendered_content, enqueue=enqueue, diff --git a/zerver/actions/message_send.py b/zerver/actions/message_send.py index 5ea5585804..085c7aa21b 100644 --- a/zerver/actions/message_send.py +++ b/zerver/actions/message_send.py @@ -75,7 +75,7 @@ from zerver.lib.streams import ( subscribed_to_stream, ) from zerver.lib.string_validation import check_stream_name -from zerver.lib.thumbnail import get_user_upload_previews, rewrite_thumbnailed_images +from zerver.lib.thumbnail import manifest_and_get_user_upload_previews, rewrite_thumbnailed_images from zerver.lib.timestamp import timestamp_to_datetime from zerver.lib.topic import get_topic_display_name, participants_for_topic from zerver.lib.topic_link_util import get_stream_link_syntax @@ -935,7 +935,7 @@ def do_send_messages( # does not support this yet: (https://code.djangoproject.com/ticket/10088) assert send_request.message.rendered_content is not None if send_request.rendering_result.thumbnail_spinners: - previews = get_user_upload_previews( + previews = manifest_and_get_user_upload_previews( send_request.message.realm_id, send_request.message.content, lock=True, diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index b4ca16cceb..2eb5652577 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -54,7 +54,7 @@ from zerver.lib.streams import ( from zerver.lib.thumbnail import ( THUMBNAIL_ACCEPT_IMAGE_TYPES, BadImageError, - get_user_upload_previews, + manifest_and_get_user_upload_previews, maybe_thumbnail, ) from zerver.lib.timestamp import datetime_to_timestamp @@ -464,7 +464,7 @@ def fix_message_rendered_content( # time, and a no-op when those are processed. The return # value will also be out of date -- but that is irrelevant # in this use case. - get_user_upload_previews(realm.id, message[content_key]) + manifest_and_get_user_upload_previews(realm.id, message[content_key]) continue diff --git a/zerver/lib/markdown/__init__.py b/zerver/lib/markdown/__init__.py index dc8f02b003..e4f0a07aa6 100644 --- a/zerver/lib/markdown/__init__.py +++ b/zerver/lib/markdown/__init__.py @@ -57,7 +57,7 @@ from zerver.lib.subdomains import is_static_or_current_realm_url from zerver.lib.tex import render_tex from zerver.lib.thumbnail import ( AttachmentData, - get_user_upload_previews, + manifest_and_get_user_upload_previews, rewrite_thumbnailed_images, ) from zerver.lib.timeout import unsafe_timeout @@ -2621,7 +2621,7 @@ def do_convert( else: active_realm_emoji = {} - user_upload_previews = get_user_upload_previews(message_realm.id, content) + user_upload_previews = manifest_and_get_user_upload_previews(message_realm.id, content) _md_engine.zulip_db_data = DbData( realm_alert_words_automaton=realm_alert_words_automaton, mention_data=mention_data, diff --git a/zerver/lib/thumbnail.py b/zerver/lib/thumbnail.py index 45634166c2..cb0e8fbc7b 100644 --- a/zerver/lib/thumbnail.py +++ b/zerver/lib/thumbnail.py @@ -414,7 +414,7 @@ class AttachmentData: image_metadata: dict[str, MarkdownImageMetadata] -def get_user_upload_previews( +def manifest_and_get_user_upload_previews( realm_id: int, content: str, lock: bool = False,