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.
This commit is contained in:
Mateusz Mandera 2025-11-20 01:35:26 +08:00 committed by Tim Abbott
parent ee9a0fdc97
commit 53dee7fce3
5 changed files with 9 additions and 9 deletions

View File

@ -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,

View File

@ -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,

View File

@ -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

View File

@ -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,

View File

@ -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,