Don't show polls in timeline if polls are disabled (#7332)

matrix-org · Dec 10, 2021 · c21895b · c21895b
1 parent 5554d7f
commit c21895b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -172,6 +172,13 @@ export function getHandlerTile(ev) {
         }
     }
 
+    if (
+        POLL_START_EVENT_TYPE.matches(type) &&
+        !SettingsStore.getValue("feature_polls")
+    ) {
+        return undefined;
+    }
+
     if (ev.isState()) {
         if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;
         return stateEventTileTypes[type];