Skip to content

Commit 9efe084

Browse files
authored
Merge pull request oxen-io#2596 from oxen-io/fix-sogs-room-with-uppercase
fix: do not lowercase roomId before joining sogs room
2 parents 8f426a5 + 984dbf7 commit 9efe084

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import _, { compact, flatten, isString } from 'lodash';
1+
import _, { clone, compact, flatten, isString } from 'lodash';
22
import { allowOnlyOneAtATime } from '../../../utils/Promise';
33
import {
44
updateDefaultRooms,
@@ -80,7 +80,7 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
8080
return false;
8181
}
8282

83-
const serverNotLowerCased = server;
83+
const serverNotLowerCased = clone(server);
8484
const serverLowerCase = serverNotLowerCased.toLowerCase();
8585

8686
let serverUrl: URL | undefined;

ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import { getOpenGroupManager } from './OpenGroupManagerV2';
2222
// 143.198.213.255:80/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
2323

2424
export function parseOpenGroupV2(urlWithPubkey: string): OpenGroupV2Room | undefined {
25-
const lowerCased = urlWithPubkey.trim().toLowerCase();
25+
const trimmed = urlWithPubkey.trim();
2626
try {
27-
if (!openGroupV2CompleteURLRegex.test(lowerCased)) {
27+
if (!openGroupV2CompleteURLRegex.test(trimmed)) {
2828
throw new Error('regex fail');
2929
}
3030

3131
// prefix the URL if it does not have a prefix
32-
const prefixedUrl = prefixify(lowerCased);
32+
const prefixedUrl = prefixify(trimmed);
3333
// new URL fails if the protocol is not explicit
3434
const url = new URL(prefixedUrl);
3535

@@ -43,7 +43,7 @@ export function parseOpenGroupV2(urlWithPubkey: string): OpenGroupV2Room | undef
4343
};
4444
return room;
4545
} catch (e) {
46-
window?.log?.error('Invalid Opengroup v2 join URL:', lowerCased, e);
46+
window?.log?.error('Invalid Opengroup v2 join URL:', trimmed, e);
4747
}
4848
return undefined;
4949
}
@@ -62,8 +62,8 @@ async function joinOpenGroupV2(room: OpenGroupV2Room, fromConfigMessage: boolean
6262
return;
6363
}
6464

65-
const serverUrl = room.serverUrl.toLowerCase();
66-
const roomId = room.roomId.toLowerCase();
65+
const serverUrl = room.serverUrl;
66+
const roomId = room.roomId;
6767
const publicKey = room.serverPublicKey.toLowerCase();
6868
const prefixedServer = prefixify(serverUrl);
6969

0 commit comments

Comments
 (0)