Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

import: Fix use of unused Subscription.notifications. 

This code should have been interacting with the specific sub-fields
for notifications.
This commit is contained in:
Roman Godov 2018-07-27 00:06:22 +03:00 committed by Tim Abbott
parent 879aa130ad
commit 064fca5b76
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/gitter_import.py
View File

@ -210,8 +210,10 @@ def build_subscription(recipient_id: int, user_id: int,
subscription_id: int) -> ZerverFieldsT: subscription_id: int) -> ZerverFieldsT:
subscription = dict( subscription = dict(
recipient=recipient_id, recipient=recipient_id,
notifications=False,
color=random.choice(stream_colors), color=random.choice(stream_colors),
audible_notifications=True,
push_notifications=False,
email_notifications=False,
desktop_notifications=True, desktop_notifications=True,
pin_to_top=False, pin_to_top=False,
in_home_view=True, in_home_view=True,

8
zerver/lib/slack_data_to_zulip_data.py
View File

@ -483,8 +483,10 @@ def build_pm_recipient_sub_from_user(zulip_user_id: int, recipient_id: int,
sub = dict( sub = dict(
recipient=recipient_id, recipient=recipient_id,
notifications=False,
color=random.choice(stream_colors), color=random.choice(stream_colors),
audible_notifications=True,
push_notifications=False,
email_notifications=False,
desktop_notifications=True, desktop_notifications=True,
pin_to_top=False, pin_to_top=False,
in_home_view=True, in_home_view=True,
@ -500,8 +502,10 @@ def build_subscription(channel_members: List[str], zerver_subscription: List[Zer
for member in channel_members: for member in channel_members:
sub = dict( sub = dict(
recipient=recipient_id, recipient=recipient_id,
notifications=False,
color=random.choice(stream_colors), color=random.choice(stream_colors),
audible_notifications=True,
push_notifications=False,
email_notifications=False,
desktop_notifications=True, desktop_notifications=True,
pin_to_top=False, pin_to_top=False,
in_home_view=True, in_home_view=True,