Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Open native room when clicking notification from a virtual room #7709

Merged
dbkr merged 2 commits into from
Feb 3, 2022
Merged

Open native room when clicking notification from a virtual room #7709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee1f3dc
Handle virtual rooms when showing a notification
anoadragon453 Aug 24, 2021
9bb5516
This should be using sharedInstance()
dbkr Feb 3, 2022
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
13 changes: 12 additions & 1 deletion src/Notifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import RoomViewStore from "./stores/RoomViewStore";
import UserActivity from "./UserActivity";
import { mediaFromMxc } from "./customisations/Media";
import ErrorDialog from "./components/views/dialogs/ErrorDialog";
import CallHandler from "./CallHandler";
import VoipUserMapper from "./VoipUserMapper";

/*
* Dispatches:
Expand Down Expand Up @@ -386,7 +388,16 @@ export const Notifier = {
},

_evaluateEvent: function(ev: MatrixEvent) {
const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
let roomId = ev.getRoomId();
if (CallHandler.instance.getSupportsVirtualRooms()) {
// Attempt to translate a virtual room to a native one
const nativeRoomId = VoipUserMapper.sharedInstance().nativeRoomForVirtualRoom(roomId);
if (nativeRoomId) {
roomId = nativeRoomId;
}
}
const room = MatrixClientPeg.get().getRoom(roomId);

const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
if (actions?.notify) {
if (RoomViewStore.getRoomId() === room.roomId &&
Expand Down