refactor: Remove old setreaction callbacks and use new after/before…

… callbacks (#33309)
RocketChat · Sep 18, 2024 · 6a3c25c · 6a3c25c
1 parent ba8bee4
commit 6a3c25c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/apps/meteor/app/reactions/client/methods/setReaction.ts b/apps/meteor/app/reactions/client/methods/setReaction.ts
@@ -3,7 +3,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import { callbacks } from '../../../../lib/callbacks';
 import { emoji } from '../../../emoji/client';
 import { Messages, ChatRoom, Subscriptions } from '../../../models/client';
 
@@ -55,10 +54,8 @@ Meteor.methods<ServerMethods>({
 			if (!message.reactions || typeof message.reactions !== 'object' || Object.keys(message.reactions).length === 0) {
 				delete message.reactions;
 				Messages.update({ _id: messageId }, { $unset: { reactions: 1 } });
-				await callbacks.run('unsetReaction', messageId, reaction);
 			} else {
 				Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-				await callbacks.run('setReaction', messageId, reaction);
 			}
 		} else {
 			if (!message.reactions) {
@@ -72,7 +69,6 @@ Meteor.methods<ServerMethods>({
 			message.reactions[reaction].usernames.push(user.username);
 
 			Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-			await callbacks.run('setReaction', messageId, reaction);
 		}
 	},
 });
diff --git a/apps/meteor/app/reactions/server/setReaction.ts b/apps/meteor/app/reactions/server/setReaction.ts
@@ -85,7 +85,6 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 				await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			}
 		}
-		await callbacks.run('unsetReaction', message._id, reaction);
 		await callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact, oldMessage });
 
 		isReacted = false;
@@ -104,7 +103,6 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 			await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			void notifyOnRoomChangedById(room._id);
 		}
-		await callbacks.run('setReaction', message._id, reaction);
 		await callbacks.run('afterSetReaction', message, { user, reaction, shouldReact });
 
 		isReacted = true;

diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -45,16 +45,16 @@ export default class RocketAdapter {
 		rocketLogger.debug('Register for events');
 		callbacks.add('afterSaveMessage', this.onMessage.bind(this), callbacks.priority.LOW, 'SlackBridge_Out');
 		callbacks.add('afterDeleteMessage', this.onMessageDelete.bind(this), callbacks.priority.LOW, 'SlackBridge_Delete');
-		callbacks.add('setReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
-		callbacks.add('unsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
+		callbacks.add('afterSetReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
+		callbacks.add('afterUnsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
 	}
 
 	unregisterForEvents() {
 		rocketLogger.debug('Unregister for events');
 		callbacks.remove('afterSaveMessage', 'SlackBridge_Out');
 		callbacks.remove('afterDeleteMessage', 'SlackBridge_Delete');
-		callbacks.remove('setReaction', 'SlackBridge_SetReaction');
-		callbacks.remove('unsetReaction', 'SlackBridge_UnSetReaction');
+		callbacks.remove('afterSetReaction', 'SlackBridge_SetReaction');
+		callbacks.remove('afterUnsetReaction', 'SlackBridge_UnSetReaction');
 	}
 
 	async onMessageDelete(rocketMessageDeleted) {
@@ -72,20 +72,19 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onSetReaction(rocketMsgID, reaction) {
+	async onSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
 			}
 
 			rocketLogger.debug('onRocketSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`set${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`set${rocketMsg._id}${reaction}`)) {
 					// This was a Slack reaction, we don't need to tell Slack about it
 					return;
 				}
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);
@@ -101,21 +100,20 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onUnSetReaction(rocketMsgID, reaction) {
+	async onUnSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
 			}
 
 			rocketLogger.debug('onRocketUnSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsg._id}${reaction}`)) {
 					// This was a Slack unset reaction, we don't need to tell Slack about it
 					return;
 				}
 
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);

diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
@@ -256,10 +256,8 @@ export type Hook =
 	| 'onValidateLogin'
 	| 'openBroadcast'
 	| 'renderNotification'
-	| 'setReaction'
 	| 'streamMessage'
 	| 'streamNewMessage'
-	| 'unsetReaction'
 	| 'userAvatarSet'
 	| 'userConfirmationEmailRequested'
 	| 'userForgotPasswordEmailRequested'