Chore: refactor/room

apps/meteor/app/autotranslate/client/lib/actionButton.ts

@@ -32,6 +32,10 @@ Meteor.startup(() => {
 					Messages.update({ _id: message._id }, { [action]: { autoTranslateShowInverse: true } });
 				},
 				condition({ message, user }) {
+					if (!user) {
+						return false;
+					}
+
 					return Boolean(message?.u && message.u._id !== user._id && isTranslatedMessage(message) && message.autoTranslateShowInverse);
 				},
 				order: 90,
@@ -54,6 +58,10 @@ Meteor.startup(() => {
 					Messages.update({ _id: message._id }, { [action]: { autoTranslateShowInverse: true } });
 				},
 				condition({ message, user }) {
+					if (!user) {
+						return false;
+					}
+
 					return Boolean(message?.u && message.u._id !== user._id && isTranslatedMessage(message) && !message.autoTranslateShowInverse);
 				},
 				order: 90,

apps/meteor/app/discussion/client/createDiscussionMessageAction.ts

@@ -54,6 +54,10 @@ Meteor.startup(function () {
 					return false;
 				}
 
+				if (!user) {
+					return false;
+				}
+
 				return uid !== user._id ? hasPermission('start-discussion-other-user') : hasPermission('start-discussion');
 			},
 			order: 1,

apps/meteor/app/file-upload/server/methods/sendFileMessage.ts

@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import _ from 'underscore';
 import type { MessageAttachment, FileAttachmentProps, IUser } from '@rocket.chat/core-typings';
 import { Rooms, Uploads } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { FileUpload } from '../lib/FileUpload';
 import { canAccessRoom } from '../../../authorization/server/functions/canAccessRoom';
 import { SystemLogger } from '../../../../server/lib/logger/system';
+import { omit } from '../../../../lib/utils/omit';
 
 Meteor.methods({
 	async sendFileMessage(roomId, _store, file, msgData = {}) {
@@ -36,7 +36,7 @@ Meteor.methods({
 			tmid: Match.Optional(String),
 		});
 
-		await Uploads.updateFileComplete(file._id, user._id, _.omit(file, '_id'));
+		await Uploads.updateFileComplete(file._id, user._id, omit(file, '_id'));
 
 		const fileUrl = FileUpload.getPath(`${file._id}/${encodeURI(file.name)}`);
 

apps/meteor/app/integrations/server/lib/triggerHandler.js

@@ -15,6 +15,7 @@ import { getRoomByNameOrIdWithOptionToJoin, processWebhookMessage } from '../../
 import { outgoingLogger } from '../logger';
 import { outgoingEvents } from '../../lib/outgoingEvents';
 import { fetch } from '../../../../server/lib/http/fetch';
+import { omit } from '../../../../lib/utils/omit';
 
 export class RocketChatIntegrationHandler {
 	constructor() {
@@ -103,7 +104,7 @@ export class RocketChatIntegrationHandler {
 			history.data = { ...data };
 
 			if (data.user) {
-				history.data.user = _.omit(data.user, ['services']);
+				history.data.user = omit(data.user, 'services');
 			}
 
 			if (data.room) {

apps/meteor/app/mentions-flextab/client/actionButton.ts

@@ -33,7 +33,7 @@ Meteor.startup(function () {
 					},
 				);
 			}
-			RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message);
 		},
 		order: 100,
 		group: ['message', 'menu'],

apps/meteor/app/message-mark-as-unread/client/actionButton.ts

@@ -35,6 +35,11 @@ Meteor.startup(() => {
 			if (isLivechatRoom) {
 				return false;
 			}
+
+			if (!user) {
+				return false;
+			}
+
 			return message.u._id !== user._id;
 		},
 		order: 10,

apps/meteor/app/message-pin/client/actionButton.ts

@@ -90,7 +90,7 @@ Meteor.startup(function () {
 					},
 				);
 			}
-			return RoomHistoryManager.getSurroundingMessages(message, 50);
+			return RoomHistoryManager.getSurroundingMessages(message);
 		},
 		condition({ subscription }) {
 			return !!subscription;

apps/meteor/app/message-star/client/actionButton.ts

@@ -33,7 +33,7 @@ Meteor.startup(function () {
 				return false;
 			}
 
-			return !Array.isArray(message.starred) || !message.starred.find((star: any) => star._id === user._id);
+			return !Array.isArray(message.starred) || !message.starred.find((star: any) => star._id === user?._id);
 		},
 		order: 9,
 		group: 'menu',
@@ -58,7 +58,7 @@ Meteor.startup(function () {
 				return false;
 			}
 
-			return Boolean(message.starred?.find((star: any) => star._id === user._id));
+			return Boolean(message.starred?.find((star: any) => star._id === user?._id));
 		},
 		order: 9,
 		group: 'menu',
@@ -90,14 +90,14 @@ Meteor.startup(function () {
 					},
 				);
 			}
-			RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message);
 		},
 		condition({ message, subscription, user }) {
 			if (subscription == null || !settings.get('Message_AllowStarring')) {
 				return false;
 			}
 
-			return Boolean(message.starred?.find((star) => star._id === user._id));
+			return Boolean(message.starred?.find((star) => star._id === user?._id));
 		},
 		order: 100,
 		group: ['message', 'menu'],
@@ -120,7 +120,7 @@ Meteor.startup(function () {
 				return false;
 			}
 
-			return Boolean(message.starred?.find((star) => star._id === user._id));
+			return Boolean(message.starred?.find((star) => star._id === user?._id));
 		},
 		order: 101,
 		group: 'menu',

apps/meteor/app/meteor-autocomplete/client/templates.js

@@ -1,7 +1,7 @@
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import _ from 'underscore';
 
+import { omit } from '../../../lib/utils/omit';
 import AutoComplete from './autocomplete-client';
 
 //  Events on template instances, sent to the autocomplete class
@@ -25,7 +25,7 @@ Template.inputAutocomplete.events(acEvents);
 Template.textareaAutocomplete.events(acEvents);
 
 const attributes = function () {
-	return _.omit(this, 'settings'); // Render all but the settings parameter
+	return omit(this, 'settings'); // Render all but the settings parameter
 };
 
 const autocompleteHelpers = {

apps/meteor/app/models/server/models/_BaseDb.js

@@ -1,9 +1,9 @@
 import { Match } from 'meteor/check';
 import { Mongo } from 'meteor/mongo';
-import _ from 'underscore';
 
 import { setUpdatedAt } from '../lib/setUpdatedAt';
 import { trash } from '../../../../server/database/trash';
+import { omit } from '../../../../lib/utils/omit';
 
 const baseName = 'rocketchat_';
 
@@ -168,7 +168,7 @@ export class BaseDb {
 			record._deletedAt = new Date();
 			record.__collection__ = this.name;
 
-			trash.upsert({ _id: record._id }, _.omit(record, '_id'));
+			trash.upsert({ _id: record._id }, omit(record, '_id'));
 		}
 
 		query = { _id: { $in: ids } };

apps/meteor/app/search/client/provider/result.js

@@ -37,7 +37,7 @@ Meteor.startup(function () {
 			}
 
 			if (Session.get('openedRoom') === message.rid) {
-				return RoomHistoryManager.getSurroundingMessages(message, 50);
+				return RoomHistoryManager.getSurroundingMessages(message);
 			}
 
 			goToRoomById(message.rid);
@@ -48,7 +48,7 @@ Meteor.startup(function () {
 			}
 
 			window.setTimeout(() => {
-				RoomHistoryManager.getSurroundingMessages(message, 50);
+				RoomHistoryManager.getSurroundingMessages(message);
 			}, 400);
 			// 400ms is popular among game devs as a good delay before transition starts
 			// ie. 50, 100, 200, 400, 800 are the favored timings

apps/meteor/app/theme/client/imports/general/base_old.css

@@ -1643,35 +1643,6 @@
 	}
 }
 
-.rc-old .ticks-bar {
-	position: absolute;
-	z-index: 1;
-	right: 2px;
-
-	width: 10px;
-	height: 100%;
-
-	pointer-events: none;
-
-	& .tick {
-		position: absolute;
-		top: 50%;
-
-		width: 100%;
-		height: 2px;
-
-		border-radius: 2px;
-
-		&--me {
-			background-color: var(--mention-link-me-text-color);
-		}
-
-		&--group {
-			background-color: var(--mention-link-group-text-color);
-		}
-	}
-}
-
 .message {
 	position: relative;
 	z-index: 1;

apps/meteor/app/theme/client/imports/general/rtl.css

@@ -330,11 +330,6 @@
 		}
 	}
 
-	& .ticks-bar {
-		right: auto;
-		left: 2px;
-	}
-
 	& .fixed-title {
 		right: 0;
 		left: auto;

apps/meteor/app/threads/client/messageAction/follow.ts

@@ -42,7 +42,7 @@ Meteor.startup(function () {
 				if (isLivechatRoom) {
 					return false;
 				}
-				return !replies.includes(user._id);
+				return user?._id ? !replies.includes(user._id) : false;
 			},
 			order: 2,
 			group: 'menu',

apps/meteor/app/threads/client/messageAction/unfollow.ts

@@ -36,7 +36,7 @@ Meteor.startup(function () {
 						replies = parentMessage.replies || [];
 					}
 				}
-				return replies.includes(user._id);
+				return user?._id ? replies.includes(user._id) : false;
 			},
 			order: 2,
 			group: 'menu',

apps/meteor/app/ui-cached-collection/client/models/CachedCollection.js

@@ -12,6 +12,7 @@ import { callbacks } from '../../../../lib/callbacks';
 import Notifications from '../../../notifications/client/lib/Notifications';
 import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { call } from '../../../../client/lib/utils/call';
+import { omit } from '../../../../lib/utils/omit';
 
 const wrap =
 	(fn) =>
@@ -228,7 +229,7 @@ export class CachedCollection extends Emitter {
 		this.log(`${data.length} records loaded from server`);
 		data.forEach((record) => {
 			callbacks.run(`cachedCollection-loadFromServer-${this.name}`, record, 'changed');
-			this.collection.direct.upsert({ _id: record._id }, _.omit(record, '_id'));
+			this.collection.direct.upsert({ _id: record._id }, omit(record, '_id'));
 
 			this.onSyncData('changed', record);
 

apps/meteor/app/ui-utils/client/lib/MessageAction.ts

@@ -36,7 +36,7 @@ type MessageActionContext = 'message' | 'threads' | 'message-mobile' | 'pinned'
 
 type MessageActionConditionProps = {
 	message: IMessage;
-	user: IUser;
+	user: IUser | undefined;
 	room: IRoom;
 	subscription?: ISubscription;
 	context?: MessageActionContext;

apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts

@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Blaze } from 'meteor/blaze';
 import { v4 as uuidv4 } from 'uuid';
 import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import { Emitter } from '@rocket.chat/emitter';
 import type { IMessage, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
+import type { MutableRefObject } from 'react';
 
 import { waitUntilWrapperExists } from './waitUntilWrapperExists';
 import { readMessage } from './readMessages';
@@ -17,7 +17,6 @@ import {
 	setHighlightMessage,
 	clearHighlightMessage,
 } from '../../../../client/views/room/MessageList/providers/messageHighlightSubscription';
-import type { RoomTemplateInstance } from '../../../ui/client/views/app/lib/RoomTemplateInstance';
 import { normalizeThreadMessage } from '../../../../client/lib/normalizeThreadMessage';
 
 export async function upsertMessage(
@@ -219,15 +218,14 @@ class RoomHistoryManagerClass extends Emitter {
 		});
 	}
 
-	public async getMoreNext(rid: IRoom['_id'], limit = defaultLimit) {
+	public async getMoreNext(rid: IRoom['_id'], atBottomRef: MutableRefObject<boolean>) {
 		const room = this.getRoom(rid);
 		if (Tracker.nonreactive(() => room.hasMoreNext.get()) !== true) {
 			return;
 		}
 
 		await this.queue();
-		const instance = Blaze.getView($('.messages-box .wrapper')[0]).templateInstance() as RoomTemplateInstance;
-		instance.atBottom = false;
+		atBottomRef.current = false;
 
 		room.isLoading.set(true);
 
@@ -237,7 +235,7 @@ class RoomHistoryManagerClass extends Emitter {
 
 		if (lastMessage?.ts) {
 			const { ts } = lastMessage;
-			const result = await callWithErrorHandling('loadNextMessages', rid, ts, limit);
+			const result = await callWithErrorHandling('loadNextMessages', rid, ts, defaultLimit);
 			upsertMessageBulk({
 				msgs: Array.from(result.messages).filter((msg) => msg.t !== 'command'),
 				subscription,
@@ -249,7 +247,7 @@ class RoomHistoryManagerClass extends Emitter {
 			}
 
 			room.loaded += result.messages.length;
-			if (result.messages.length < limit) {
+			if (result.messages.length < defaultLimit) {
 				room.hasMoreNext.set(false);
 			}
 		}
@@ -288,15 +286,11 @@ class RoomHistoryManagerClass extends Emitter {
 		room.loaded = undefined;
 	}
 
-	public async getSurroundingMessages(message?: Pick<IMessage, '_id' | 'rid'> & { ts?: Date }, limit = defaultLimit) {
+	public async getSurroundingMessages(message?: Pick<IMessage, '_id' | 'rid'> & { ts?: Date }, atBottomRef?: MutableRefObject<boolean>) {
 		if (!message || !message.rid) {
 			return;
 		}
 
-		const w = (await waitUntilWrapperExists()) as HTMLElement;
-
-		const instance = Blaze.getView(w).templateInstance() as RoomTemplateInstance;
-
 		const surroundingMessage = ChatMessage.findOne({ _id: message._id, _hidden: { $ne: true } });
 
 		if (surroundingMessage) {
@@ -336,7 +330,7 @@ class RoomHistoryManagerClass extends Emitter {
 
 		const subscription = ChatSubscription.findOne({ rid: message.rid });
 
-		const result = await callWithErrorHandling('loadSurroundingMessages', message, limit);
+		const result = await callWithErrorHandling('loadSurroundingMessages', message, defaultLimit);
 
 		if (!result || !result.messages) {
 			return;
@@ -368,7 +362,7 @@ class RoomHistoryManagerClass extends Emitter {
 
 			room.isLoading.set(false);
 			const messages = wrapper[0];
-			instance.atBottom = !result.moreAfter && messages.scrollTop >= messages.scrollHeight - messages.clientHeight;
+			if (atBottomRef) atBottomRef.current = !result.moreAfter && messages.scrollTop >= messages.scrollHeight - messages.clientHeight;
 
 			setTimeout(() => {
 				msgElement.removeClass('highlight');