Tidy

Author: t3chguy

src/events/EventTileFactory.tsx

@@ -153,7 +153,7 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
         return JSONEventFactory;
     }
 
-    const noEventFactoryFactory: (() => Optional<Factory>) = () => SettingsStore.getValue("showHiddenEventsInTimeline")
+    const noEventFactory: Optional<Factory> = SettingsStore.getValue("showHiddenEventsInTimeline")
         ? JSONEventFactory
         : undefined; // just don't render things that we shouldn't render
 
@@ -171,7 +171,7 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
         if (content?.msgtype === MsgType.KeyVerificationRequest) {
             const me = cli.getUserId();
             if (mxEvent.getSender() !== me && content['to'] !== me) {
-                return noEventFactoryFactory(); // not for/from us
+                return noEventFactory; // not for/from us
             } else {
                 // override the factory
                 return VerificationReqFactory;
@@ -182,7 +182,7 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
         // tile once the verification concludes, so filter out the one from the other party.
         const me = cli.getUserId();
         if (mxEvent.getSender() !== me) {
-            return noEventFactoryFactory();
+            return noEventFactory;
         }
     }
 
@@ -192,7 +192,7 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
         // XXX: This is extremely a hack. Possibly these components should have an interface for
         // declining to render?
         if (!MKeyVerificationConclusion.shouldRender(mxEvent, mxEvent.verificationRequest)) {
-            return noEventFactoryFactory();
+            return noEventFactory;
         }
     }
 
@@ -220,18 +220,18 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
         }
 
         if (SINGULAR_STATE_EVENTS.has(evType) && mxEvent.getStateKey() !== '') {
-            return noEventFactoryFactory(); // improper event type to render
+            return noEventFactory; // improper event type to render
         }
 
-        return STATE_EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
+        return STATE_EVENT_TILE_TYPES[evType] ?? noEventFactory;
     }
 
     // Blanket override for all events. The MessageEvent component handles redacted states for us.
     if (mxEvent.isRedacted()) {
         return MessageEventFactory;
     }
 
-    return EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
+    return EVENT_TILE_TYPES[evType] ?? noEventFactory;
 }
 
 /**

src/shouldHideEvent.ts

@@ -15,6 +15,7 @@
  */
 
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 
 import SettingsStore from "./settings/SettingsStore";
 import { IRoomState } from "./components/structures/RoomView";
@@ -29,7 +30,7 @@ interface IDiff {
 
 function memberEventDiff(ev: MatrixEvent): IDiff {
     const diff: IDiff = {
-        isMemberEvent: ev.getType() === 'm.room.member',
+        isMemberEvent: ev.getType() === EventType.RoomMember,
     };
 
     // If is not a Member Event then the other checks do not apply, so bail early.
@@ -67,7 +68,7 @@ export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): bool
     if (ev.isRedacted() && !isEnabled('showRedactions') && !ev.getThread()) return true;
 
     // Hide replacement events since they update the original tile (if enabled)
-    if (ev.isRelation("m.replace")) return true;
+    if (ev.isRelation(RelationType.Replace)) return true;
 
     const eventDiff = memberEventDiff(ev);