Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) #5373

Merged
merged 14 commits into from
Apr 19, 2017
Merged

[NEW] Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) #5373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
28c3c4c
Add setting to mute room notifications
marceloschmidt Dec 29, 2016
196cac5
Use mute settings to stop channels from highlighting or notifications
marceloschmidt Dec 29, 2016
44a929c
Hide notification settings if mute is set
marceloschmidt Dec 30, 2016
e629b99
Merge branch 'develop' into mute-notifications
marceloschmidt Mar 21, 2017
625c123
Change wording for “muting” channels.
marceloschmidt Mar 22, 2017
156e650
Hides unread status from Electron app as well
marceloschmidt Mar 22, 2017
39d00ce
Adds changes to History.md
marceloschmidt Mar 22, 2017
6dfab4a
Stops notifications on direct messages when set to disabled
marceloschmidt Mar 22, 2017
e47a2eb
Merge branch 'develop' into mute-notifications
marceloschmidt Apr 17, 2017
740e1c5
npm shrinkwrap
marceloschmidt Apr 17, 2017
75facda
Fix codacy issues
marceloschmidt Apr 17, 2017
d5a2382
Update HISTORY.md
rodrigok Apr 19, 2017
ff25a24
Remove .coffee file
marceloschmidt Apr 19, 2017
159a877
Merge branch 'mute-notifications' of github.com:RocketChat/Rocket.Cha…
marceloschmidt Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stops notifications on direct messages when set to disabled
  • Loading branch information
@marceloschmidt
marceloschmidt committed Mar 22, 2017
commit 6dfab4aafb3b11806ea4a686640acb8c8bfc6d11
3 changes: 2 additions & 1 deletion packages/rocketchat-push-notifications/server/models/Subscriptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ RocketChat.models.Subscriptions.findNotificationPreferencesByRoom = function(roo
{audioNotification: {$exists: true}},
{desktopNotifications: {$exists: true}},
{desktopNotificationDuration: {$exists: true}},
{mobilePushNotifications: {$exists: true}}
{mobilePushNotifications: {$exists: true}},
{disableNotifications: {$exists: true}}
]
};

Expand Down
7 changes: 5 additions & 2 deletions packages/rocketchat-ui-sidenav/client/channels.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ Template.channels.helpers
query.f = { $ne: true }

if Meteor.user()?.settings?.preferences?.unreadRoomsMode
query.alert =
$ne: true
query.$or = [
alert: $ne: true
,
hideUnreadStatus: true
]

return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }

Expand Down
7 changes: 5 additions & 2 deletions packages/rocketchat-ui-sidenav/client/combined.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ Template.combined.helpers
query.f = { $ne: true }

if Meteor.user()?.settings?.preferences?.unreadRoomsMode
query.alert =
$ne: true
query.$or = [
alert: $ne: true
,
hideUnreadStatus: true
]

return ChatSubscription.find query, { sort: 'name': 1 }

Expand Down
7 changes: 5 additions & 2 deletions packages/rocketchat-ui-sidenav/client/directMessages.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ Template.directMessages.helpers
query = { t: { $in: ['d']}, f: { $ne: true }, open: true }

if Meteor.user()?.settings?.preferences?.unreadRoomsMode
query.alert =
$ne: true
query.$or = [
alert: $ne: true
,
hideUnreadStatus: true
]

return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }
7 changes: 5 additions & 2 deletions packages/rocketchat-ui-sidenav/client/privateGroups.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ Template.privateGroups.helpers
query = { t: { $in: ['p']}, f: { $ne: true }, open: true }

if Meteor.user()?.settings?.preferences?.unreadRoomsMode
query.alert =
$ne: true
query.$or = [
alert: $ne: true
,
hideUnreadStatus: true
]

return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }

Expand Down
7 changes: 5 additions & 2 deletions packages/rocketchat-ui-sidenav/client/starredRooms.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ Template.starredRooms.helpers
query = { f: true, open: true }

if Meteor.user()?.settings?.preferences?.unreadRoomsMode
query.alert =
$ne: true
query.$or = [
alert: $ne: true
,
hideUnreadStatus: true
]

return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }
total: ->
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui-sidenav/client/unreadRooms.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ Template.unreadRooms.onCreated ->
query =
alert: true
open: true
hideUnreadStatus: { $ne: true }

@unreadRooms = ChatSubscription.find query, { sort: 't': 1, 'name': 1 }