This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Add slash command to switch to a room's virtual room #7839
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7b13c22
Add slash command to switch to a room's virtual room
dbkr e516454
Update to new interface
dbkr 0baf932
Return null if no virtual user
dbkr c77886b
Throw newTranslateableError
dbkr 8749354
Types
dbkr c67998a
Disable tovirtual if virtual rooms not supported
dbkr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,13 +42,20 @@ export default class VoipUserMapper { | |
return results[0].userid; | ||
} | ||
|
||
public async getOrCreateVirtualRoomForRoom(roomId: string): Promise<string> { | ||
private async getVirtualUserForRoom(roomId: string): Promise<string> { | ||
dbkr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const userId = DMRoomMap.shared().getUserIdForRoomId(roomId); | ||
if (!userId) return null; | ||
|
||
const virtualUser = await this.userToVirtualUser(userId); | ||
if (!virtualUser) return null; | ||
|
||
return virtualUser; | ||
} | ||
|
||
public async getOrCreateVirtualRoomForRoom(roomId: string): Promise<string> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Return type is fwiw, there's an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought the thing to do longer-term was to switch to undefineds so we can use typescript's built in optional? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it should boil down to the same thing |
||
const virtualUser = await this.getVirtualUserForRoom(roomId); | ||
if (!virtualUser) return null; | ||
|
||
const virtualRoomId = await ensureVirtualRoomExists(MatrixClientPeg.get(), virtualUser, roomId); | ||
MatrixClientPeg.get().setRoomAccountData(virtualRoomId, VIRTUAL_ROOM_EVENT_TYPE, { | ||
native_room: roomId, | ||
|
@@ -59,6 +66,17 @@ export default class VoipUserMapper { | |
return virtualRoomId; | ||
} | ||
|
||
/** | ||
* Gets the ID of the virtual room for a room, or null if the room has no | ||
* virtual room | ||
*/ | ||
public async getVirtualRoomForRoom(roomId: string): Promise<Room> { | ||
dbkr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const virtualUser = await this.getVirtualUserForRoom(roomId); | ||
if (!virtualUser) return null; | ||
|
||
return findDMForUser(MatrixClientPeg.get(), virtualUser); | ||
} | ||
|
||
public nativeRoomForVirtualRoom(roomId: string): string { | ||
const cachedNativeRoomId = this.virtualToNativeRoomIdCache.get(roomId); | ||
if (cachedNativeRoomId) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm moderately surprised the command isn't behind an
isEnabled
check as well - is there something we can use to disable the command in unintentional environments?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, I didn't even notice isEnabled(). We could use the check for native/virtual lookup support on the server. I'm sort of surprised we're ever disabling commands though? Maybe for disabled labs features, but having command just disappear in certain situations rather than just return an error seems really confusing. Especially the 'op' command? I guess this seems to be the precedent though...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commands disappearing is definitely a concern, though I think for features like this it's moderately more confusing to have it show up compared to something like
/op
disappearing.