Skip to content

[pull] develop from RocketChat:develop #554

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
pull merged 2 commits into from
Jun 13, 2026
+9 −14
Merged

[pull] develop from RocketChat:develop #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c12efe
chore: use list of supported features from the client when initiating…
pierre-lehnen-rc Jun 12, 2026
a080c80
regression: revert thread messages endpoint usage (#40913)
MartinSchoeler Jun 12, 2026
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
18 changes: 6 additions & 12 deletions apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMessagesQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { isThreadMessage, type IMessage, type IRoom, type IThreadMainMessage, type IThreadMessage } from '@rocket.chat/core-typings';
import { useEndpoint, useMethod, useStream } from '@rocket.chat/ui-contexts';
import { useMethod, useStream } from '@rocket.chat/ui-contexts';
import { useQuery, useQueryClient } from '@tanstack/react-query';
import { useEffect, useRef } from 'react';

import { onClientMessageReceived } from '../../../../../lib/onClientMessageReceived';
import { roomsQueryKeys } from '../../../../../lib/queryKeys';
import { mapMessageFromApi } from '../../../../../lib/utils/mapMessageFromApi';
import { modifyMessageOnFilesDelete } from '../../../../../lib/utils/modifyMessageOnFilesDelete';
import {
createDeleteCriteria,
Expand All @@ -25,11 +24,7 @@ export const useThreadMessagesQuery = (tmid: IThreadMainMessage['_id'], rid?: IR

const queryClient = useQueryClient();
const queryKey = roomsQueryKeys.threadMessages(roomId, tmid);
const getThreadMessages = useEndpoint('GET', '/v1/chat.getThreadMessages');
// REST has no per-thread read-marker endpoint yet; fall back to the
// `readThreads` DDP method so the side effect that DDP getThreadMessages
// used to do server-side keeps happening for callers.
const readThreads = useMethod('readThreads');
const getThreadMessages = useMethod('getThreadMessages');

const subscribeToRoomMessages = useStream('room-messages');
const subscribeToNotifyRoom = useStream('notify-room');
Expand Down Expand Up @@ -110,11 +105,10 @@ export const useThreadMessagesQuery = (tmid: IThreadMainMessage['_id'], rid?: IR
queryFn: async () => {
const cachedMessages = queryClient.getQueryData<IThreadMessage[]>(queryKey) || [];

const { messages } = await getThreadMessages({ tmid });
void Promise.resolve(readThreads(tmid)).catch(() => undefined);
const filtered = messages
.map((m) => mapMessageFromApi(m))
.filter((msg): msg is IThreadMessage => isThreadMessage(msg) && msg.tmid === tmid && msg._id !== tmid && msg._hidden !== true);
const messages = await getThreadMessages({ tmid });
const filtered = messages.filter(
(msg): msg is IThreadMessage => isThreadMessage(msg) && msg.tmid === tmid && msg._id !== tmid && msg._hidden !== true,
);

const sorted = mergeThreadMessages(cachedMessages, filtered);
if (unprocessedReadMessagesEvent.current) {
Expand Down
5 changes: 3 additions & 2 deletions ee/packages/media-calls/src/sip/providers/OutgoingSipCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class OutgoingSipCall extends BaseSipCall {

public static async createCall(session: SipServerSession, params: InternalCallParams): Promise<IMediaCall> {
logger.debug({ msg: 'OutgoingSipCall.createCall', sessionId: session.sessionId });
const { callee, ...extraParams } = params;
const { callee, features: requestedFeatures, ...extraParams } = params;

// pre-sign the callee to this session
const signedCallee: MediaCallSignedContact = {
Expand All @@ -68,12 +68,13 @@ export class OutgoingSipCall extends BaseSipCall {
throw new SipError(SipErrorCodes.NOT_FOUND, 'Caller agent not found');
}

const features = requestedFeatures.filter((feature) => SIP_CALL_FEATURES.includes(feature));
const call = await mediaCallDirector.createCall({
...extraParams,
callee: signedCallee,
calleeAgent,
callerAgent,
features: SIP_CALL_FEATURES,
features,
});

const channel = await calleeAgent.getOrCreateChannel(call, session.sessionId);
Expand Down
Loading