Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref…

…/omni-curr-chats

app/apps/server/bridges/listeners.js

@@ -1,4 +1,5 @@
 import { AppInterface } from '@rocket.chat/apps-engine/definition/metadata';
+import { LivechatTransferEventType } from '@rocket.chat/apps-engine/definition/livechat';
 
 export class AppListenerBridge {
 	constructor(orch) {
@@ -39,6 +40,7 @@ export class AppListenerBridge {
 				case AppInterface.IPostLivechatRoomClosed:
 				case AppInterface.IPostLivechatAgentAssigned:
 				case AppInterface.IPostLivechatAgentUnassigned:
+				case AppInterface.IPostLivechatRoomTransferred:
 					return 'livechatEvent';
 				case AppInterface.IUIKitInteractionHandler:
 					return 'uiKitInteractionEvent';
@@ -100,6 +102,16 @@ export class AppListenerBridge {
 					room: this.orch.getConverters().get('rooms').convertRoom(data.room),
 					agent: this.orch.getConverters().get('users').convertToApp(data.user),
 				});
+			case AppInterface.IPostLivechatRoomTransferred:
+				const converter = data.type === LivechatTransferEventType.AGENT ? 'users' : 'departments';
+
+				return this.orch.getManager().getListenerManager().executeListener(inte, {
+					type: data.type,
+					room: this.orch.getConverters().get('rooms').convertById(data.room),
+					from: this.orch.getConverters().get(converter).convertById(data.from),
+					to: this.orch.getConverters().get(converter).convertById(data.to),
+				});
+
 			default:
 				const room = this.orch.getConverters().get('rooms').convertRoom(data);
 

app/livechat/server/lib/Helper.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { MongoInternals } from 'meteor/mongo';
+import { LivechatTransferEventType } from '@rocket.chat/apps-engine/definition/livechat';
 
 import { Messages, LivechatRooms, Rooms, Subscriptions, Users, LivechatInquiry, LivechatDepartment, LivechatDepartmentAgents } from '../../../models/server';
 import { Livechat } from './Livechat';
@@ -44,8 +45,11 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 
 	const roomId = Rooms.insert(room);
 
-	Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatRoomStarted, room);
-	callbacks.run('livechat.newRoom', room);
+	Meteor.defer(() => {
+		Apps.triggerEvent(AppEvents.IPostLivechatRoomStarted, room);
+		callbacks.run('livechat.newRoom', room);
+	});
+
 	return roomId;
 };
 
@@ -166,7 +170,9 @@ export const removeAgentFromSubscription = (rid, { _id, username }) => {
 	Subscriptions.removeByRoomIdAndUserId(rid, _id);
 	Messages.createUserLeaveWithRoomIdAndUser(rid, { _id, username });
 
-	Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatAgentUnassigned, { room, user });
+	Meteor.defer(() => {
+		Apps.triggerEvent(AppEvents.IPostLivechatAgentUnassigned, { room, user });
+	});
 };
 
 export const parseAgentCustomFields = (customFields) => {
@@ -257,6 +263,15 @@ export const forwardRoomToAgent = async (room, transferData) => {
 			removeAgentFromSubscription(rid, oldServedBy);
 		}
 		Messages.createUserJoinWithRoomIdAndUser(rid, { _id: servedBy._id, username: servedBy.username });
+
+		Meteor.defer(() => {
+			Apps.triggerEvent(AppEvents.IPostLivechatRoomTransferred, {
+				type: LivechatTransferEventType.AGENT,
+				room: rid,
+				from: oldServedBy?._id,
+				to: servedBy._id,
+			});
+		});
 	}
 
 	callbacks.run('livechat.afterForwardChatToAgent', { rid, servedBy, oldServedBy });
@@ -267,6 +282,15 @@ export const updateChatDepartment = ({ rid, newDepartmentId, oldDepartmentId })
 	LivechatRooms.changeDepartmentIdByRoomId(rid, newDepartmentId);
 	LivechatInquiry.changeDepartmentIdByRoomId(rid, newDepartmentId);
 
+	Meteor.defer(() => {
+		Apps.triggerEvent(AppEvents.IPostLivechatRoomTransferred, {
+			type: LivechatTransferEventType.DEPARTMENT,
+			room: rid,
+			from: oldDepartmentId,
+			to: newDepartmentId,
+		});
+	});
+
 	return callbacks.run('livechat.afterForwardChatToDepartment', { rid, newDepartmentId, oldDepartmentId });
 };
 

app/slackbridge/server/RocketAdapter.js

@@ -469,6 +469,13 @@ export default class RocketAdapter {
 			if (slackMessage.edited) {
 				rocketMsgObj.editedAt = new Date(parseInt(slackMessage.edited.ts.split('.')[0]) * 1000);
 			}
+			rocketMsgObj.slackTs = slackMessage.ts;
+			if (slackMessage.thread_ts) {
+				const tmessage = Messages.findOneBySlackTs(slackMessage.thread_ts);
+				if (tmessage) {
+					rocketMsgObj.tmid = tmessage._id;
+				}
+			}
 			if (slackMessage.subtype === 'bot_message') {
 				rocketUser = Users.findOneById('rocket.cat', { fields: { username: 1 } });
 			}

app/slackbridge/server/SlackAdapter.js

@@ -667,6 +667,13 @@ export default class SlackAdapter {
 				icon_url: iconUrl,
 				link_names: 1,
 			};
+
+			if (rocketMessage.tmid) {
+				const tmessage = Messages.findOneById(rocketMessage.tmid);
+				if (tmessage && tmessage.slackTs) {
+					data.thread_ts = tmessage.slackTs;
+				}
+			}
 			logger.slack.debug('Post Message To Slack', data);
 
 			// If we don't have the bot id yet and we have multiple slack bridges, we need to keep track of the messages that are being sent

package.json

@@ -130,15 +130,15 @@
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
 		"@rocket.chat/apps-engine": "1.16.0",
-		"@rocket.chat/css-in-js": "^0.13.1",
-		"@rocket.chat/fuselage": "^0.6.3-dev.82",
-		"@rocket.chat/fuselage-hooks": "^0.13.1",
-		"@rocket.chat/fuselage-polyfills": "^0.13.1",
-		"@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.82",
-		"@rocket.chat/icons": "^0.13.1",
-		"@rocket.chat/mp3-encoder": "^0.13.1",
-		"@rocket.chat/ui-kit": "^0.13.1",
-		"@slack/client": "^4.8.0",
+		"@rocket.chat/css-in-js": "^0.14.0",
+		"@rocket.chat/fuselage": "^0.14.0",
+		"@rocket.chat/fuselage-hooks": "^0.14.0",
+		"@rocket.chat/fuselage-polyfills": "^0.14.0",
+		"@rocket.chat/fuselage-ui-kit": "^0.14.0",
+		"@rocket.chat/icons": "^0.14.0",
+		"@rocket.chat/mp3-encoder": "^0.14.0",
+		"@rocket.chat/ui-kit": "^0.14.0",
+		"@slack/client": "^4.12.0",
 		"@types/fibers": "^3.1.0",
 		"@types/underscore.string": "0.0.38",
 		"@types/use-subscription": "^1.0.0",