diff --git a/packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js b/packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js index a520ff941f59a..20b6090837b3c 100644 --- a/packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js +++ b/packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js @@ -4,7 +4,8 @@ RocketChat.addUserToDefaultChannels = function(user, silenced) { defaultRooms.forEach((room) => { // put user in default rooms - RocketChat.models.Rooms.addUsernameById(room._id, user.username); + let muted = room.ro && !RocketChat.authz.hasPermission(user._id, 'post-readonly'); + RocketChat.models.Rooms.addUsernameById(room._id, user.username, muted); if (!RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user._id)) { diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee index 3141feb234cda..9717825a27599 100644 --- a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee +++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee @@ -16,8 +16,10 @@ Template.membersList.helpers roomUsers: -> onlineUsers = RoomManager.onlineUsers.get() - roomUsernames = ChatRoom.findOne(this.rid)?.usernames or [] + room = ChatRoom.findOne(this.rid) + roomUsernames = room?.usernames or [] roomOnlineUsernames = roomUsernames.filter((username) -> onlineUsers[username]) + roomMuted = room?.muted or [] if Template.instance().showAllUsers.get() usernames = roomUsernames @@ -35,6 +37,7 @@ Template.membersList.helpers return { username: username status: onlineUsers[username]?.status + muted: username in roomMuted utcOffset: utcOffset } diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html index 17db23204005e..2e403adb74e05 100644 --- a/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html +++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html @@ -29,7 +29,7 @@
{{username}} {{utcOffset}}
{{#if muted}} - + {{/if}}