From 4b9770e270823b7ed2bbbeda0e4450f0ba6a288b Mon Sep 17 00:00:00 2001
From: NerdyLucifer <ashwat.kumarsingh.met20@itbhu.ac.in>
Date: Sat, 5 Mar 2022 02:58:37 +0530
Subject: [PATCH] stream_settings: Show stream privacy & description in stream
 events.

Provide stream privacy and description in stream notification events
when stream is created.
In function "send_messages_for_new_subscribers" for when stream is
created, put policy name and description of the stream.

Fixes #21004
---
 zerver/tests/test_subs.py | 25 +++++++++++++++++++------
 zerver/views/streams.py   | 14 +++++++++++++-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index bca098255f..e1835ecb3e 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -4127,6 +4127,7 @@ class SubscriptionAPITest(ZulipTestCase):
         invitee_data: Union[str, int],
         invitee_realm: Realm,
         streams: List[str],
+        policy_name: str,
         invite_only: bool = False,
     ) -> None:
         """
@@ -4162,7 +4163,9 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assertEqual(msg.topic_name(), "stream events")
         self.assertEqual(msg.sender.email, settings.NOTIFICATION_BOT)
         self.assertIn(
-            f"Stream created by @_**{self.test_user.full_name}|{self.test_user.id}**", msg.content
+            f"**{policy_name}** stream created by @_**{self.test_user.full_name}|{self.test_user.id}**. **Description:**\n"
+            "```` quote",
+            msg.content,
         )
 
     def test_multi_user_subscription(self) -> None:
@@ -4604,13 +4607,17 @@ class SubscriptionAPITest(ZulipTestCase):
         invitee = self.example_user("iago")
         current_streams = self.get_streams(invitee)
         invite_streams = self.make_random_stream_names(current_streams)
-        self.assert_adding_subscriptions_for_principal(invitee.id, invitee.realm, invite_streams)
+        self.assert_adding_subscriptions_for_principal(
+            invitee.id, invitee.realm, invite_streams, policy_name="Public"
+        )
 
     def test_subscriptions_add_for_principal_legacy_emails(self) -> None:
         invitee = self.example_user("iago")
         current_streams = self.get_streams(invitee)
         invite_streams = self.make_random_stream_names(current_streams)
-        self.assert_adding_subscriptions_for_principal(invitee.email, invitee.realm, invite_streams)
+        self.assert_adding_subscriptions_for_principal(
+            invitee.email, invitee.realm, invite_streams, policy_name="Public"
+        )
 
     def test_subscriptions_add_for_principal_deactivated(self) -> None:
         """
@@ -4640,7 +4647,11 @@ class SubscriptionAPITest(ZulipTestCase):
         current_streams = self.get_streams(invitee)
         invite_streams = self.make_random_stream_names(current_streams)
         self.assert_adding_subscriptions_for_principal(
-            invitee.id, invitee.realm, invite_streams, invite_only=True
+            invitee.id,
+            invitee.realm,
+            invite_streams,
+            invite_only=True,
+            policy_name="Private, protected history",
         )
 
     def test_non_ascii_subscription_for_principal(self) -> None:
@@ -4649,7 +4660,9 @@ class SubscriptionAPITest(ZulipTestCase):
         non-ASCII characters.
         """
         iago = self.example_user("iago")
-        self.assert_adding_subscriptions_for_principal(iago.id, get_realm("zulip"), ["hümbüǵ"])
+        self.assert_adding_subscriptions_for_principal(
+            iago.id, get_realm("zulip"), ["hümbüǵ"], policy_name="Public"
+        )
 
     def test_subscription_add_invalid_principal_legacy_emails(self) -> None:
         """
@@ -4907,7 +4920,7 @@ class SubscriptionAPITest(ZulipTestCase):
         current_stream = self.get_streams(user_profile)[0]
         invite_streams = self.make_random_stream_names([current_stream])
         self.assert_adding_subscriptions_for_principal(
-            invitee_user_id, invitee_realm, invite_streams
+            invitee_user_id, invitee_realm, invite_streams, policy_name="Public"
         )
         subscription = self.get_subscription(user_profile, invite_streams[0])
 
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 9770d894f2..251b83054e 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -63,6 +63,7 @@ from zerver.lib.streams import (
     access_web_public_stream,
     check_stream_name_available,
     filter_stream_authorization,
+    get_stream_permission_policy_name,
     list_to_streams,
 )
 from zerver.lib.string_validation import check_stream_name
@@ -685,8 +686,19 @@ def send_messages_for_new_subscribers(
                         sender=sender,
                         stream=stream,
                         topic=Realm.STREAM_EVENTS_NOTIFICATION_TOPIC,
-                        content=_("Stream created by {user_name}.").format(
+                        content=_(
+                            "**{policy}** stream created by {user_name}. **Description:**\n"
+                            "```` quote\n"
+                            "{description}\n"
+                            "````"
+                        ).format(
                             user_name=silent_mention_syntax_for_user(user_profile),
+                            description=stream.description,
+                            policy=get_stream_permission_policy_name(
+                                invite_only=stream.invite_only,
+                                history_public_to_subscribers=stream.history_public_to_subscribers,
+                                is_web_public=stream.is_web_public,
+                            ),
                         ),
                     ),
                 )