Skip to content

refactor: Break big livechatTyped into smaller files #35324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Feb 25, 2025
Merged

refactor: Break big livechatTyped into smaller files #35324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb5db0f
requesttranscript
KevLehman Feb 24, 2025
49fc3f1
requesttranscript
KevLehman Feb 24, 2025
34abfac
closeRoom
KevLehman Feb 24, 2025
507eb50
closeRoom
KevLehman Feb 24, 2025
136bc90
Merge branch 'develop' into refactor/livechat-breakdown
kodiakhq[bot] Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/meteor/app/apps/server/bridges/livechat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@roc
import { callbacks } from '../../../../lib/callbacks';
import { deasyncPromise } from '../../../../server/deasync/deasync';
import { Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
import { closeRoom } from '../../../livechat/server/lib/closeRoom';
import { getRoomMessages } from '../../../livechat/server/lib/getRoomMessages';
import type { ILivechatMessage } from '../../../livechat/server/lib/localTypes';
import { settings } from '../../../settings/server';
Expand Down Expand Up @@ -145,7 +146,7 @@ export class AppLivechatBridge extends LivechatBridge {
...(visitor && { visitor }),
};

await LivechatTyped.closeRoom(closeData);
await closeRoom(closeData);

return true;
}
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/app/lib/server/functions/closeLivechatRoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IUser, IRoom, IOmnichannelRoom } from '@rocket.chat/core-typings';
import { LivechatRooms, Subscriptions } from '@rocket.chat/models';

import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
import { Livechat } from '../../../livechat/server/lib/LivechatTyped';
import { closeRoom } from '../../../livechat/server/lib/closeRoom';
import type { CloseRoomParams } from '../../../livechat/server/lib/localTypes';

export const closeLivechatRoom = async (
Expand Down Expand Up @@ -65,7 +65,7 @@ export const closeLivechatRoom = async (
};

if (forceClose) {
return Livechat.closeRoom({
return closeRoom({
room,
user,
options,
Expand All @@ -78,7 +78,7 @@ export const closeLivechatRoom = async (
throw new Error('error-room-already-closed');
}

return Livechat.closeRoom({
return closeRoom({
room,
user,
options,
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/app/lib/server/functions/closeOmnichannelConversations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { LivechatRooms } from '@rocket.chat/models';

import { callbacks } from '../../../../lib/callbacks';
import { i18n } from '../../../../server/lib/i18n';
import { Livechat } from '../../../livechat/server/lib/LivechatTyped';
import { closeRoom } from '../../../livechat/server/lib/closeRoom';
import { settings } from '../../../settings/server';

type SubscribedRooms = {
Expand All @@ -13,7 +13,7 @@ type SubscribedRooms = {

export const closeOmnichannelConversations = async (user: IUser, subscribedRooms: SubscribedRooms[]): Promise<void> => {
const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
const roomsInfo = await LivechatRooms.findByIds(
const roomsInfo = LivechatRooms.findByIds(
subscribedRooms.map(({ rid }) => rid),
{},
extraQuery,
Expand All @@ -22,8 +22,8 @@ export const closeOmnichannelConversations = async (user: IUser, subscribedRooms
const comment = i18n.t('Agent_deactivated', { lng: language });

const promises: Promise<void>[] = [];
await roomsInfo.forEach((room: any) => {
promises.push(Livechat.closeRoom({ user, room, comment }));
await roomsInfo.forEach((room) => {
promises.push(closeRoom({ user, room, comment }));
});

await Promise.all(promises);
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/app/livechat/server/api/v1/room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { closeLivechatRoom } from '../../../../lib/server/functions/closeLivecha
import { settings as rcSettings } from '../../../../settings/server';
import { normalizeTransferredByData } from '../../lib/Helper';
import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
import { closeRoom } from '../../lib/closeRoom';
import type { CloseRoomParams } from '../../lib/localTypes';
import { livechatLogger } from '../../lib/logger';
import { findGuest, findRoom, settings, findAgent, onCheckRoomParams } from '../lib/livechat';
Expand Down Expand Up @@ -180,7 +181,7 @@ API.v1.addRoute(
}
}

await LivechatTyped.closeRoom({ visitor, room, comment, options });
await closeRoom({ visitor, room, comment, options });

return API.v1.success({ rid, comment });
},
Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/app/livechat/server/api/v1/transcript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import { isPOSTLivechatTranscriptParams, isPOSTLivechatTranscriptRequestParams }

import { i18n } from '../../../../../server/lib/i18n';
import { API } from '../../../../api/server';
import { Livechat } from '../../lib/LivechatTyped';
import { sendTranscript } from '../../lib/sendTranscript';
import { sendTranscript, requestTranscript } from '../../lib/sendTranscript';

API.v1.addRoute(
'livechat/transcript',
Expand Down Expand Up @@ -66,7 +65,7 @@ API.v1.addRoute(
throw new Error('error-invalid-user');
}

await Livechat.requestTranscript({ rid, email, subject, user });
await requestTranscript({ rid, email, subject, user });

return API.v1.success();
},
Expand Down
Loading
Loading