paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

streams: Make /streams endpoint return also web-public streams.

Browse Source 
This commit modifies the /streams endpoint so that the web-public
streams are included in the default list of streams that users
have access to.

This is part of PR #14638 that aims to allow guest users to
browse and subscribe themselves to web public streams.
This commit is contained in:
Clara Dantas
2020-07-24 12:50:36 -03:00
committed by Tim Abbott
parent 0994b029d6
commit a9af80d7a2
4 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/actions.py
View File

@@ -5520,7 +5520,7 @@ def get_web_public_streams(realm: Realm) -> List[Dict[str, Any]]:
return streams
def do_get_streams(
user_profile: UserProfile, include_public: bool=True,
user_profile: UserProfile, include_public: bool=True, include_web_public: bool=False,
include_subscribed: bool=True, include_all_active: bool=False,
include_default: bool=False, include_owner_subscribed: bool=False,
) -> List[Dict[str, Any]]:
@@ -5552,6 +5552,9 @@ def do_get_streams(
if include_public:
invite_only_check = Q(invite_only=False)
add_filter_option(invite_only_check)
if include_web_public:
web_public_check = Q(is_web_public=True)
add_filter_option(web_public_check)
if include_owner_subscribed and user_profile.is_bot:
bot_owner = user_profile.bot_owner
assert bot_owner is not None