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

do_add_subscription: Don't unnecessarily fetch subscription from the database.

Browse Source 
(imported from commit ffe2c8d2026b60a91dd54f10cfd9df0adbfd7acd)
This commit is contained in:
Tim Abbott
2013-03-29 15:47:47 -04:00
parent 2a46c46fa8
commit fa20696230
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zephyr/lib/actions.py
View File

@@ -415,15 +415,18 @@ def pick_color(user_profile):
def get_subscription(stream_name, user_profile):
stream = get_stream(stream_name, user_profile.realm)
recipient = get_recipient(Recipient.STREAM, stream.id)
return Subscription.objects.filter(user_profile=user_profile,
recipient=recipient, active=True)
return Subscription.objects.get(user_profile=user_profile,
recipient=recipient, active=True)
def set_stream_color(user_profile, stream_name, color=None):
subscription = get_subscription(stream_name, user_profile)
return set_stream_color_backend(user_profile, subscription, color)
def set_stream_color_backend(user_profile, subscription, color=None):
# TODO: sanitize color.
if not color:
color = pick_color(user_profile)
subscription = get_subscription(stream_name, user_profile)
stream_color, created = StreamColor.objects.get_or_create(subscription=subscription[0],
stream_color, created = StreamColor.objects.get_or_create(subscription=subscription,
defaults={'color': color})
if not created:
stream_color.color = color
@@ -440,7 +443,7 @@ def do_add_subscription(user_profile, stream, no_log=False):
did_subscribe = True
subscription.active = True
subscription.save(update_fields=["active"])
color = set_stream_color(user_profile, stream.name)
color = set_stream_color_backend(user_profile, subscription)
if did_subscribe:
if not no_log:
log_event({'type': 'subscription_added',