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

Factor out Message() creation for internal use into separate function.

Browse Source 
(imported from commit 0352010da4255fc74cd67835e04dbdb1f8bbf4e9)
This commit is contained in:
Luke Faraone
2012-12-06 17:43:15 -05:00
parent 5b70b4a04f
commit 7fbee21584
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
zephyr/views.py
View File

@@ -16,7 +16,7 @@ from zephyr.models import Message, UserProfile, Stream, Subscription, \
do_activate_user, add_default_subs, do_create_user, do_send_message, \
create_mit_user_if_needed, create_stream_if_needed, StreamColor, \
PreregistrationUser, get_client, MitUser, User, UserActivity, \
log_subscription_property_change
log_subscription_property_change, internal_send_message
from zephyr.forms import RegistrationForm, HomepageForm, is_unique, \
is_active
from django.views.decorators.csrf import csrf_exempt
@@ -96,21 +96,14 @@ def accounts_register(request):
user = do_create_user(email, password, realm, full_name, short_name)
add_default_subs(user)
message = Message()
message.sender = UserProfile.objects.get(user__email="humbug+signups@humbughq.com")
message.recipient = Recipient.objects.get(type_id=create_stream_if_needed(
message.sender.realm, "signups").id, type=Recipient.STREAM)
message.subject = realm.domain
message.content = "%s <`%s`> just signed up for Humbug! (total: **%i**)" % (
full_name,
email,
UserProfile.objects.filter(realm=realm, user__is_active=True).count(),
internal_send_message("humbug+signups@humbughq.com",
Recipient.STREAM, "signups", realm.domain,
"%s <`%s`> just signed up for Humbug! (total: **%i**)" % (
full_name,
email,
UserProfile.objects.filter(realm=realm, user__is_active=True).count(),
)
)
message.pub_date = now()
message.sending_client = get_client("Internal")
do_send_message(message)
login(request, authenticate(username=email, password=password))
return HttpResponseRedirect(reverse('zephyr.views.home'))