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

actions: Send new user messages to signup_notifications_stream.

Browse Source
This commit is contained in:
Vishnu Ks
2017-10-04 05:31:22 +05:30
committed by Tim Abbott
parent 42652713c8
commit a0275a6257
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/lib/actions.py
View File

@@ -229,7 +229,7 @@ def get_topic_history_for_stream(user_profile, recipient):
return history
def send_signup_message(sender, signups_stream, user_profile,
def send_signup_message(sender, admin_realm_signup_notifications_stream, user_profile,
internal=False, realm=None):
# type: (UserProfile, Text, UserProfile, bool, Optional[Realm]) -> None
if internal:
@@ -239,24 +239,26 @@ def send_signup_message(sender, signups_stream, user_profile,
internal_blurb = " "
user_count = realm_user_count(user_profile.realm)
notifications_stream = user_profile.realm.get_notifications_stream()
# Send notification to realm notifications stream if it exists
signup_notifications_stream = user_profile.realm.get_signup_notifications_stream()
# Send notification to realm signup notifications stream if it exists
# Don't send notification for the first user in a realm
if notifications_stream is not None and user_count > 1:
if signup_notifications_stream is not None and user_count > 1:
internal_send_message(
user_profile.realm,
sender,
"stream",
notifications_stream.name,
"New users", "%s just signed up for Zulip. Say hello!" % (
user_profile.full_name,)
signup_notifications_stream.name,
"signups",
"%s (%s) just signed up for Zulip. (total: %i)" % (
user_profile.full_name, user_profile.email, user_count
)
)
# We also send a notification to the Zulip administrative realm
admin_realm = get_system_bot(sender).realm
try:
# Check whether the stream exists
get_stream(signups_stream, admin_realm)
get_stream(admin_realm_signup_notifications_stream, admin_realm)
except Stream.DoesNotExist:
# If the signups stream hasn't been created in the admin
# realm, don't auto-create it to send to it; just do nothing.
@@ -265,7 +267,7 @@ def send_signup_message(sender, signups_stream, user_profile,
admin_realm,
sender,
"stream",
signups_stream,
admin_realm_signup_notifications_stream,
user_profile.realm.display_subdomain,
"%s <`%s`> just signed up for Zulip!%s(total: **%i**)" % (
user_profile.full_name,
@@ -1795,6 +1797,8 @@ def check_message(sender, client, addressee,
elif sender.email == settings.WELCOME_BOT:
# The welcome bot welcomes folks to the stream.
pass
elif sender.email == settings.NEW_USER_BOT:
pass
else:
# All other cases are an error.
raise JsonableError(_("Not authorized to send to stream '%s'") % (stream.name,))