refactor: use options object in sendMessage function signature

apps/meteor/app/authentication/server/lib/restrictLoginAttempts.ts

@@ -43,7 +43,7 @@ const notifyFailedLogin = async (ipOrUsername: string, blockedUntil: Date, faile
 		],
 	};
 
-	await sendMessage(rocketCat, message, room, false);
+	await sendMessage(rocketCat, message, room);
 };
 
 export const isValidLoginAttemptByIp = async (ip: string): Promise<boolean> => {

apps/meteor/app/lib/server/functions/sendMessage.ts

@@ -14,6 +14,11 @@ import { afterSaveMessage } from '../lib/afterSaveMessage';
 import { notifyOnRoomChangedById } from '../lib/notifyListener';
 import { validateCustomMessageFields } from '../lib/validateCustomMessageFields';
 
+type SendMessageOptions = {
+	upsert?: boolean;
+	previewUrls?: string[];
+};
+
 // TODO: most of the types here are wrong, but I don't want to change them now
 
 /**
@@ -217,7 +222,9 @@ export function prepareMessageObject(
  * Caller of the function should verify the Message_MaxAllowedSize if needed.
  * There might be same use cases which needs to override this setting. Example - sending error logs.
  */
-export const sendMessage = async function (user: any, message: any, room: any, upsert = false, previewUrls?: string[]) {
+export const sendMessage = async function (user: any, message: any, room: any, options: SendMessageOptions = {}) {
+	const { upsert = false, previewUrls } = options;
+
 	if (!user || !message || !room._id) {
 		return false;
 	}

apps/meteor/app/lib/server/methods/sendMessage.ts

@@ -106,7 +106,7 @@ export async function executeSendMessage(
 		}
 
 		metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
-		return await sendMessage(user, message, room, false, extraInfo?.previewUrls);
+		return await sendMessage(user, message, room, { previewUrls: extraInfo?.previewUrls });
 	} catch (err: any) {
 		SystemLogger.error({ msg: 'Error sending message:', err });
 

apps/meteor/app/livechat/server/hooks/offlineMessageToChannel.ts

@@ -63,7 +63,7 @@ callbacks.add(
 			groupable: false,
 		};
 
-		await sendMessage(user, message, room, true);
+		await sendMessage(user, message, room, { upsert: true });
 	},
 	callbacks.priority.MEDIUM,
 	'livechat-send-email-offline-message-to-channel',

apps/meteor/app/slackbridge/server/RocketAdapter.ts

@@ -503,13 +503,13 @@ export default class RocketAdapter {
 						// Make sure that a message with the same bot_id and timestamp doesn't already exists
 						const msg = await Messages.findOneBySlackBotIdAndSlackTs(slackMessage.bot_id, slackMessage.ts);
 						if (!msg) {
-							void sendMessage(rocketUser, rocketMsgObj, rocketChannel, true);
+							void sendMessage(rocketUser, rocketMsgObj, rocketChannel, { upsert: true });
 						}
 					}
 				}, 500);
 			} else {
 				rocketLogger.debug('Send message to Rocket.Chat');
-				await sendMessage(rocketUser, rocketMsgObj, rocketChannel, true);
+				await sendMessage(rocketUser, rocketMsgObj, rocketChannel, { upsert: true });
 			}
 		}
 	}

apps/meteor/app/slackbridge/server/SlackAdapter.ts

@@ -1320,7 +1320,7 @@ export default class SlackAdapter {
 				msg._id = details.message_id;
 			}
 
-			void sendMessage(rocketUser, msg, rocketChannel, true);
+			void sendMessage(rocketUser, msg, rocketChannel, { upsert: true });
 		});
 	}
 

apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts

@@ -237,7 +237,7 @@ callbacks.add(
 					],
 				},
 				room,
-				true,
+				{ upsert: true },
 			);
 			return message;
 		}

apps/meteor/server/services/media-call/service.ts

@@ -201,7 +201,7 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		const record = getHistoryMessagePayload(state, duration, call._id);
 
 		try {
-			const message = await sendMessage(user, record, room, false);
+			const message = await sendMessage(user, record, room);
 
 			if ('_id' in message) {
 				await CallHistory.updateMany({ callId: call._id }, { $set: { messageId: message._id } });

apps/meteor/server/services/messages/service.ts

@@ -136,7 +136,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 	}
 
 	async sendMessageWithValidation(user: IUser, message: Partial<IMessage>, room: Partial<IRoom>, upsert = false): Promise<IMessage> {
-		return sendMessage(user, message, room, upsert);
+		return sendMessage(user, message, room, { upsert });
 	}
 
 	async deleteMessage(user: IUser, message: IMessage): Promise<void> {

apps/meteor/server/services/video-conference/service.ts

@@ -555,7 +555,7 @@ export class VideoConfService extends ServiceClassInternal implements IVideoConf
 		const appId = videoConfProviders.getProviderAppId(call.providerName);
 		const user = createdBy || (appId && (await Users.findOneByAppId(appId))) || (await Users.findOneById('rocket.cat'));
 
-		const message = await sendMessage(user, record, room, false);
+		const message = await sendMessage(user, record, room);
 
 		if (!message) {
 			throw new Error('failed-to-create-message');