From 01d659b672ca7192f0214a6cc4808e9bda561238 Mon Sep 17 00:00:00 2001
From: Mateusz Mandera <mateusz.mandera@zulip.com>
Date: Sun, 4 Sep 2022 15:57:56 +0200
Subject: [PATCH] internal_prep_private_message: Remove redundant realm arg.

This is redundant and is taken based on recipient_user anyway.
---
 zerver/actions/message_send.py    | 5 ++---
 zerver/tests/test_message_send.py | 5 ++---
 zerver/views/streams.py           | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/zerver/actions/message_send.py b/zerver/actions/message_send.py
index 87e590191a..bb6d6fb327 100644
--- a/zerver/actions/message_send.py
+++ b/zerver/actions/message_send.py
@@ -1593,7 +1593,6 @@ def internal_prep_stream_message_by_name(
 
 
 def internal_prep_private_message(
-    realm: Realm,
     sender: UserProfile,
     recipient_user: UserProfile,
     content: str,
@@ -1603,6 +1602,7 @@ def internal_prep_private_message(
     See _internal_prep_message for details of how this works.
     """
     addressee = Addressee.for_user_profile(recipient_user)
+    realm = recipient_user.realm
 
     return _internal_prep_message(
         realm=realm,
@@ -1616,8 +1616,7 @@ def internal_prep_private_message(
 def internal_send_private_message(
     sender: UserProfile, recipient_user: UserProfile, content: str
 ) -> Optional[int]:
-    realm = recipient_user.realm
-    message = internal_prep_private_message(realm, sender, recipient_user, content)
+    message = internal_prep_private_message(sender, recipient_user, content)
     if message is None:
         return None
     message_ids = do_send_messages([message])
diff --git a/zerver/tests/test_message_send.py b/zerver/tests/test_message_send.py
index 51850c1b7c..b26d7374a9 100644
--- a/zerver/tests/test_message_send.py
+++ b/zerver/tests/test_message_send.py
@@ -2257,13 +2257,12 @@ class InternalPrepTest(ZulipTestCase):
         )
 
     def test_error_handling(self) -> None:
-        realm = get_realm("zulip")
         sender = self.example_user("cordelia")
         recipient_user = self.example_user("hamlet")
         content = "x" * 15000
 
         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
         message = result.message
@@ -2274,7 +2273,7 @@ class InternalPrepTest(ZulipTestCase):
         recipient_user = self.mit_user("starnine")
         with self.assertLogs(level="ERROR") as m:
             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(
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 815a07234d..8d1edee01c 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -694,7 +694,6 @@ def send_messages_for_new_subscribers(
 
             notifications.append(
                 internal_prep_private_message(
-                    realm=realm,
                     sender=sender,
                     recipient_user=recipient_user,
                     content=msg,