paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

embeds: Propagate group membership before updating UserMessage flags.

Browse Source
This commit is contained in:
Alex Vandiver
2025-08-13 15:23:35 +00:00
committed by Tim Abbott
parent bfdd28c638
commit 7480510aeb
4 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/tests/test_events.py
View File

@@ -1051,9 +1051,14 @@ class NormalActionsTest(BaseAction):
# Verify special case of embedded content update
content = "embed_content"
rendering_result = render_message_markdown(message, content)
mention_data = MentionData(
mention_backend=MentionBackend(message.realm_id),
content=content,
message_sender=message.sender,
)
rendering_result = render_message_markdown(message, content, mention_data=mention_data)
with self.verify_action(state_change_expected=False) as events:
do_update_embedded_data(self.user_profile, message, rendering_result)
do_update_embedded_data(self.user_profile, message, rendering_result, mention_data)
check_update_message(
"events[0]",
events[0],

52
zerver/tests/test_link_embed.py
View File

@@ -21,7 +21,7 @@ from zerver.lib.url_preview.oembed import get_oembed_data, strip_cdata
from zerver.lib.url_preview.parsers import GenericParser, OpenGraphParser
from zerver.lib.url_preview.preview import get_link_embed_data
from zerver.lib.url_preview.types import UrlEmbedData, UrlOEmbedData
from zerver.models import Message, Realm, UserProfile
from zerver.models import Message, Realm, UserMessage, UserProfile
from zerver.worker.embed_links import FetchLinksEmbedData
@@ -377,7 +377,11 @@ class PreviewTestCase(ZulipTestCase):
@responses.activate
@override_settings(INLINE_URL_EMBED_PREVIEW=True)
def _send_message_with_test_org_url(
self, sender: UserProfile, queue_should_run: bool = True, relative_url: bool = False
self,
sender: UserProfile,
queue_should_run: bool = True,
relative_url: bool = False,
other_content: str = "",
) -> Message:
url = "http://test.org/"
# Ensure the cache for this is empty
@@ -386,7 +390,7 @@ class PreviewTestCase(ZulipTestCase):
msg_id = self.send_personal_message(
sender,
self.example_user("cordelia"),
content=url,
content=url + other_content,
)
if queue_should_run:
patched.assert_called_once()
@@ -510,6 +514,48 @@ class PreviewTestCase(ZulipTestCase):
in info_logs.output[0]
)
def test_mentions_preserved(self) -> None:
# Updating the message with the preview content should be sure
# to preserve the mention data.
msg = self._send_message_with_test_org_url(
sender=self.example_user("hamlet"),
other_content=" @**Cordelia, Lear's daughter** mention",
)
self.assertEqual(
int(
UserMessage.objects.get(message=msg, user_profile=self.example_user("hamlet")).flags
),
int(UserMessage.flags.read | UserMessage.flags.is_private),
)
self.assertEqual(
int(
UserMessage.objects.get(
message=msg, user_profile=self.example_user("cordelia")
).flags
),
int(UserMessage.flags.mentioned | UserMessage.flags.is_private),
)
msg = self._send_message_with_test_org_url(
sender=self.example_user("hamlet"), other_content=" @*hamletcharacters* mention"
)
self.assertEqual(
int(
UserMessage.objects.get(message=msg, user_profile=self.example_user("hamlet")).flags
),
int(
UserMessage.flags.mentioned | UserMessage.flags.read | UserMessage.flags.is_private
),
)
self.assertEqual(
int(
UserMessage.objects.get(
message=msg, user_profile=self.example_user("cordelia")
).flags
),
int(UserMessage.flags.mentioned | UserMessage.flags.is_private),
)
def test_get_link_embed_data(self) -> None:
url = "http://test.org/"
embedded_link = f'<a href="{url}" title="The Rock">The Rock</a>'