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

Stop automatic playback of voice messages if a non-voice message is encountered #6728

Merged
merged 3 commits into from
Sep 3, 2021
Merged
Changes from all 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
13 changes: 9 additions & 4 deletions src/audio/PlaybackQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { arrayFastClone } from "../utils/arrays";
import { PlaybackManager } from "./PlaybackManager";
import { isVoiceMessage } from "../utils/EventUtils";
import RoomViewStore from "../stores/RoomViewStore";
import { EventType } from "matrix-js-sdk/src/@types/event";

/**
* Audio playback queue management for a given room. This keeps track of where the user
Expand Down Expand Up @@ -137,13 +138,17 @@ export class PlaybackQueue {
}
if (!scanForVoiceMessage) continue;

// Dev note: This is where we'd break to cause text/non-voice messages to
// interrupt automatic playback.
if (!isVoiceMessage(event)) {
const evType = event.getType();
if (evType !== EventType.RoomMessage && evType !== EventType.Sticker) {
continue; // Event can be skipped for automatic playback consideration
}
break; // Stop automatic playback: next useful event is not a voice message
}

const isRightType = isVoiceMessage(event);
const havePlayback = this.playbacks.has(event.getId());
const isRecentlyCompleted = this.recentFullPlays.has(event.getId());
if (isRightType && havePlayback && !isRecentlyCompleted) {
if (havePlayback && !isRecentlyCompleted) {
nextEv = event;
break;
}
Expand Down