imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop voice broadcast from save device on resume (#9509)

Browse source
This commit is contained in:
Michael Weimann 2022-10-26 18:59:47 +02:00 • committed by GitHub
parent ee61994c05
commit e6a645dfae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 196 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/voice-broadcast/index.ts
View file

@ -37,7 +37,6 @@ export * from "./stores/VoiceBroadcastRecordingsStore";
export * from "./utils/getChunkLength";
export * from "./utils/hasRoomLiveVoiceBroadcast";
export * from "./utils/findRoomLiveVoiceBroadcastFromUserAndDevice";
export * from "./utils/resumeVoiceBroadcastInRoom";
export * from "./utils/shouldDisplayAsVoiceBroadcastRecordingTile";
export * from "./utils/shouldDisplayAsVoiceBroadcastTile";
export * from "./utils/startNewVoiceBroadcastRecording";

92
src/voice-broadcast/utils/VoiceBroadcastResumer.ts
View file

@ -14,43 +14,87 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { ClientEvent, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
import { ClientEvent, MatrixClient, MatrixEvent, RelationType, Room } from "matrix-js-sdk/src/matrix";
import { SyncState } from "matrix-js-sdk/src/sync";
import { VoiceBroadcastInfoEventContent, VoiceBroadcastInfoEventType, VoiceBroadcastInfoState } from "..";
import { IDestroyable } from "../../utils/IDestroyable";
import { findRoomLiveVoiceBroadcastFromUserAndDevice } from "./findRoomLiveVoiceBroadcastFromUserAndDevice";
import { resumeVoiceBroadcastInRoom } from "./resumeVoiceBroadcastInRoom";
/**
* Handles voice broadcasts on app resume (after logging in, reload, crash…).
*/
export class VoiceBroadcastResumer implements IDestroyable {
private seenRooms = new Set<string>();
private userId: string;
private deviceId: string;
public constructor(
private client: MatrixClient,
) {
this.client.on(ClientEvent.Room, this.onRoom);
this.userId = this.client.getUserId();
this.deviceId = this.client.getDeviceId();
if (client.isInitialSyncComplete()) {
this.resume();
} else {
// wait for initial sync
client.on(ClientEvent.Sync, this.onClientSync);
}
}
private onRoom = (room: Room): void => {
if (this.seenRooms.has(room.roomId)) return;
this.seenRooms.add(room.roomId);
const infoEvent = findRoomLiveVoiceBroadcastFromUserAndDevice(
room,
this.userId,
this.deviceId,
);
if (infoEvent) {
resumeVoiceBroadcastInRoom(infoEvent, room, this.client);
private onClientSync = () => {
if (this.client.getSyncState() === SyncState.Syncing) {
this.client.off(ClientEvent.Sync, this.onClientSync);
this.resume();
}
};
private resume(): void {
const userId = this.client.getUserId();
const deviceId = this.client.getDeviceId();
if (!userId || !deviceId) {
// Resuming a voice broadcast only makes sense if there is a user.
return;
}
this.client.getRooms().forEach((room: Room) => {
const infoEvent = findRoomLiveVoiceBroadcastFromUserAndDevice(room, userId, deviceId);
if (infoEvent) {
// Found a live broadcast event from current device; stop it.
// Stopping it is a temporary solution (see PSF-1669).
this.sendStopVoiceBroadcastStateEvent(infoEvent);
return false;
}
});
}
private sendStopVoiceBroadcastStateEvent(infoEvent: MatrixEvent): void {
const userId = this.client.getUserId();
const deviceId = this.client.getDeviceId();
const roomId = infoEvent.getRoomId();
if (!userId || !deviceId || !roomId) {
// We can only send a state event if we know all the IDs.
return;
}
const content: VoiceBroadcastInfoEventContent = {
device_id: deviceId,
state: VoiceBroadcastInfoState.Stopped,
};
// all events should reference the started event
const referencedEventId = infoEvent.getContent()?.state === VoiceBroadcastInfoState.Started
? infoEvent.getId()
: infoEvent.getContent()?.["m.relates_to"]?.event_id;
if (referencedEventId) {
content["m.relates_to"] = {
rel_type: RelationType.Reference,
event_id: referencedEventId,
};
}
this.client.sendStateEvent(roomId, VoiceBroadcastInfoEventType, content, userId);
}
destroy(): void {
this.client.off(ClientEvent.Room, this.onRoom);
this.seenRooms = new Set<string>();
this.client.off(ClientEvent.Sync, this.onClientSync);
}
}

34
src/voice-broadcast/utils/resumeVoiceBroadcastInRoom.ts
View file

@ -1,34 +0,0 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
import { VoiceBroadcastInfoState, VoiceBroadcastRecording } from "..";
import { VoiceBroadcastRecordingsStore } from "../stores/VoiceBroadcastRecordingsStore";
export const resumeVoiceBroadcastInRoom = (latestInfoEvent: MatrixEvent, room: Room, client: MatrixClient) => {
// voice broadcasts are based on their started event, try to find it
const infoEvent = latestInfoEvent.getContent()?.state === VoiceBroadcastInfoState.Started
? latestInfoEvent
: room.findEventById(latestInfoEvent.getRelation()?.event_id);
if (!infoEvent) {
return;
}
const recording = new VoiceBroadcastRecording(infoEvent, client, VoiceBroadcastInfoState.Paused);
VoiceBroadcastRecordingsStore.instance().setCurrent(recording);
};