paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Remove PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS.

Browse Source 
Now that we have a UI for this feature, we don't need this setting
anymore.
This commit is contained in:
Eeshan Garg
2018-05-24 21:22:50 -02:30
committed by Tim Abbott
parent e458da5327
commit 0a1b429d04
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -1603,10 +1603,8 @@ def get_default_value_for_history_public_to_subscribers(
) -> bool: ) -> bool:
if invite_only: if invite_only:
if history_public_to_subscribers is None: if history_public_to_subscribers is None:
# TODO: Once we have a UI for this feature, we'll remove # A private stream's history is non-public by default
# settings.PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS and set history_public_to_subscribers = False
# this to be False here
history_public_to_subscribers = settings.PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS
else: else:
# If we later decide to support public streams without # If we later decide to support public streams without
# history, we can remove this code path. # history, we can remove this code path.

24
zerver/tests/test_subs.py
View File

@@ -185,30 +185,6 @@ class TestCreateStreams(ZulipTestCase):
if stream.name == 'publictrywithouthistory': if stream.name == 'publictrywithouthistory':
self.assertTrue(stream.history_public_to_subscribers) self.assertTrue(stream.history_public_to_subscribers)
@override_settings(PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS=True)
def test_history_public_to_subscribers_on_stream_creation_with_setting(self) -> None:
realm = get_realm('zulip')
stream, created = create_stream_if_needed(realm, "private_stream", invite_only=True)
self.assertTrue(created)
self.assertTrue(stream.invite_only)
self.assertTrue(stream.history_public_to_subscribers)
stream, created = create_stream_if_needed(realm, "history_stream",
invite_only=True,
history_public_to_subscribers=False)
self.assertTrue(created)
self.assertTrue(stream.invite_only)
self.assertFalse(stream.history_public_to_subscribers)
# You can't make a public stream limited in this way
stream, created = create_stream_if_needed(realm, "public_history_stream",
invite_only=False,
history_public_to_subscribers=False)
self.assertTrue(created)
self.assertFalse(stream.invite_only)
self.assertTrue(stream.history_public_to_subscribers)
def test_history_public_to_subscribers_zephyr_realm(self) -> None: def test_history_public_to_subscribers_zephyr_realm(self) -> None:
realm = get_realm('zephyr') realm = get_realm('zephyr')

6
zproject/settings.py
View File

@@ -321,12 +321,6 @@ DEFAULT_SETTINGS.update({
'MAX_ICON_FILE_SIZE': 5, 'MAX_ICON_FILE_SIZE': 5,
'MAX_EMOJI_FILE_SIZE': 5, 'MAX_EMOJI_FILE_SIZE': 5,
# TODO: This server setting is a hack to help with folks who are
# finding our private stream security model painful. Future work
# will migrate this to be a property of Stream or maybe Realm and
# this setting will be deprecated.
'PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS': False,
# Limits to help prevent spam, in particular by sending invitations. # Limits to help prevent spam, in particular by sending invitations.
# #
# A non-admin user who's joined an open realm this recently can't invite at all. # A non-admin user who's joined an open realm this recently can't invite at all.