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

messages: Modify access_message for is_history_public_to_subscribers.

Browse Source 
This completes the Message side of #2745.
This commit is contained in:
Tim Abbott
2018-04-04 16:12:30 -07:00
parent bec71d7a50
commit 53e47e6991
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/message.py
View File

@@ -482,17 +482,28 @@ def access_message(user_profile: UserProfile, message_id: int) -> Tuple[Message,
# You can't access private messages you didn't receive
raise JsonableError(_("Invalid message(s)"))
stream = Stream.objects.get(id=message.recipient.type_id)
if not stream.is_public():
# You can't access messages sent to invite-only streams
# that you didn't receive
raise JsonableError(_("Invalid message(s)"))
# So the message is to a public stream
if stream.realm != user_profile.realm:
# You can't access public stream messages in other realms
raise JsonableError(_("Invalid message(s)"))
# Otherwise, the message must have been sent to a public
# stream in your realm, so return the message, user_message pair
if not stream.is_public():
if not stream.is_history_public_to_subscribers():
# You can't access messages sent to invite-only streams
# that you didn't receive
raise JsonableError(_("Invalid message(s)"))
# This stream is an invite-only stream where message
# history is available to subscribers. So we check if
# you're subscribed.
if not Subscription.objects.filter(user_profile=user_profile, active=True,
recipient=message.recipient).exists():
raise JsonableError(_("Invalid message(s)"))
# You are subscribed, so let this fall through to the public stream case.
else:
# Otherwise, the message was sent to a public stream in
# your realm, so return the message, user_message pair
pass
return (message, user_message)
def render_markdown(message: Message,