From 257f74873297a6c6b4d14f2d21ffc3adad620c4c Mon Sep 17 00:00:00 2001 From: Christian Claus Date: Wed, 28 Mar 2018 06:02:04 +0200 Subject: [PLT-4340] Channel Mute and "/mute" command #7617 (#7713) * Add command and store changes to allow mute toggling * Change channel muting to use ChannelMember notification structure * Suppress email and push notifications for a muted channel * Make i18n keys issue-compliant * Add notification-cache handling for channel-muting * Add channel handle for channel-muting slash-command * Add unit test for mute command * Merge branch 'master' into PLT-4340 # Conflicts: # app/notification.go * Fix issue that command_mute responses will be overwritten * Fix i18n key for channel muting * Apply new Provider Interface to MuteCommand * Migrate mute notification property to mark_unread PLT-4340 * Make some i18n improvements for command_mute PLT-4340 * Remove de.json translations * Prevent push notifications when channel is muted * Treat Group messages like Direct messages * Fix unit test * Send WS event when the channel member notify props changed --- app/notification_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/notification_test.go') diff --git a/app/notification_test.go b/app/notification_test.go index 5fc1d152c..05574eb08 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -783,6 +783,14 @@ func TestDoesNotifyPropsAllowPushNotification(t *testing.T) { if DoesNotifyPropsAllowPushNotification(user, channelNotifyProps, post, true) { t.Fatal("Should have returned false") } + + // WHEN default is ALL and channel is MUTED + userNotifyProps[model.PUSH_NOTIFY_PROP] = model.USER_NOTIFY_ALL + user.NotifyProps = userNotifyProps + channelNotifyProps[model.MARK_UNREAD_NOTIFY_PROP] = model.CHANNEL_MARK_UNREAD_MENTION + if DoesNotifyPropsAllowPushNotification(user, channelNotifyProps, post, false) { + t.Fatal("Should have returned false") + } } func TestDoesStatusAllowPushNotification(t *testing.T) { -- cgit v1.2.3-1-g7c22