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

Only show poll previews when the polls feature is enabled #7331

Merged
merged 2 commits into from
Dec 10, 2021
Merged

Only show poll previews when the polls feature is enabled #7331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5ec702
Only show poll previews when the polls feature is enabled
andybalaam Dec 10, 2021
3d05ffe
Add missing trailing comma
andybalaam Dec 10, 2021
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
24 changes: 18 additions & 6 deletions src/stores/room-list/MessagePreviewStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { StickerEventPreview } from "./previews/StickerEventPreview";
import { ReactionEventPreview } from "./previews/ReactionEventPreview";
import { UPDATE_EVENT } from "../AsyncStore";
import { POLL_START_EVENT_TYPE } from "../../polls/consts";
import SettingsStore from "../../settings/SettingsStore";

// Emitted event for when a room's preview has changed. First argument will the room for which
// the change happened.
Expand All @@ -41,10 +42,6 @@ const PREVIEWS = {
isState: false,
previewer: new MessageEventPreview(),
},
[POLL_START_EVENT_TYPE.name]: {
isState: false,
previewer: new PollStartEventPreview(),
},
'm.call.invite': {
isState: false,
previewer: new CallInviteEventPreview(),
Expand All @@ -67,6 +64,21 @@ const PREVIEWS = {
},
};

function previews(): Object {
// TODO: when polls comes out of labs, add this to PREVIEWS
if (SettingsStore.getValue("feature_polls")) {
return {
[POLL_START_EVENT_TYPE.name]: {
isState: false,
previewer: new PollStartEventPreview(),
},
...PREVIEWS,
};
} else {
return PREVIEWS;
}
}

// The maximum number of events we're willing to look back on to get a preview.
const MAX_EVENTS_BACKWARDS = 50;

Expand Down Expand Up @@ -117,7 +129,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
}

public generatePreviewForEvent(event: MatrixEvent): string {
const previewDef = PREVIEWS[event.getType()];
const previewDef = previews()[event.getType()];
// TODO: Handle case where we don't have
if (!previewDef) return '';
const previewText = previewDef.previewer.getTextFor(event, null, true);
Expand Down Expand Up @@ -149,7 +161,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {

await this.matrixClient.decryptEventIfNeeded(event);

const previewDef = PREVIEWS[event.getType()];
const previewDef = previews()[event.getType()];
if (!previewDef) continue;
if (previewDef.isState && isNullOrUndefined(event.getStateKey())) continue;

Expand Down