CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-03 21:10:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing active check on subscriptions for new zephyrs.

Browse Source 
(imported from commit 58d2a30d221b0849d6e8ed063d75f8781e38f536)
This commit is contained in:
Jessica McKellar 2012-08-30 17:31:11 -04:00
parent 546c61a979
commit 5355b4ea1f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/models.py
View File

@ -86,12 +86,14 @@ class Zephyr(models.Model):
def send_zephyr(**kwargs):
zephyr = kwargs["instance"]
print repr(zephyr)
if zephyr.recipient.type == "personal":
recipients = UserProfile.objects.filter(user=zephyr.recipient.user_or_class)
assert(len(recipients) == 1)
elif zephyr.recipient.type == "class":
recipients = [UserProfile.objects.get(user=s.userprofile_id) for
s in Subscription.objects.filter(recipient_id=zephyr.recipient, active=True)]
print recipients
else:
raise
for recipient in recipients:
@ -110,7 +112,7 @@ class Subscription(models.Model):
def filter_by_subscriptions(zephyrs, user):
userprofile = UserProfile.objects.get(user=user)
subscribed_zephyrs = []
subscriptions = [sub.recipient_id for sub in Subscription.objects.filter(userprofile_id=userprofile)]
subscriptions = [sub.recipient_id for sub in Subscription.objects.filter(userprofile_id=userprofile, active=True)]
for zephyr in zephyrs:
# If you are subscribed to the personal or class, or if you sent the personal, you can see the zephyr.
if (zephyr.recipient in subscriptions) or \