Fix room re-rendering

app/models/client/models/Users.js

@@ -6,7 +6,7 @@ Object.assign(Users, {
 			_id: userId,
 		};
 
-		const user = this.findOne(query);
+		const user = this.findOne(query, { fields: { roles: 1 } });
 		return user && Array.isArray(user.roles) && user.roles.includes(roleName);
 	},
 

app/ui-message/client/messageBox.js

@@ -1,9 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { ReactiveDict } from 'meteor/reactive-dict';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { Tracker } from 'meteor/tracker';
 import { EmojiPicker } from '../../emoji';
+import { Users } from '../../models';
 import { settings } from '../../settings';
 import {
 	fileUpload,
@@ -34,6 +36,7 @@ import './messageBox.html';
 
 
 Template.messageBox.onCreated(function() {
+	this.state = new ReactiveDict();
 	EmojiPicker.init();
 	this.popupConfig = new ReactiveVar(null);
 	this.replyMessageData = new ReactiveVar();
@@ -42,6 +45,32 @@ Template.messageBox.onCreated(function() {
 });
 
 Template.messageBox.onRendered(function() {
+
+	this.autorun(() => {
+		const { rid, subscription } = Template.currentData();
+		const room = Session.get(`roomData${ rid }`);
+
+		if (!room) {
+			return this.state.set({
+				room: false,
+				isBlockedOrBlocker: false,
+				mustJoinWithCode: false,
+			});
+		}
+
+		const isBlocked = (room && room.t === 'd' && subscription && subscription.blocked);
+		const isBlocker = (room && room.t === 'd' && subscription && subscription.blocker);
+		const isBlockedOrBlocker = isBlocked || isBlocker;
+
+		const mustJoinWithCode = !subscription && room.joinCodeRequired;
+
+		return this.state.set({
+			room: false,
+			isBlockedOrBlocker,
+			mustJoinWithCode,
+		});
+	});
+
 	this.autorun(() => {
 		const { rid, onInputChanged, onResize } = Template.currentData();
 
@@ -84,28 +113,31 @@ Template.messageBox.onRendered(function() {
 
 Template.messageBox.helpers({
 	isAnonymousOrMustJoinWithCode() {
-		const { rid, subscription } = Template.currentData();
+		const instance = Template.instance();
+		const { rid } = Template.currentData();
 		if (!rid) {
 			return false;
 		}
 
-		const roomData = Session.get(`roomData${ rid }`);
 		const isAnonymous = !Meteor.userId();
-		const mustJoinWithCode = !subscription && roomData && roomData.joinCodeRequired;
-		return isAnonymous || mustJoinWithCode;
+		return isAnonymous || instance.state.get('mustJoinWithCode');
 	},
 	isWritable() {
 		const { rid, subscription } = Template.currentData();
 		if (!rid) {
 			return true;
 		}
 
-		const roomData = Session.get(`roomData${ rid }`);
-		const isReadOnly = roomTypes.readOnly(rid, Meteor.user());
-		const isArchived = roomTypes.archived(rid) || (roomData && roomData.t === 'd' && subscription && subscription.archived);
-		const isBlocked = (roomData && roomData.t === 'd' && subscription && subscription.blocked);
-		const isBlocker = (roomData && roomData.t === 'd' && subscription && subscription.blocker);
-		return !isReadOnly && !isArchived && !isBlocked && !isBlocker;
+		const isBlockedOrBlocker = Template.instance().state.get('isBlockedOrBlocker');
+
+		if (isBlockedOrBlocker) {
+			return false;
+		}
+
+		const isReadOnly = roomTypes.readOnly(rid, Users.findOne({ _id: Meteor.userId() }, { fields: { username: 1 } }));
+		const isArchived = roomTypes.archived(rid) || (subscription && subscription.t === 'd' && subscription.archived);
+
+		return !isReadOnly && !isArchived;
 	},
 	popupConfig() {
 		return Template.instance().popupConfig.get();
@@ -142,15 +174,7 @@ Template.messageBox.helpers({
 		return formattingButtons.filter(({ condition }) => !condition || condition());
 	},
 	isBlockedOrBlocker() {
-		const { rid, subscription } = Template.currentData();
-		if (!rid) {
-			return true;
-		}
-
-		const roomData = Session.get(`roomData${ rid }`);
-		const isBlocked = (roomData && roomData.t === 'd' && subscription && subscription.blocked);
-		const isBlocker = (roomData && roomData.t === 'd' && subscription && subscription.blocker);
-		return isBlocked || isBlocker;
+		return Template.instance().state.get('isBlockedOrBlocker');
 	},
 });
 

app/ui-utils/client/lib/messageContext.js

@@ -1,15 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 
-import { Subscriptions, Rooms } from '../../../models';
-import { hasPermission } from '../../../authorization';
-import { settings } from '../../../settings';
-import { getUserPreference } from '../../../utils';
+import { Subscriptions, Rooms, Users } from '../../../models/client';
+import { hasPermission } from '../../../authorization/client';
+import { settings } from '../../../settings/client';
+import { getUserPreference } from '../../../utils/client';
 
 export function messageContext() {
 	const { rid } = Template.instance();
+	const uid = Meteor.userId();
 	return {
-		u: Meteor.user(),
+		u: Users.findOne({ _id: uid }, { fields: { name: 1, username: 1 } }),
 		room: Rooms.findOne({ _id: rid }, {
 			reactive: false,
 			fields: {
@@ -27,7 +28,7 @@ export function messageContext() {
 			showreply: true,
 			showReplyButton: true,
 			hasPermissionDeleteMessage: hasPermission('delete-message', rid),
-			hideRoles: !settings.get('UI_DisplayRoles') || getUserPreference(Meteor.userId(), 'hideRoles'),
+			hideRoles: !settings.get('UI_DisplayRoles') || getUserPreference(uid, 'hideRoles'),
 			UI_Use_Real_Name: settings.get('UI_Use_Real_Name'),
 			Chatops_Username: settings.get('Chatops_Username'),
 			AutoTranslate_Enabled: settings.get('AutoTranslate_Enabled'),

app/ui-utils/client/lib/prependReplies.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { MessageAction } from './MessageAction';
-import { Rooms } from '../../../models';
+import { Rooms, Users } from '../../../models/client';
 
 export const prependReplies = async (msg, replies = [], mention = false) => {
-	const { username } = Meteor.user();
+	const { username } = Users.findOne({ _id: Meteor.userId() }, { fields: { username: 1 } });
 
 	const chunks = await Promise.all(replies.map(async ({ _id, rid, u }) => {
 		const permalink = await MessageAction.getPermaLink(_id);

app/ui/client/lib/chatMessages.js

@@ -1,9 +1,14 @@
+import _ from 'underscore';
+import moment from 'moment';
+import toastr from 'toastr';
+
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { t, slashCommands, handleError } from '../../../utils';
+
+import { t, slashCommands, handleError } from '../../../utils/client';
 import {
 	messageProperties,
 	MessageTypes,
@@ -12,18 +17,16 @@ import {
 	call,
 	keyCodes,
 	prependReplies,
-} from '../../../ui-utils';
-import { settings } from '../../../settings';
-import { callbacks } from '../../../callbacks';
+} from '../../../ui-utils/client';
+import { settings } from '../../../settings/client';
+import { callbacks } from '../../../callbacks/client';
 import { promises } from '../../../promises/client';
-import { hasAtLeastOnePermission } from '../../../authorization';
-import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models';
-import { emoji } from '../../../emoji';
+import { hasAtLeastOnePermission } from '../../../authorization/client';
+import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models/client';
+import { emoji } from '../../../emoji/client';
+
 import { KonchatNotification } from './notification';
 import { MsgTyping } from './msgTyping';
-import _ from 'underscore';
-import moment from 'moment';
-import toastr from 'toastr';
 import { fileUpload } from './fileUpload';
 
 const messageBoxState = {

app/ui/client/views/app/room.js

@@ -37,7 +37,7 @@ export const chatMessages = {};
 
 const favoritesEnabled = () => settings.get('Favorite_Rooms');
 
-const userCanDrop = (_id) => !roomTypes.readOnly(_id, Meteor.user());
+const userCanDrop = (_id) => !roomTypes.readOnly(_id, Users.findOne({ _id: Meteor.userId() }, { fields: { username: 1 } }));
 
 const openProfileTab = (e, instance, username) => {
 	const roomData = Session.get(`roomData${ RoomManager.openedRoom }`);

app/utils/client/lib/roomTypes.js

@@ -38,23 +38,23 @@ export const roomTypes = new class RocketChatRoomTypes extends RoomTypesCommon {
 			rid: roomId,
 		}).count() > 0;
 	}
-	readOnly(roomId, user) {
+	readOnly(rid, user) {
 		const fields = {
 			ro: 1,
 		};
 		if (user) {
 			fields.muted = 1;
 		}
 		const room = ChatRoom.findOne({
-			_id: roomId,
+			_id: rid,
 		}, {
 			fields,
 		});
 		if (!user) {
 			return room && room.ro;
 		}
 		const userOwner = RoomRoles.findOne({
-			rid: roomId,
+			rid,
 			'u._id': user._id,
 			roles: 'owner',
 		}, {