Skip to content

refactor: move app/lib modules #41926

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

Open
tassoevan wants to merge 1 commit into from
Open

refactor: move app/lib modules #41926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions apps/meteor/app/lib/client/index.ts
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions apps/meteor/app/lib/client/methods/sendMessage.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/client/importPackages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
import '../app/lib/client';
import '../app/utils/client';
48 changes: 46 additions & 2 deletions apps/meteor/client/lib/chats/flows/sendMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import type { IMessage } from '@rocket.chat/core-typings';

import { runOptimisticSendMessage } from '../../../../app/lib/client/methods/sendMessage';
import { sdk } from '../../../../app/utils/client/lib/SDKClient';
import { t } from '../../../../app/utils/lib/i18n';
import { closeUnclosedCodeBlock } from '../../../../lib/utils/closeUnclosedCodeBlock';
import { Messages } from '../../../stores';
import { Messages, Rooms } from '../../../stores';
import { onClientBeforeSendMessage } from '../../onClientBeforeSendMessage';
import { dispatchToastMessage } from '../../toast';
import type { ChatAPI } from '../ChatAPI';
Expand All @@ -14,6 +13,51 @@ import { processMessageUploads } from './processMessageUploads';
import { processSetReaction } from './processSetReaction';
import { processSlashCommand } from './processSlashCommand';
import { processTooLongMessage } from './processTooLongMessage';
import { trim } from '../../../../lib/utils/stringUtils';
import { onClientMessageReceived } from '../../onClientMessageReceived';
import { settings } from '../../settings';
import { getUserId, getUser } from '../../user';
import { upsertThreadMessageInCache } from '../../utils/threadMessageUtils';

const runOptimisticSendMessage = async (message: Partial<IMessage> & { rid: IMessage['rid']; msg: IMessage['msg'] }): Promise<void> => {
const uid = getUserId();
if (!uid || trim(message.msg) === '') {
return;
}
const messageAlreadyExists = message._id && Messages.state.get(message._id);
if (messageAlreadyExists) {
dispatchToastMessage({ type: 'error', message: t('Message_Already_Sent') });
return;
}
const user = getUser();
if (!user?.username) {
return;
}

const room = Rooms.state.get(message.rid);
if (room?.federated) {
return;
}

const optimistic: IMessage = {
...(message as IMessage),
ts: new Date(),
u: {
_id: uid,
username: user.username,
name: user.name || '',
},
temp: true,
...(settings.peek('Message_Read_Receipt_Enabled') ? { unread: true } : {}),
};

const processed = await onClientMessageReceived(optimistic);
Messages.state.store(processed);

if (processed.tmid) {
upsertThreadMessageInCache(processed, processed.rid, processed.tmid);
}
};

const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[], isSlashCommandAllowed?: boolean): Promise<void> => {
const mid = chat.currentEditingMessage.getMID();
Expand Down
7 changes: 4 additions & 3 deletions apps/meteor/client/meteor/overrides/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import './absoluteUrl';
import './ddpOverREST';
import './ddpSdkCollectionBridge';
import './subscribeViaSDK';
import './stubMeteorStream';
import './killMeteorStream';
import './desktopInjection';
import './killMeteorStream';
import './oauthProxy';

@cubic-dev-ai cubic-dev-ai Bot Aug 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: When an OAuth login starts before public settings have loaded, the newly activated oauthProxy wrapper calls .replace() on undefined and aborts the login flow. Make the proxy-service and proxy-host reads tolerate missing settings until the settings subscription is ready.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At apps/meteor/client/meteor/overrides/index.ts, line 6:

<comment>When an OAuth login starts before public settings have loaded, the newly activated `oauthProxy` wrapper calls `.replace()` on `undefined` and aborts the login flow. Make the proxy-service and proxy-host reads tolerate missing settings until the settings subscription is ready.</comment>

<file context>
@@ -1,11 +1,12 @@
-import './killMeteorStream';
 import './desktopInjection';
+import './killMeteorStream';
+import './oauthProxy';
 import './oauthRedirectUri';
 import './settings';
</file context>

import './oauthRedirectUri';
import './settings';
import './stubMeteorStream';
import './subscribeViaSDK';
import './totpOnCall';
import './userAndUsers';
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/client/OAuthProxy.ts → ...eor/client/meteor/overrides/oauthProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { OAuth } from 'meteor/oauth';

import { settings } from '../../../client/lib/settings';
import { settings } from '../../lib/settings';

OAuth.launchLogin = ((func) =>
function (options) {
Expand Down
Loading