chore: reorganize backend folder structure — Phase 2 (external bridges)

apps/meteor/app/file-upload/ufs/Webdav/server.ts

@@ -4,10 +4,10 @@ import type { IUpload } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import { check } from 'meteor/check';
 
+import { WebdavClientAdapter } from '../../../../server/bridges/webdav/lib/webdavClientAdapter';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { UploadFS } from '../../../../server/ufs';
 import type { StoreOptions } from '../../../../server/ufs/ufs-store';
-import { WebdavClientAdapter } from '../../../webdav/server/lib/webdavClientAdapter';
 
 type WebdavOptions = StoreOptions & {
 	connection: {

apps/meteor/scripts/migration/phase2-bridges.tsv

@@ -0,0 +1,7 @@
+# Phase 2: External bridges migration
+# Format: old-path<TAB>new-path (relative to apps/meteor/)
+app/irc/server	server/bridges/irc
+app/slackbridge/server	server/bridges/slack
+app/smarsh-connector/server	server/bridges/smarsh
+app/webdav/server	server/bridges/webdav
+app/nextcloud/server	server/bridges/nextcloud

apps/meteor/app/irc/server/irc-bridge/index.js → apps/meteor/server/bridges/irc/irc-bridge/index.js

@@ -3,12 +3,12 @@ import { Settings } from '@rocket.chat/models';
 import moment from 'moment';
 import Queue from 'queue-fifo';
 
+import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener';
 import { withThrottling } from '../../../../lib/utils/highOrderFunctions';
-import { callbacks } from '../../../../server/lib/callbacks';
-import { afterLeaveRoomCallback } from '../../../../server/lib/callbacks/afterLeaveRoomCallback';
-import { afterLogoutCleanUpCallback } from '../../../../server/lib/callbacks/afterLogoutCleanUpCallback';
-import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
-import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
+import { callbacks } from '../../../lib/callbacks';
+import { afterLeaveRoomCallback } from '../../../lib/callbacks/afterLeaveRoomCallback';
+import { afterLogoutCleanUpCallback } from '../../../lib/callbacks/afterLogoutCleanUpCallback';
+import { updateAuditedBySystem } from '../../../settings/lib/auditedSettingUpdates';
 import * as servers from '../servers';
 import * as localCommandHandlers from './localHandlers';
 import * as peerCommandHandlers from './peerHandlers';

apps/meteor/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js → apps/meteor/server/bridges/irc/irc-bridge/localHandlers/onSaveMessage.js

@@ -1,6 +1,6 @@
 import { Subscriptions, Users } from '@rocket.chat/models';
 
-import { SystemLogger } from '../../../../../server/lib/logger/system';
+import { SystemLogger } from '../../../../lib/logger/system';
 
 export default async function handleOnSaveMessage(message, to) {
 	let toIdentification = '';

apps/meteor/app/irc/server/irc-bridge/peerHandlers/disconnected.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/disconnected.js

@@ -1,6 +1,6 @@
 import { Users } from '@rocket.chat/models';
 
-import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+import { notifyOnUserChange } from '../../../../../app/lib/server/lib/notifyListener';
 
 export default async function handleQUIT(args) {
 	const user = await Users.findOne({

apps/meteor/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/joinedChannel.js

@@ -1,7 +1,7 @@
 import { Users, Rooms } from '@rocket.chat/models';
 
-import { addUserToRoom } from '../../../../lib/server/functions/addUserToRoom';
-import { createRoom } from '../../../../lib/server/functions/createRoom';
+import { addUserToRoom } from '../../../../../app/lib/server/functions/addUserToRoom';
+import { createRoom } from '../../../../../app/lib/server/functions/createRoom';
 
 // TODO doesn't seem to be used anywhere, remove
 export default async function handleJoinedChannel(args) {

apps/meteor/app/irc/server/irc-bridge/peerHandlers/leftChannel.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/leftChannel.js

@@ -1,6 +1,6 @@
 import { Users, Rooms } from '@rocket.chat/models';
 
-import { removeUserFromRoom } from '../../../../lib/server/functions/removeUserFromRoom';
+import { removeUserFromRoom } from '../../../../../app/lib/server/functions/removeUserFromRoom';
 
 export default async function handleLeftChannel(args) {
 	const user = await Users.findOne({

apps/meteor/app/irc/server/irc-bridge/peerHandlers/nickChanged.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/nickChanged.js

@@ -1,6 +1,6 @@
 import { Users } from '@rocket.chat/models';
 
-import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+import { notifyOnUserChange } from '../../../../../app/lib/server/lib/notifyListener';
 
 export default async function handleNickChanged(args) {
 	const user = await Users.findOne({

apps/meteor/app/irc/server/irc-bridge/peerHandlers/sentMessage.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/sentMessage.js

@@ -1,7 +1,7 @@
 import { Users, Rooms } from '@rocket.chat/models';
 
-import { createDirectRoom } from '../../../../lib/server/functions/createDirectRoom';
-import { sendMessage } from '../../../../lib/server/functions/sendMessage';
+import { createDirectRoom } from '../../../../../app/lib/server/functions/createDirectRoom';
+import { sendMessage } from '../../../../../app/lib/server/functions/sendMessage';
 
 /*
  *

apps/meteor/app/irc/server/irc-bridge/peerHandlers/userRegistered.js → apps/meteor/server/bridges/irc/irc-bridge/peerHandlers/userRegistered.js

@@ -1,6 +1,6 @@
 import { Users } from '@rocket.chat/models';
 
-import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+import { notifyOnUserChange } from '../../../../../app/lib/server/lib/notifyListener';
 
 export default async function handleUserRegistered(args) {
 	// Check if there is an user with the given username

apps/meteor/app/irc/server/methods/resetIrcConnection.ts → apps/meteor/server/bridges/irc/methods/resetIrcConnection.ts

@@ -2,10 +2,10 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
-import { settings } from '../../../settings/server';
+import { hasPermissionAsync } from '../../../../app/authorization/server/functions/hasPermission';
+import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener';
+import { settings } from '../../../../app/settings/server';
+import { updateAuditedByUser } from '../../../settings/lib/auditedSettingUpdates';
 import Bridge from '../irc-bridge';
 
 declare module '@rocket.chat/ddp-client' {

apps/meteor/app/nextcloud/server/addWebdavServer.ts → apps/meteor/server/bridges/nextcloud/addWebdavServer.ts

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { callbacks } from '../../../server/lib/callbacks';
-import { SystemLogger } from '../../../server/lib/logger/system';
-import { settings } from '../../settings/server';
-import { addWebdavAccountByToken } from '../../webdav/server/methods/addWebdavAccount';
+import { settings } from '../../../app/settings/server';
+import { callbacks } from '../../lib/callbacks';
+import { SystemLogger } from '../../lib/logger/system';
+import { addWebdavAccountByToken } from '../webdav/methods/addWebdavAccount';
 
 Meteor.startup(() => {
 	settings.watch('Webdav_Integration_Enabled', (value) => {

apps/meteor/app/nextcloud/server/lib.ts → apps/meteor/server/bridges/nextcloud/lib.ts

@@ -2,8 +2,8 @@ import type { OauthConfig } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { CustomOAuth } from '../../custom-oauth/server/custom_oauth_server';
-import { settings } from '../../settings/server';
+import { CustomOAuth } from '../../../app/custom-oauth/server/custom_oauth_server';
+import { settings } from '../../../app/settings/server';
 
 const config: OauthConfig = {
 	serverURL: '',

apps/meteor/app/slackbridge/server/RocketAdapter.ts → apps/meteor/server/bridges/slack/RocketAdapter.ts

@@ -12,12 +12,12 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 import { rocketLogger } from './logger';
+import { createRoom } from '../../../app/lib/server/functions/createRoom';
+import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
+import { setUserAvatar } from '../../../app/lib/server/functions/setUserAvatar';
+import { settings } from '../../../app/settings/server';
 import { sleep } from '../../../lib/utils/sleep';
-import { callbacks } from '../../../server/lib/callbacks';
-import { createRoom } from '../../lib/server/functions/createRoom';
-import { sendMessage } from '../../lib/server/functions/sendMessage';
-import { setUserAvatar } from '../../lib/server/functions/setUserAvatar';
-import { settings } from '../../settings/server';
+import { callbacks } from '../../lib/callbacks';
 
 export default class RocketAdapter {
 	constructor(slackBridge) {

apps/meteor/app/slackbridge/server/SlackAdapter.ts → apps/meteor/server/bridges/slack/SlackAdapter.ts

@@ -16,18 +16,18 @@ import { Meteor } from 'meteor/meteor';
 
 import { SlackAPI } from './SlackAPI';
 import { slackLogger } from './logger';
-import { saveRoomName, saveRoomTopic } from '../../channel-settings/server';
-import { FileUpload } from '../../file-upload/server';
-import { addUserToRoom } from '../../lib/server/functions/addUserToRoom';
-import { archiveRoom } from '../../lib/server/functions/archiveRoom';
-import { deleteMessage } from '../../lib/server/functions/deleteMessage';
-import { removeUserFromRoom } from '../../lib/server/functions/removeUserFromRoom';
-import { sendMessage } from '../../lib/server/functions/sendMessage';
-import { unarchiveRoom } from '../../lib/server/functions/unarchiveRoom';
-import { updateMessage } from '../../lib/server/functions/updateMessage';
-import { executeSetReaction } from '../../reactions/server/setReaction';
-import { settings } from '../../settings/server';
-import { getUserAvatarURL } from '../../utils/server/getUserAvatarURL';
+import { saveRoomName, saveRoomTopic } from '../../../app/channel-settings/server';
+import { FileUpload } from '../../../app/file-upload/server';
+import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
+import { archiveRoom } from '../../../app/lib/server/functions/archiveRoom';
+import { deleteMessage } from '../../../app/lib/server/functions/deleteMessage';
+import { removeUserFromRoom } from '../../../app/lib/server/functions/removeUserFromRoom';
+import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
+import { unarchiveRoom } from '../../../app/lib/server/functions/unarchiveRoom';
+import { updateMessage } from '../../../app/lib/server/functions/updateMessage';
+import { executeSetReaction } from '../../../app/reactions/server/setReaction';
+import { settings } from '../../../app/settings/server';
+import { getUserAvatarURL } from '../../../app/utils/server/getUserAvatarURL';
 
 export default class SlackAdapter {
 	constructor(slackBridge) {

apps/meteor/app/slackbridge/server/removeChannelLinks.ts → apps/meteor/server/bridges/slack/removeChannelLinks.ts

@@ -2,8 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
-import { settings } from '../../settings/server';
+import { hasPermissionAsync } from '../../../app/authorization/server/functions/hasPermission';
+import { settings } from '../../../app/settings/server';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention

apps/meteor/app/slackbridge/server/slackbridge.ts → apps/meteor/server/bridges/slack/slackbridge.ts

@@ -8,7 +8,7 @@ import { debounce } from 'lodash';
 import RocketAdapter from './RocketAdapter';
 import SlackAdapter from './SlackAdapter';
 import { classLogger, connLogger } from './logger';
-import { settings } from '../../settings/server';
+import { settings } from '../../../app/settings/server';
 
 /**
  * SlackBridge interfaces between this Rocket installation and a remote Slack installation.

apps/meteor/app/slackbridge/server/slackbridge_import.server.ts → apps/meteor/server/bridges/slack/slackbridge_import.server.ts

@@ -7,9 +7,9 @@ import { Random } from '@rocket.chat/random';
 import { Match } from 'meteor/check';
 
 import { SlackBridge } from './slackbridge';
-import { i18n } from '../../../server/lib/i18n';
-import { msgStream } from '../../lib/server';
-import { slashCommands } from '../../utils/server/slashCommand';
+import { msgStream } from '../../../app/lib/server';
+import { slashCommands } from '../../../app/utils/server/slashCommand';
+import { i18n } from '../../lib/i18n';
 
 async function SlackBridgeImport({ command, params, message, userId }) {
 	if (command !== 'slackbridge-import' || !Match.test(params, String)) {

apps/meteor/app/smarsh-connector/server/functions/generateEml.ts → apps/meteor/server/bridges/smarsh/functions/generateEml.ts

@@ -4,8 +4,8 @@ import { Meteor } from 'meteor/meteor';
 import moment from 'moment-timezone';
 
 import { sendEmail } from './sendEmail';
-import { i18n } from '../../../../server/lib/i18n';
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
+import { i18n } from '../../../lib/i18n';
 
 const start =
 	'<table style="width: 100%; border: 1px solid; border-collapse: collapse; table-layout: fixed; margin-top: 10px; font-size: 12px; word-break: break-word;"><tbody>';

apps/meteor/app/smarsh-connector/server/functions/sendEmail.ts → apps/meteor/server/bridges/smarsh/functions/sendEmail.ts

@@ -6,9 +6,9 @@
 // }
 import { Uploads } from '@rocket.chat/models';
 
-import { UploadFS } from '../../../../server/ufs';
-import * as Mailer from '../../../mailer/server/api';
-import { settings } from '../../../settings/server';
+import * as Mailer from '../../../../app/mailer/server/api';
+import { settings } from '../../../../app/settings/server';
+import { UploadFS } from '../../../ufs';
 
 export const sendEmail = async (data: { files: string[]; subject: string; body: string }) => {
 	const attachments = [];

apps/meteor/app/smarsh-connector/server/startup.ts → apps/meteor/server/bridges/smarsh/startup.ts

@@ -1,8 +1,8 @@
 import { cronJobs } from '@rocket.chat/cron';
 
 import { generateEml } from './functions/generateEml';
-import { smarshIntervalValuesToCronMap } from '../../../server/settings/smarsh';
-import { settings } from '../../settings/server';
+import { settings } from '../../../app/settings/server';
+import { smarshIntervalValuesToCronMap } from '../../settings/smarsh';
 
 const smarshJobName = 'Smarsh EML Connector';
 

apps/meteor/app/webdav/server/methods/addWebdavAccount.ts → apps/meteor/server/bridges/webdav/methods/addWebdavAccount.ts

@@ -5,7 +5,7 @@ import { WebdavAccounts } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 
 declare module '@rocket.chat/ddp-client' {

apps/meteor/app/webdav/server/methods/getFileFromWebdav.ts → apps/meteor/server/bridges/webdav/methods/getFileFromWebdav.ts

@@ -3,7 +3,7 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { WebdavAccounts } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
 import { getWebdavCredentials } from '../lib/getWebdavCredentials';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 

apps/meteor/app/webdav/server/methods/getWebdavFileList.ts → apps/meteor/server/bridges/webdav/methods/getWebdavFileList.ts

@@ -3,7 +3,7 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { WebdavAccounts } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
 import { getWebdavCredentials } from '../lib/getWebdavCredentials';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 

apps/meteor/app/webdav/server/methods/getWebdavFilePreview.ts → apps/meteor/server/bridges/webdav/methods/getWebdavFilePreview.ts

@@ -4,7 +4,7 @@ import { WebdavAccounts } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 import { createClient } from 'webdav';
 
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
 import { getWebdavCredentials } from '../lib/getWebdavCredentials';
 
 declare module '@rocket.chat/ddp-client' {

apps/meteor/app/webdav/server/methods/uploadFileToWebdav.ts → apps/meteor/server/bridges/webdav/methods/uploadFileToWebdav.ts

@@ -5,7 +5,7 @@ import { Logger } from '@rocket.chat/logger';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../../settings/server';
+import { settings } from '../../../../app/settings/server';
 import { uploadFileToWebdav } from '../lib/uploadFileToWebdav';
 
 const logger = new Logger('WebDAV_Upload');

apps/meteor/server/configuration/configureIRC.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import Bridge from '../../app/irc/server/irc-bridge';
 import type { ICachedSettings } from '../../app/settings/server/CachedSettings';
+import Bridge from '../bridges/irc/irc-bridge';
 
 export async function configureIRC(settings: ICachedSettings): Promise<void> {
 	if (!settings.get('IRC_Enabled')) {

apps/meteor/server/importPackages.ts

@@ -31,7 +31,7 @@ import '../app/importer-pending-avatars/server';
 import '../app/importer-slack/server';
 import '../app/importer-slack-users/server';
 import '../app/integrations/server';
-import '../app/irc/server';
+import './bridges/irc';
 import '../app/lib/server';
 import '../app/token-login/server';
 import '../app/mailer/server/api';
@@ -40,11 +40,11 @@ import '../app/mentions/server';
 import '../app/message-mark-as-unread/server';
 import '../app/message-pin/server';
 import '../app/message-star/server';
-import '../app/nextcloud/server';
+import './bridges/nextcloud';
 import '../app/oauth2-server-config/server';
 import '../app/push-notifications/server';
 import '../app/retention-policy/server';
-import '../app/slackbridge/server';
+import './bridges/slack';
 import './slashcommands/archiveroom';
 import './slashcommands/asciiarts';
 import './slashcommands/ban';
@@ -62,11 +62,11 @@ import './slashcommands/mute';
 import './slashcommands/status';
 import './slashcommands/topic';
 import './slashcommands/unarchiveroom';
-import '../app/smarsh-connector/server';
+import './bridges/smarsh';
 import '../app/theme/server';
 import '../app/threads/server';
 import '../app/ui-master/server';
-import '../app/webdav/server';
+import './bridges/webdav';
 import '../app/wordpress/server';
 import '../app/meteor-accounts-saml/server';
 import '../app/e2e/server';