From 513fcb7bd51eea5657c26682194b1120ba8e6d10 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 16 May 2022 11:35:54 -0700
Subject: [PATCH] Revert "settings: Add web-public streams beta subdomain
 list."

This reverts commit 20368a936cda44b433e275a522a95921ee0c30de.  It is
no longer in beta, and this configuration is no longer needed.
---
 zerver/lib/events.py         |  2 +-
 zerver/models.py             | 11 +----------
 zerver/tests/test_realm.py   |  4 ----
 zproject/default_settings.py |  2 --
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/zerver/lib/events.py b/zerver/lib/events.py
index 01b3ddcfe5..1ee558749e 100644
--- a/zerver/lib/events.py
+++ b/zerver/lib/events.py
@@ -297,7 +297,7 @@ def fetch_initial_state_data(
         state["server_inline_url_embed_preview"] = settings.INLINE_URL_EMBED_PREVIEW
         state["server_avatar_changes_disabled"] = settings.AVATAR_CHANGES_DISABLED
         state["server_name_changes_disabled"] = settings.NAME_CHANGES_DISABLED
-        state["server_web_public_streams_enabled"] = realm.web_public_streams_available_for_realm()
+        state["server_web_public_streams_enabled"] = settings.WEB_PUBLIC_STREAMS_ENABLED
         state["giphy_rating_options"] = realm.GIPHY_RATING_OPTIONS
 
         state["server_needs_upgrade"] = is_outdated_server(user_profile)
diff --git a/zerver/models.py b/zerver/models.py
index 2ff84b231b..158c53fe6c 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -941,22 +941,13 @@ class Realm(models.Model):
     def presence_disabled(self) -> bool:
         return self.is_zephyr_mirror_realm
 
-    def web_public_streams_available_for_realm(self) -> bool:
-        if self.string_id in settings.WEB_PUBLIC_STREAMS_BETA_SUBDOMAINS:
-            return True
-
+    def web_public_streams_enabled(self) -> bool:
         if not settings.WEB_PUBLIC_STREAMS_ENABLED:
             # To help protect against accidentally web-public streams in
             # self-hosted servers, we require the feature to be enabled at
             # the server level before it is available to users.
             return False
 
-        return True
-
-    def web_public_streams_enabled(self) -> bool:
-        if not self.web_public_streams_available_for_realm():
-            return False
-
         if self.plan_type == Realm.PLAN_TYPE_LIMITED:
             # In Zulip Cloud, we also require a paid or sponsored
             # plan, to protect against the spam/abuse attacks that
diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py
index ee94d143db..3eaf532a2c 100644
--- a/zerver/tests/test_realm.py
+++ b/zerver/tests/test_realm.py
@@ -849,10 +849,6 @@ class RealmTest(ZulipTestCase):
             self.assertEqual(realm.has_web_public_streams(), False)
             self.assertEqual(realm.web_public_streams_enabled(), False)
 
-            with self.settings(WEB_PUBLIC_STREAMS_BETA_SUBDOMAINS=["zulip"]):
-                self.assertEqual(realm.has_web_public_streams(), True)
-                self.assertEqual(realm.web_public_streams_enabled(), True)
-
         realm.enable_spectator_access = False
         realm.save()
         self.assertEqual(realm.has_web_public_streams(), False)
diff --git a/zproject/default_settings.py b/zproject/default_settings.py
index 36d206d496..86a7f80b6c 100644
--- a/zproject/default_settings.py
+++ b/zproject/default_settings.py
@@ -261,8 +261,6 @@ OPEN_REALM_CREATION = False
 
 # Whether it's possible to create web-public streams on this server.
 WEB_PUBLIC_STREAMS_ENABLED = False
-# Temporary setting during web-public streams beta.
-WEB_PUBLIC_STREAMS_BETA_SUBDOMAINS: List[str] = []
 
 # Setting for where the system bot users are.  Likely has no
 # purpose now that the REALMS_HAVE_SUBDOMAINS migration is finished.