paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal_prep_private_message: Remove redundant realm arg.

Browse Source 
This is redundant and is taken based on recipient_user anyway.
This commit is contained in:
Mateusz Mandera
2022-09-04 15:57:56 +02:00
committed by Tim Abbott
parent 143a3350fa
commit 01d659b672
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/actions/message_send.py
View File

@@ -1593,7 +1593,6 @@ def internal_prep_stream_message_by_name(
def internal_prep_private_message( def internal_prep_private_message(
realm: Realm,
sender: UserProfile, sender: UserProfile,
recipient_user: UserProfile, recipient_user: UserProfile,
content: str, content: str,
@@ -1603,6 +1602,7 @@ def internal_prep_private_message(
See _internal_prep_message for details of how this works. See _internal_prep_message for details of how this works.
""" """
addressee = Addressee.for_user_profile(recipient_user) addressee = Addressee.for_user_profile(recipient_user)
realm = recipient_user.realm
return _internal_prep_message( return _internal_prep_message(
realm=realm, realm=realm,
@@ -1616,8 +1616,7 @@ def internal_prep_private_message(
def internal_send_private_message( def internal_send_private_message(
sender: UserProfile, recipient_user: UserProfile, content: str sender: UserProfile, recipient_user: UserProfile, content: str
) -> Optional[int]: ) -> Optional[int]:
realm = recipient_user.realm message = internal_prep_private_message(sender, recipient_user, content)
message = internal_prep_private_message(realm, sender, recipient_user, content)
if message is None: if message is None:
return None return None
message_ids = do_send_messages([message]) message_ids = do_send_messages([message])

5
zerver/tests/test_message_send.py
View File

@@ -2257,13 +2257,12 @@ class InternalPrepTest(ZulipTestCase):
) )
def test_error_handling(self) -> None: def test_error_handling(self) -> None:
realm = get_realm("zulip")
sender = self.example_user("cordelia") sender = self.example_user("cordelia")
recipient_user = self.example_user("hamlet") recipient_user = self.example_user("hamlet")
content = "x" * 15000 content = "x" * 15000
result = internal_prep_private_message( result = internal_prep_private_message(
realm=realm, sender=sender, recipient_user=recipient_user, content=content sender=sender, recipient_user=recipient_user, content=content
) )
assert result is not None assert result is not None
message = result.message message = result.message
@@ -2274,7 +2273,7 @@ class InternalPrepTest(ZulipTestCase):
recipient_user = self.mit_user("starnine") recipient_user = self.mit_user("starnine")
with self.assertLogs(level="ERROR") as m: with self.assertLogs(level="ERROR") as m:
result = internal_prep_private_message( result = internal_prep_private_message(
realm=realm, sender=sender, recipient_user=recipient_user, content=content sender=sender, recipient_user=recipient_user, content=content
) )
self.assertEqual( self.assertEqual(

1
zerver/views/streams.py
View File

@@ -694,7 +694,6 @@ def send_messages_for_new_subscribers(
notifications.append( notifications.append(
internal_prep_private_message( internal_prep_private_message(
realm=realm,
sender=sender, sender=sender,
recipient_user=recipient_user, recipient_user=recipient_user,
content=msg, content=msg,