OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove voice messages labs flag 

Fixes https://github.com/vector-im/element-web/issues/17151
pull/21833/head
Travis Ralston 2021-07-21 18:09:35 -06:00
parent b590b1d263
commit 0e3cc6b8f4
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/messages/MVoiceOrAudioBody.tsx
View File

@ -27,8 +27,7 @@ export default class MVoiceOrAudioBody extends React.PureComponent<IBodyProps> {
// MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245 // MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245
const isVoiceMessage = !!this.props.mxEvent.getContent()['org.matrix.msc2516.voice'] const isVoiceMessage = !!this.props.mxEvent.getContent()['org.matrix.msc2516.voice']
|| !!this.props.mxEvent.getContent()['org.matrix.msc3245.voice']; || !!this.props.mxEvent.getContent()['org.matrix.msc3245.voice'];
const voiceMessagesEnabled = SettingsStore.getValue("feature_voice_messages"); if (isVoiceMessage) {
if (isVoiceMessage && voiceMessagesEnabled) {
return <MVoiceMessageBody {...this.props} />; return <MVoiceMessageBody {...this.props} />;
} else { } else {
return <MAudioBody {...this.props} />; return <MAudioBody {...this.props} />;

10
src/components/views/rooms/MessageComposer.tsx
View File

@ -391,12 +391,10 @@ export default class MessageComposer extends React.Component<IProps, IState> {
controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />); controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />);
} }
if (SettingsStore.getValue("feature_voice_messages")) { controls.push(<VoiceRecordComposerTile
controls.push(<VoiceRecordComposerTile key="controls_voice_record"
key="controls_voice_record" ref={c => this.voiceRecordingButton = c}
ref={c => this.voiceRecordingButton = c} room={this.props.room} />);
room={this.props.room} />);
}
if (!this.state.isComposerEmpty || this.state.haveRecording) { if (!this.state.isComposerEmpty || this.state.haveRecording) {
controls.push( controls.push(

6
src/settings/Settings.tsx
View File

@ -212,12 +212,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_FEATURE, supportedLevels: LEVELS_FEATURE,
default: false, default: false,
}, },
"feature_voice_messages": {
isFeature: true,
displayName: _td("Send and receive voice messages"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_latex_maths": { "feature_latex_maths": {
isFeature: true, isFeature: true,
displayName: _td("Render LaTeX maths in messages"), displayName: _td("Render LaTeX maths in messages"),