Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
9 changes: 3 additions & 6 deletions apps/meteor/client/lib/e2ee/rocketchat.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import QueryString from 'querystring';
import URL from 'url';

import type { IE2EEMessage, IMessage, IRoom, IUser, IUploadWithUser, Serialized, IE2EEPinnedMessage } from '@rocket.chat/core-typings';
import { isE2EEMessage, isEncryptedMessageContent } from '@rocket.chat/core-typings';
import { Emitter } from '@rocket.chat/emitter';
Expand Down Expand Up @@ -731,13 +728,13 @@ class E2E extends Emitter {
return;
}

const urlObj = URL.parse(url);
const urlObj = new URL(url);
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved
Comment thread
tassoevan marked this conversation as resolved.
Resolved
// if the URL doesn't have query params (doesn't reference message) skip
if (!urlObj.query) {
if (!urlObj?.searchParams) {
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved
return;
}

const { msg: msgId } = QueryString.parse(urlObj.query);
const { msg: msgId } = Object.fromEntries(urlObj.searchParams.entries());
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved

if (!msgId || Array.isArray(msgId)) {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
return;
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/imports/client/hepburn

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/limax

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/map-age-cleaner

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/mem

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/mimic-fn/index.js

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/p-defer

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/poly1305-js

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/query-string

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/scheduler

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/sodium-native

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/sodium-plus

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/split-on-first

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/imports/client/strict-uri-encode

This file was deleted.

Loading