Merge pull request #4422 from alexbrazier/feature/default-room-readonly

Fix bug when setting readonly room as default room

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)) {
 

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
 			}
 

packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html

@@ -29,7 +29,7 @@
 									{{> avatar username=username}}
 									<p>{{username}} {{utcOffset}}</p>
 									{{#if muted}}
-										<i class="icon-mute" title="{{_ "User Muted"}}"></i>
+										<i class="icon-mute" title="{{_ "User_muted"}}"></i>
 									{{/if}}
 								</button>
 							</li>