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

Enable the polls feature (#7581)

Browse source
This commit is contained in:
Andy Balaam 2022-01-20 09:40:47 +00:00 • committed by GitHub
parent a7a7cb56fe
commit c4fc20018d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/messages/MessageEvent.tsx
View file

@ -125,13 +125,9 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
BodyType = UnknownBody;
}
// TODO: this can be done in eventTypes when Polls stabilise
if (M_POLL_START.matches(type)) {
// TODO: this can all disappear when Polls comes out of labs -
// instead, add something like this into this.evTypes:
// [EventType.Poll]: "messages.MPollBody"
if (SettingsStore.getValue("feature_polls")) {
BodyType = sdk.getComponent('messages.MPollBody');
}
BodyType = sdk.getComponent('messages.MPollBody');
}
if (

7
src/components/views/rooms/EventTile.tsx
View file

@ -179,13 +179,6 @@ export function getHandlerTile(ev: MatrixEvent): string {
}
}
if (
M_POLL_START.matches(type) &&
!SettingsStore.getValue("feature_polls")
) {
return undefined;
}
if (ev.isState()) {
if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;
return stateEventTileTypes[type];

23
src/components/views/rooms/MessageComposer.tsx
View file

@ -253,7 +253,6 @@ interface IState {
isMenuOpen: boolean;
showStickers: boolean;
showStickersButton: boolean;
showPollsButton: boolean;
showLocationButton: boolean;
}
@ -285,7 +284,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
isMenuOpen: false,
showStickers: false,
showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"),
showPollsButton: SettingsStore.getValue("feature_polls"),
showLocationButton: SettingsStore.getValue("MessageComposerInput.showLocationButton"),
};
@ -293,7 +291,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
SettingsStore.monitorSetting("MessageComposerInput.showStickersButton", null);
SettingsStore.monitorSetting("MessageComposerInput.showLocationButton", null);
SettingsStore.monitorSetting("feature_polls", null);
SettingsStore.monitorSetting("feature_location_share", null);
}
@ -341,14 +338,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
break;
}
case "feature_polls": {
const showPollsButton = SettingsStore.getValue("feature_polls");
if (this.state.showPollsButton !== showPollsButton) {
this.setState({ showPollsButton });
}
break;
}
case "MessageComposerInput.showLocationButton":
case "feature_location_share": {
const showLocationButton = SettingsStore.getValue(
@ -519,11 +508,13 @@ export default class MessageComposer extends React.Component<IProps, IState> {
let uploadButtonIndex = 0;
const buttons: JSX.Element[] = [];
if (!this.state.haveRecording) {
if (this.state.showPollsButton) {
buttons.push(
<PollButton key="polls" room={this.props.room} narrowMode={this.state.narrowMode} />,
);
}
buttons.push(
<PollButton
key="polls"
room={this.props.room}
narrowMode={this.state.narrowMode}
/>,
);
uploadButtonIndex = buttons.length;
buttons.push(
<UploadButton key="controls_upload" roomId={this.props.room.roomId} relation={this.props.relation} />,