simplify processPollEvent code

spec/unit/room.spec.ts

@@ -3251,19 +3251,19 @@ describe("Room", function () {
             return event;
         };
 
-        it("adds poll models to room state for a poll start event ", () => {
+        it("adds poll models to room state for a poll start event ", async () => {
             const pollStartEvent = makePollStart("1");
             const events = [pollStartEvent];
 
-            room.processPollEvents(events);
+            await room.processPollEvents(events);
             expect(client.decryptEventIfNeeded).toHaveBeenCalledWith(pollStartEvent);
             const pollInstance = room.polls.get(pollStartEvent.getId()!);
             expect(pollInstance).toBeTruthy();
 
             expect(room.emit).toHaveBeenCalledWith(PollEvent.New, pollInstance);
         });
 
-        it("adds related events to poll models", () => {
+        it("adds related events to poll models", async () => {
             const pollStartEvent = makePollStart("1");
             const pollStartEvent2 = makePollStart("2");
             const events = [pollStartEvent, pollStartEvent2];
@@ -3284,14 +3284,14 @@ describe("Room", function () {
             });
 
             // init poll
-            room.processPollEvents(events);
+            await room.processPollEvents(events);
 
             const poll = room.polls.get(pollStartEvent.getId()!)!;
             const poll2 = room.polls.get(pollStartEvent2.getId()!)!;
             jest.spyOn(poll, "onNewRelation");
             jest.spyOn(poll2, "onNewRelation");
 
-            room.processPollEvents([pollResponseEvent, messageEvent]);
+            await room.processPollEvents([pollResponseEvent, messageEvent]);
 
             // only called for relevant event
             expect(poll.onNewRelation).toHaveBeenCalledTimes(1);

src/models/room.ts

@@ -1888,7 +1888,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
         this.threadsReady = true;
     }
 
-    public processPollEvents(events: MatrixEvent[]): void {
+    public async processPollEvents(events: MatrixEvent[]): Promise<void> {
         const processPollStartEvent = (event: MatrixEvent): void => {
             if (!M_POLL_START.matches(event.getType())) return;
             const poll = new Poll(event, this.client);
@@ -1909,18 +1909,12 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
             processPollRelationEvent(event);
         };
 
-        events.forEach((event: MatrixEvent) => {
-            this.client.decryptEventIfNeeded(event);
-
-            if (event.isBeingDecrypted() || event.isDecryptionFailure()) {
-                // add an event listener for once the event is decrypted.
-                event.once(MatrixEventEvent.Decrypted, async () => {
-                    processPollEvent(event);
-                });
-            } else {
+        for (const event of events) {
+            try {
+                await this.client.decryptEventIfNeeded(event);
                 processPollEvent(event);
-            }
-        });
+            } catch {}
+        }
     }
 
     /**