Remove abandoned Voice Broadcasts labs flag (#28548)

* Remove abandoned Voice Broadcasts labs flag Any existing voice broadcasts will be shown as a series of voice messages which will sequence play as normal Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove dead code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-12-02 10:53:27 +00:00
parent 5d72735b1f
commit d8ebc68aa8
174 changed files with 29 additions and 13632 deletions
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -119,7 +119,6 @@ import { ValidatedServerConfig } from "../../utils/ValidatedServerConfig";
 import { isLocalRoom } from "../../utils/localRoom/isLocalRoom";
 import { SDKContext, SdkContextClass } from "../../contexts/SDKContext";
 import { viewUserDeviceSettings } from "../../actions/handlers/viewUserDeviceSettings";
-import { cleanUpBroadcasts, VoiceBroadcastResumer } from "../../voice-broadcast";
 import GenericToast from "../views/toasts/GenericToast";
 import RovingSpotlightDialog from "../views/dialogs/spotlight/SpotlightDialog";
 import { findDMForUser } from "../../utils/dm/findDMForUser";
@@ -227,7 +226,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
    private focusNext: FocusNextType;
    private subTitleStatus: string;
    private prevWindowWidth: number;
-    private voiceBroadcastResumer?: VoiceBroadcastResumer;

    private readonly loggedInView = createRef<LoggedInViewType>();
    private dispatcherRef?: string;
@@ -501,7 +499,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
        window.removeEventListener("resize", this.onWindowResized);

        this.stores.accountPasswordStore.clearPassword();
-        this.voiceBroadcastResumer?.destroy();
    }

    private onWindowResized = (): void => {
@@ -651,10 +648,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                break;
            case "logout":
                LegacyCallHandler.instance.hangupAllCalls();
-                Promise.all([
-                    ...[...CallStore.instance.connectedCalls].map((call) => call.disconnect()),
-                    cleanUpBroadcasts(this.stores),
-                ]).finally(() => Lifecycle.logout(this.stores.oidcClientStore));
+                Promise.all([...[...CallStore.instance.connectedCalls].map((call) => call.disconnect())]).finally(() =>
+                    Lifecycle.logout(this.stores.oidcClientStore),
+                );
                break;
            case "require_registration":
                startAnyRegistrationFlow(payload as any);
@@ -1679,8 +1675,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                });
            }
        });
-
-        this.voiceBroadcastResumer = new VoiceBroadcastResumer(cli);
    }

    /**
--- a/src/components/structures/PipContainer.tsx
+++ b/src/components/structures/PipContainer.tsx
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
 Please see LICENSE files in the repository root for full details.
 */

-import React, { MutableRefObject, ReactNode, useContext, useRef } from "react";
+import React, { MutableRefObject, ReactNode, useRef } from "react";
 import { CallEvent, CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
@@ -21,19 +21,7 @@ import { WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
 import ActiveWidgetStore, { ActiveWidgetStoreEvent } from "../../stores/ActiveWidgetStore";
 import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
-import { SDKContext, SdkContextClass } from "../../contexts/SDKContext";
-import {
-    useCurrentVoiceBroadcastPreRecording,
-    useCurrentVoiceBroadcastRecording,
-    VoiceBroadcastPlayback,
-    VoiceBroadcastPlaybackBody,
-    VoiceBroadcastPreRecording,
-    VoiceBroadcastPreRecordingPip,
-    VoiceBroadcastRecording,
-    VoiceBroadcastRecordingPip,
-    VoiceBroadcastSmallPlaybackBody,
-} from "../../voice-broadcast";
-import { useCurrentVoiceBroadcastPlayback } from "../../voice-broadcast/hooks/useCurrentVoiceBroadcastPlayback";
+import { SdkContextClass } from "../../contexts/SDKContext";
 import { WidgetPip } from "../views/pips/WidgetPip";

 const SHOW_CALL_IN_STATES = [
@@ -46,9 +34,6 @@ const SHOW_CALL_IN_STATES = [
 ];

 interface IProps {
-    voiceBroadcastRecording: Optional<VoiceBroadcastRecording>;
-    voiceBroadcastPreRecording: Optional<VoiceBroadcastPreRecording>;
-    voiceBroadcastPlayback: Optional<VoiceBroadcastPlayback>;
    movePersistedElement: MutableRefObject<(() => void) | undefined>;
 }

@@ -245,52 +230,9 @@ class PipContainerInner extends React.Component<IProps, IState> {
        this.setState({ showWidgetInPip, persistentWidgetId, persistentRoomId });
    }

-    private createVoiceBroadcastPlaybackPipContent(voiceBroadcastPlayback: VoiceBroadcastPlayback): CreatePipChildren {
-        const content =
-            this.state.viewedRoomId === voiceBroadcastPlayback.infoEvent.getRoomId() ? (
-                <VoiceBroadcastPlaybackBody playback={voiceBroadcastPlayback} pip={true} />
-            ) : (
-                <VoiceBroadcastSmallPlaybackBody playback={voiceBroadcastPlayback} />
-            );
-
-        return ({ onStartMoving }) => (
-            <div key={`vb-playback-${voiceBroadcastPlayback.infoEvent.getId()}`} onMouseDown={onStartMoving}>
-                {content}
-            </div>
-        );
-    }
-
-    private createVoiceBroadcastPreRecordingPipContent(
-        voiceBroadcastPreRecording: VoiceBroadcastPreRecording,
-    ): CreatePipChildren {
-        return ({ onStartMoving }) => (
-            <div key="vb-pre-recording" onMouseDown={onStartMoving}>
-                <VoiceBroadcastPreRecordingPip voiceBroadcastPreRecording={voiceBroadcastPreRecording} />
-            </div>
-        );
-    }
-
-    private createVoiceBroadcastRecordingPipContent(
-        voiceBroadcastRecording: VoiceBroadcastRecording,
-    ): CreatePipChildren {
-        return ({ onStartMoving }) => (
-            <div key={`vb-recording-${voiceBroadcastRecording.infoEvent.getId()}`} onMouseDown={onStartMoving}>
-                <VoiceBroadcastRecordingPip recording={voiceBroadcastRecording} />
-            </div>
-        );
-    }
-
    public render(): ReactNode {
        const pipMode = true;
-        let pipContent: Array<CreatePipChildren> = [];
-
-        if (this.props.voiceBroadcastRecording) {
-            pipContent = [this.createVoiceBroadcastRecordingPipContent(this.props.voiceBroadcastRecording)];
-        } else if (this.props.voiceBroadcastPreRecording) {
-            pipContent = [this.createVoiceBroadcastPreRecordingPipContent(this.props.voiceBroadcastPreRecording)];
-        } else if (this.props.voiceBroadcastPlayback) {
-            pipContent = [this.createVoiceBroadcastPlaybackPipContent(this.props.voiceBroadcastPlayback)];
-        }
+        const pipContent: Array<CreatePipChildren> = [];

        if (this.state.primaryCall) {
            // get a ref to call inside the current scope
@@ -338,24 +280,7 @@ class PipContainerInner extends React.Component<IProps, IState> {
 }

 export const PipContainer: React.FC = () => {
-    const sdkContext = useContext(SDKContext);
-    const voiceBroadcastPreRecordingStore = sdkContext.voiceBroadcastPreRecordingStore;
-    const { currentVoiceBroadcastPreRecording } = useCurrentVoiceBroadcastPreRecording(voiceBroadcastPreRecordingStore);
-
-    const voiceBroadcastRecordingsStore = sdkContext.voiceBroadcastRecordingsStore;
-    const { currentVoiceBroadcastRecording } = useCurrentVoiceBroadcastRecording(voiceBroadcastRecordingsStore);
-
-    const voiceBroadcastPlaybacksStore = sdkContext.voiceBroadcastPlaybacksStore;
-    const { currentVoiceBroadcastPlayback } = useCurrentVoiceBroadcastPlayback(voiceBroadcastPlaybacksStore);
-
    const movePersistedElement = useRef<() => void>();

-    return (
-        <PipContainerInner
-            voiceBroadcastPlayback={currentVoiceBroadcastPlayback}
-            voiceBroadcastPreRecording={currentVoiceBroadcastPreRecording}
-            voiceBroadcastRecording={currentVoiceBroadcastRecording}
-            movePersistedElement={movePersistedElement}
-        />
-    );
+    return <PipContainerInner movePersistedElement={movePersistedElement} />;
 };
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -40,8 +40,6 @@ import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import UserIdentifierCustomisations from "../../customisations/UserIdentifier";
 import PosthogTrackers from "../../PosthogTrackers";
 import { ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePagePayload";
-import { Icon as LiveIcon } from "../../../res/img/compound/live-8px.svg";
-import { VoiceBroadcastRecording, VoiceBroadcastRecordingsStoreEvent } from "../../voice-broadcast";
 import { SDKContext } from "../../contexts/SDKContext";
 import { shouldShowFeedback } from "../../utils/Feedback";
 import DarkLightModeSvg from "../../../res/img/element-icons/roomlist/dark-light-mode.svg";
@@ -58,7 +56,6 @@ interface IState {
    isDarkTheme: boolean;
    isHighContrast: boolean;
    selectedSpace?: Room | null;
-    showLiveAvatarAddon: boolean;
 }

 const toRightOf = (rect: PartialDOMRect): MenuProps => {
@@ -94,7 +91,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
            isDarkTheme: this.isUserOnDarkTheme(),
            isHighContrast: this.isUserOnHighContrastTheme(),
            selectedSpace: SpaceStore.instance.activeSpaceRoom,
-            showLiveAvatarAddon: this.context.voiceBroadcastRecordingsStore.hasCurrent(),
        };
    }

@@ -102,19 +98,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
        return !!getHomePageUrl(SdkConfig.get(), this.context.client!);
    }

-    private onCurrentVoiceBroadcastRecordingChanged = (recording: VoiceBroadcastRecording | null): void => {
-        this.setState({
-            showLiveAvatarAddon: recording !== null,
-        });
-    };
-
    public componentDidMount(): void {
        OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-        this.context.voiceBroadcastRecordingsStore.on(
-            VoiceBroadcastRecordingsStoreEvent.CurrentChanged,
-            this.onCurrentVoiceBroadcastRecordingChanged,
-        );
        this.dispatcherRef = defaultDispatcher.register(this.onAction);
        this.themeWatcherRef = SettingsStore.watchSetting("theme", null, this.onThemeChanged);
    }
@@ -125,10 +111,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
        defaultDispatcher.unregister(this.dispatcherRef);
        OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
        SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-        this.context.voiceBroadcastRecordingsStore.off(
-            VoiceBroadcastRecordingsStoreEvent.CurrentChanged,
-            this.onCurrentVoiceBroadcastRecordingChanged,
-        );
    }

    private isUserOnDarkTheme(): boolean {
@@ -435,12 +417,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
            name = <div className="mx_UserMenu_name">{displayName}</div>;
        }

-        const liveAvatarAddon = this.state.showLiveAvatarAddon ? (
-            <div className="mx_UserMenu_userAvatarLive" data-testid="user-menu-live-vb">
-                <LiveIcon className="mx_Icon_8" />
-            </div>
-        ) : null;
-
        return (
            <div className="mx_UserMenu">
                <ContextMenuButton
@@ -459,7 +435,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
                            size={avatarSize + "px"}
                            className="mx_UserMenu_userAvatar_BaseAvatar"
                        />
-                        {liveAvatarAddon}
                    </div>
                    {name}
                    {this.renderContextMenu()}
--- a/src/components/structures/grouper/CreationGrouper.tsx
+++ b/src/components/structures/grouper/CreationGrouper.tsx
@@ -12,7 +12,6 @@ import { KnownMembership } from "matrix-js-sdk/src/types";

 import { BaseGrouper } from "./BaseGrouper";
 import MessagePanel, { WrappedEvent } from "../MessagePanel";
-import { VoiceBroadcastInfoEventType } from "../../../voice-broadcast";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import { _t } from "../../../languageHandler";
 import DateSeparator from "../../views/messages/DateSeparator";
@@ -53,11 +52,6 @@ export class CreationGrouper extends BaseGrouper {
            return false;
        }

-        if (VoiceBroadcastInfoEventType === eventType) {
-            // always show voice broadcast info events in timeline
-            return false;
-        }
-
        if (event.isState() && event.getSender() === createEvent.getSender()) {
            return true;
        }
--- a/src/components/views/audio_messages/DevicesContextMenu.tsx
+++ b/src/components/views/audio_messages/DevicesContextMenu.tsx
@@ -1,45 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022, 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React, { MutableRefObject } from "react";
-
-import { toLeftOrRightOf } from "../../structures/ContextMenu";
-import IconizedContextMenu, {
-    IconizedContextMenuOptionList,
-    IconizedContextMenuRadio,
-} from "../context_menus/IconizedContextMenu";
-
-interface Props {
-    containerRef: MutableRefObject<HTMLElement | null>;
-    currentDevice: MediaDeviceInfo | null;
-    devices: MediaDeviceInfo[];
-    onDeviceSelect: (device: MediaDeviceInfo) => void;
-}
-
-export const DevicesContextMenu: React.FC<Props> = ({ containerRef, currentDevice, devices, onDeviceSelect }) => {
-    const deviceOptions = devices.map((d: MediaDeviceInfo) => {
-        return (
-            <IconizedContextMenuRadio
-                key={d.deviceId}
-                active={d.deviceId === currentDevice?.deviceId}
-                onClick={() => onDeviceSelect(d)}
-                label={d.label}
-            />
-        );
-    });
-
-    return (
-        <IconizedContextMenu
-            mountAsChild={false}
-            onFinished={() => {}}
-            {...(containerRef.current ? toLeftOrRightOf(containerRef.current.getBoundingClientRect(), 0) : {})}
-        >
-            <IconizedContextMenuOptionList>{deviceOptions}</IconizedContextMenuOptionList>
-        </IconizedContextMenu>
-    );
-};
--- a/src/components/views/dialogs/CantStartVoiceMessageBroadcastDialog.tsx
+++ b/src/components/views/dialogs/CantStartVoiceMessageBroadcastDialog.tsx
@@ -1,21 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-Please see LICENSE files in the repository root for full details.
-*/
-
-import React from "react";
-
-import { _t } from "../../../languageHandler";
-import Modal from "../../../Modal";
-import InfoDialog from "./InfoDialog";
-
-export const createCantStartVoiceMessageBroadcastDialog = (): void => {
-    Modal.createDialog(InfoDialog, {
-        title: _t("voice_message|cant_start_broadcast_title"),
-        description: <p>{_t("voice_message|cant_start_broadcast_description")}</p>,
-        hasCloseButton: true,
-    });
-};
--- a/src/components/views/dialogs/ConfirmRedactDialog.tsx
+++ b/src/components/views/dialogs/ConfirmRedactDialog.tsx
@@ -6,14 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
 Please see LICENSE files in the repository root for full details.
 */

-import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
-import { IRedactOpts, MatrixEvent, RelationType } from "matrix-js-sdk/src/matrix";
+import { IRedactOpts, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import React from "react";

 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
-import { isVoiceBroadcastStartedEvent } from "../../../voice-broadcast/utils/isVoiceBroadcastStartedEvent";
 import ErrorDialog from "./ErrorDialog";
 import TextInputDialog from "./TextInputDialog";

@@ -70,18 +68,6 @@ export function createRedactEventDialog({
                const cli = MatrixClientPeg.safeGet();
                const withRelTypes: Pick<IRedactOpts, "with_rel_types"> = {};

-                // redact related events if this is a voice broadcast started event and
-                // server has support for relation based redactions
-                if (isVoiceBroadcastStartedEvent(mxEvent)) {
-                    const relationBasedRedactionsSupport = cli.canSupport.get(Feature.RelationBasedRedactions);
-                    if (
-                        relationBasedRedactionsSupport &&
-                        relationBasedRedactionsSupport !== ServerSupport.Unsupported
-                    ) {
-                        withRelTypes.with_rel_types = [RelationType.Reference];
-                    }
-                }
-
                try {
                    onCloseDialog?.();
                    await cli.redactEvent(roomId, eventId, undefined, {
--- a/src/components/views/dialogs/DevtoolsDialog.tsx
+++ b/src/components/views/dialogs/DevtoolsDialog.tsx
@@ -22,7 +22,6 @@ import { AccountDataExplorer, RoomAccountDataExplorer } from "./devtools/Account
 import SettingsFlag from "../elements/SettingsFlag";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import ServerInfo from "./devtools/ServerInfo";
-import { Features } from "../../../settings/Settings";
 import CopyableText from "../elements/CopyableText";
 import RoomNotifications from "./devtools/RoomNotifications";

@@ -100,7 +99,6 @@ const DevtoolsDialog: React.FC<IProps> = ({ roomId, threadRootId, onFinished })
                    <SettingsFlag name="developerMode" level={SettingLevel.ACCOUNT} />
                    <SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
                    <SettingsFlag name="enableWidgetScreenshots" level={SettingLevel.ACCOUNT} />
-                    <SettingsFlag name={Features.VoiceBroadcastForceSmallChunks} level={SettingLevel.DEVICE} />
                </div>
            </BaseTool>
        );
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -58,7 +58,6 @@ import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
 import { Action } from "../../../dispatcher/actions";
 import { ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadPayload";
 import { GetRelationsForEvent, IEventTileType } from "../rooms/EventTile";
-import { VoiceBroadcastInfoEventType } from "../../../voice-broadcast/types";
 import { ButtonEvent } from "../elements/AccessibleButton";
 import PinningUtils from "../../../utils/PinningUtils";
 import PosthogTrackers from "../../../PosthogTrackers.ts";
@@ -354,8 +353,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
             * until cross-platform support
             * (PSF-1041)
             */
-            !M_BEACON_INFO.matches(this.props.mxEvent.getType()) &&
-            !(this.props.mxEvent.getType() === VoiceBroadcastInfoEventType);
+            !M_BEACON_INFO.matches(this.props.mxEvent.getType());

        return inNotThreadTimeline && isAllowedMessageType;
    }
--- a/src/components/views/messages/MessageEvent.tsx
+++ b/src/components/views/messages/MessageEvent.tsx
@@ -41,7 +41,6 @@ import MjolnirBody from "./MjolnirBody";
 import MBeaconBody from "./MBeaconBody";
 import { DecryptionFailureBody } from "./DecryptionFailureBody";
 import { GetRelationsForEvent, IEventTileOps } from "../rooms/EventTile";
-import { VoiceBroadcastBody, VoiceBroadcastInfoEventType, VoiceBroadcastInfoState } from "../../../voice-broadcast";

 // onMessageAllowed is handled internally
 interface IProps extends Omit<IBodyProps, "onMessageAllowed" | "mediaEventHelper"> {
@@ -276,10 +275,6 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
            if (M_LOCATION.matches(type) || (type === EventType.RoomMessage && msgtype === MsgType.Location)) {
                BodyType = MLocationBody;
            }
-
-            if (type === VoiceBroadcastInfoEventType && content?.state === VoiceBroadcastInfoState.Started) {
-                BodyType = VoiceBroadcastBody;
-            }
        }

        if (SettingsStore.getValue("feature_mjolnir")) {
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -48,14 +48,9 @@ import MessageComposerButtons from "./MessageComposerButtons";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { isLocalRoom } from "../../../utils/localRoom/isLocalRoom";
-import { Features } from "../../../settings/Settings";
 import { VoiceMessageRecording } from "../../../audio/VoiceMessageRecording";
 import { SendWysiwygComposer, sendMessage, getConversionFunctions } from "./wysiwyg_composer/";
 import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
-import { setUpVoiceBroadcastPreRecording } from "../../../voice-broadcast/utils/setUpVoiceBroadcastPreRecording";
-import { SdkContextClass } from "../../../contexts/SDKContext";
-import { VoiceBroadcastInfoState } from "../../../voice-broadcast";
-import { createCantStartVoiceMessageBroadcastDialog } from "../dialogs/CantStartVoiceMessageBroadcastDialog";
 import { UIFeature } from "../../../settings/UIFeature";
 import { formatTimeLeft } from "../../../DateUtils";
 import RoomReplacedSvg from "../../../../res/img/room_replaced.svg";
@@ -101,7 +96,6 @@ interface IState {
    isStickerPickerOpen: boolean;
    showStickersButton: boolean;
    showPollsButton: boolean;
-    showVoiceBroadcastButton: boolean;
    isWysiwygLabEnabled: boolean;
    isRichTextEnabled: boolean;
    initialComposerContent: string;
@@ -127,7 +121,6 @@ export class MessageComposer extends React.Component<IProps, IState> {

    public static defaultProps = {
        compact: false,
-        showVoiceBroadcastButton: false,
        isRichTextEnabled: true,
    };

@@ -155,7 +148,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
            isStickerPickerOpen: false,
            showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"),
            showPollsButton: SettingsStore.getValue("MessageComposerInput.showPollsButton"),
-            showVoiceBroadcastButton: SettingsStore.getValue(Features.VoiceBroadcast),
            isWysiwygLabEnabled: isWysiwygLabEnabled,
            isRichTextEnabled: isRichTextEnabled,
            initialComposerContent: initialComposerContent,
@@ -250,7 +242,6 @@ export class MessageComposer extends React.Component<IProps, IState> {

        SettingsStore.monitorSetting("MessageComposerInput.showStickersButton", null);
        SettingsStore.monitorSetting("MessageComposerInput.showPollsButton", null);
-        SettingsStore.monitorSetting(Features.VoiceBroadcast, null);
        SettingsStore.monitorSetting("feature_wysiwyg_composer", null);

        this.dispatcherRef = dis.register(this.onAction);
@@ -301,12 +292,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
                        }
                        break;
                    }
-                    case Features.VoiceBroadcast: {
-                        if (this.state.showVoiceBroadcastButton !== settingUpdatedPayload.newValue) {
-                            this.setState({ showVoiceBroadcastButton: !!settingUpdatedPayload.newValue });
-                        }
-                        break;
-                    }
                    case "feature_wysiwyg_composer": {
                        if (this.state.isWysiwygLabEnabled !== settingUpdatedPayload.newValue) {
                            this.setState({ isWysiwygLabEnabled: Boolean(settingUpdatedPayload.newValue) });
@@ -533,13 +518,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
    }

    private onRecordStartEndClick = (): void => {
-        const currentBroadcastRecording = SdkContextClass.instance.voiceBroadcastRecordingsStore.getCurrent();
-
-        if (currentBroadcastRecording && currentBroadcastRecording.getState() !== VoiceBroadcastInfoState.Stopped) {
-            createCantStartVoiceMessageBroadcastDialog();
-        } else {
-            this.voiceRecordingButton.current?.onRecordStartEndClick();
-        }
+        this.voiceRecordingButton.current?.onRecordStartEndClick();

        if (this.context.narrow) {
            this.toggleButtonMenu();
@@ -698,17 +677,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
                                        isRichTextEnabled={this.state.isRichTextEnabled}
                                        onComposerModeClick={this.onRichTextToggle}
                                        toggleButtonMenu={this.toggleButtonMenu}
-                                        showVoiceBroadcastButton={this.state.showVoiceBroadcastButton}
-                                        onStartVoiceBroadcastClick={() => {
-                                            setUpVoiceBroadcastPreRecording(
-                                                this.props.room,
-                                                MatrixClientPeg.safeGet(),
-                                                SdkContextClass.instance.voiceBroadcastPlaybacksStore,
-                                                SdkContextClass.instance.voiceBroadcastRecordingsStore,
-                                                SdkContextClass.instance.voiceBroadcastPreRecordingStore,
-                                            );
-                                            this.toggleButtonMenu();
-                                        }}
                                    />
                                )}
                                {showSendButton && (
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -43,8 +43,6 @@ interface IProps {
    showPollsButton: boolean;
    showStickersButton: boolean;
    toggleButtonMenu: () => void;
-    showVoiceBroadcastButton: boolean;
-    onStartVoiceBroadcastClick: () => void;
    isRichTextEnabled: boolean;
    onComposerModeClick: () => void;
 }
@@ -80,7 +78,6 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
            uploadButton(), // props passed via UploadButtonContext
            showStickersButton(props),
            voiceRecordingButton(props, narrow),
-            startVoiceBroadcastButton(props),
            props.showPollsButton ? pollButton(room, props.relation) : null,
            showLocationButton(props, room, matrixClient),
        ];
@@ -100,7 +97,6 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
        moreButtons = [
            showStickersButton(props),
            voiceRecordingButton(props, narrow),
-            startVoiceBroadcastButton(props),
            props.showPollsButton ? pollButton(room, props.relation) : null,
            showLocationButton(props, room, matrixClient),
        ];
@@ -254,18 +250,6 @@ function showStickersButton(props: IProps): ReactElement | null {
    ) : null;
 }

-const startVoiceBroadcastButton: React.FC<IProps> = (props: IProps): ReactElement | null => {
-    return props.showVoiceBroadcastButton ? (
-        <CollapsibleButton
-            key="start_voice_broadcast"
-            className="mx_MessageComposer_button"
-            iconClassName="mx_MessageComposer_voiceBroadcast"
-            onClick={props.onStartVoiceBroadcastClick}
-            title={_t("voice_broadcast|action")}
-        />
-    ) : null;
-};
-
 function voiceRecordingButton(props: IProps, narrow: boolean): ReactElement | null {
    // XXX: recording UI does not work well in narrow mode, so hide for now
    return narrow ? null : (
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -39,7 +39,6 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { RoomGeneralContextMenu } from "../context_menus/RoomGeneralContextMenu";
 import { CallStore, CallStoreEvent } from "../../../stores/CallStore";
 import { SdkContextClass } from "../../../contexts/SDKContext";
-import { useHasRoomLiveVoiceBroadcast } from "../../../voice-broadcast";
 import { RoomTileSubtitle } from "./RoomTileSubtitle";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
@@ -53,10 +52,6 @@ interface Props {
    tag: TagID;
 }

-interface ClassProps extends Props {
-    hasLiveVoiceBroadcast: boolean;
-}
-
 type PartialDOMRect = Pick<DOMRect, "left" | "bottom">;

 interface State {
@@ -77,13 +72,13 @@ export const contextMenuBelow = (elementRect: PartialDOMRect): MenuProps => {
    return { left, top, chevronFace };
 };

-export class RoomTile extends React.PureComponent<ClassProps, State> {
+class RoomTile extends React.PureComponent<Props, State> {
    private dispatcherRef?: string;
    private roomTileRef = createRef<HTMLDivElement>();
    private notificationState: NotificationState;
    private roomProps: RoomEchoChamber;

-    public constructor(props: ClassProps) {
+    public constructor(props: Props) {
        super(props);

        this.state = {
@@ -370,15 +365,10 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
    /**
     * RoomTile has a subtile if one of the following applies:
     * - there is a call
-     * - there is a live voice broadcast
     * - message previews are enabled and there is a previewable message
     */
    private get shouldRenderSubtitle(): boolean {
-        return (
-            !!this.state.call ||
-            this.props.hasLiveVoiceBroadcast ||
-            (this.props.showMessagePreview && !!this.state.messagePreview)
-        );
+        return !!this.state.call || (this.props.showMessagePreview && !!this.state.messagePreview);
    }

    public render(): React.ReactElement {
@@ -409,7 +399,6 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
        const subtitle = this.shouldRenderSubtitle ? (
            <RoomTileSubtitle
                call={this.state.call}
-                hasLiveVoiceBroadcast={this.props.hasLiveVoiceBroadcast}
                messagePreview={this.state.messagePreview}
                roomId={this.props.room.roomId}
                showMessagePreview={this.props.showMessagePreview}
@@ -491,9 +480,4 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
    }
 }

-const RoomTileHOC: React.FC<Props> = (props: Props) => {
-    const hasLiveVoiceBroadcast = useHasRoomLiveVoiceBroadcast(props.room);
-    return <RoomTile {...props} hasLiveVoiceBroadcast={hasLiveVoiceBroadcast} />;
-};
-
-export default RoomTileHOC;
+export default RoomTile;
--- a/src/components/views/rooms/RoomTileSubtitle.tsx
+++ b/src/components/views/rooms/RoomTileSubtitle.tsx
@@ -13,11 +13,9 @@ import { ThreadsIcon } from "@vector-im/compound-design-tokens/assets/web/icons"
 import { MessagePreview } from "../../../stores/room-list/MessagePreviewStore";
 import { Call } from "../../../models/Call";
 import { RoomTileCallSummary } from "./RoomTileCallSummary";
-import { VoiceBroadcastRoomSubtitle } from "../../../voice-broadcast";

 interface Props {
    call: Call | null;
-    hasLiveVoiceBroadcast: boolean;
    messagePreview: MessagePreview | null;
    roomId: string;
    showMessagePreview: boolean;
@@ -25,13 +23,7 @@ interface Props {

 const messagePreviewId = (roomId: string): string => `mx_RoomTile_messagePreview_${roomId}`;

-export const RoomTileSubtitle: React.FC<Props> = ({
-    call,
-    hasLiveVoiceBroadcast,
-    messagePreview,
-    roomId,
-    showMessagePreview,
-}) => {
+export const RoomTileSubtitle: React.FC<Props> = ({ call, messagePreview, roomId, showMessagePreview }) => {
    if (call) {
        return (
            <div className="mx_RoomTile_subtitle">
@@ -40,10 +32,6 @@ export const RoomTileSubtitle: React.FC<Props> = ({
        );
    }

-    if (hasLiveVoiceBroadcast) {
-        return <VoiceBroadcastRoomSubtitle />;
-    }
-
    if (showMessagePreview && messagePreview) {
        const className = classNames("mx_RoomTile_subtitle", {
            "mx_RoomTile_subtitle--thread-reply": messagePreview.isThreadReply,
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -19,7 +19,6 @@ import ErrorDialog from "../../../dialogs/ErrorDialog";
 import PowerSelector from "../../../elements/PowerSelector";
 import SettingsFieldset from "../../SettingsFieldset";
 import SettingsStore from "../../../../../settings/SettingsStore";
-import { VoiceBroadcastInfoEventType } from "../../../../../voice-broadcast";
 import { ElementCall } from "../../../../../models/Call";
 import SdkConfig, { DEFAULTS } from "../../../../../SdkConfig";
 import { AddPrivilegedUsers } from "../../AddPrivilegedUsers";
@@ -62,7 +61,6 @@ const plEventsToShow: Record<string, IEventShowOpts> = {

    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
    "im.vector.modular.widgets": { isState: true, hideForSpace: true },
-    [VoiceBroadcastInfoEventType]: { isState: true, hideForSpace: true },
 };

 // parse a string as an integer; if the input is undefined, or cannot be parsed
@@ -289,7 +287,6 @@ export default class RolesRoomSettingsTab extends React.Component<IProps, RolesR

            // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
            "im.vector.modular.widgets": isSpaceRoom ? null : _td("room_settings|permissions|m.widget"),
-            [VoiceBroadcastInfoEventType]: _td("room_settings|permissions|io.element.voice_broadcast_info"),
        };

        // MSC3401: Native Group VoIP signaling