Move all polls processing to events-sdk & prep for stable polls

package.json

@@ -89,7 +89,7 @@
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
     "matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
-    "matrix-events-sdk": "^0.0.1-beta.2",
+    "matrix-events-sdk": "^0.0.1-beta.6",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.18",
     "minimist": "^1.2.5",

src/TextForEvent.tsx

@@ -20,7 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { removeDirectionOverrideChars } from 'matrix-js-sdk/src/utils';
 import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
-import { EmoteEvent, NoticeEvent, MessageEvent } from "matrix-events-sdk";
+import { M_EMOTE, M_NOTICE, M_MESSAGE, MessageEvent } from "matrix-events-sdk";
 
 import { _t } from './languageHandler';
 import * as Roles from './Roles';
@@ -342,11 +342,11 @@ function textForMessageEvent(ev: MatrixEvent): () => string | null {
         }
 
         if (SettingsStore.isEnabled("feature_extensible_events")) {
-            const extev = ev.unstableExtensibleEvent;
+            const extev = ev.unstableExtensibleEvent as MessageEvent;
             if (extev) {
-                if (extev instanceof EmoteEvent) {
+                if (extev.isEquivalentTo(M_EMOTE)) {
                     return `* ${senderDisplayName} ${extev.text}`;
-                } else if (extev instanceof NoticeEvent || extev instanceof MessageEvent) {
+                } else if (extev.isEquivalentTo(M_NOTICE) || extev.isEquivalentTo(M_MESSAGE)) {
                     return `${senderDisplayName}: ${extev.text}`;
                 }
             }

src/components/views/context_menus/MessageContextMenu.tsx

@@ -19,8 +19,8 @@ import React, { ReactElement } from 'react';
 import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { Relations } from 'matrix-js-sdk/src/models/relations';
-import { POLL_START_EVENT_TYPE } from "matrix-js-sdk/src/@types/polls";
 import { LOCATION_EVENT_TYPE } from 'matrix-js-sdk/src/@types/location';
+import { M_POLL_START } from "matrix-events-sdk";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
@@ -140,7 +140,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
 
     private canEndPoll(mxEvent: MatrixEvent): boolean {
         return (
-            POLL_START_EVENT_TYPE.matches(mxEvent.getType()) &&
+            M_POLL_START.matches(mxEvent.getType()) &&
             this.state.canRedact &&
             !isPollEnded(mxEvent, MatrixClientPeg.get(), this.props.getRelationsForEvent)
         );

src/components/views/dialogs/EndPollDialog.tsx

@@ -18,8 +18,7 @@ import React from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Relations } from "matrix-js-sdk/src/models/relations";
-import { IPollEndContent, POLL_END_EVENT_TYPE } from "matrix-js-sdk/src/@types/polls";
-import { TEXT_NODE_TYPE } from "matrix-js-sdk/src/@types/extensible_events";
+import { PollEndEvent } from "matrix-events-sdk";
 
 import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
@@ -57,17 +56,10 @@ export default class EndPollDialog extends React.Component<IProps> {
         );
 
         if (endPoll) {
-            const endContent: IPollEndContent = {
-                [POLL_END_EVENT_TYPE.name]: {},
-                "m.relates_to": {
-                    "event_id": this.props.event.getId(),
-                    "rel_type": "m.reference",
-                },
-                [TEXT_NODE_TYPE.name]: message,
-            };
+            const endEvent = PollEndEvent.from(this.props.event.getId(), message).serialize();
 
             this.props.matrixClient.sendEvent(
-                this.props.event.getRoomId(), POLL_END_EVENT_TYPE.name, endContent,
+                this.props.event.getRoomId(), endEvent.type, endEvent.content,
             ).catch((e: any) => {
                 console.error("Failed to submit poll response event:", e);
                 Modal.createTrackedDialog(

src/components/views/elements/PollCreateDialog.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@ limitations under the License.
 
 import React, { ChangeEvent, createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { makePollContent } from "matrix-js-sdk/src/content-helpers";
-import { POLL_KIND_DISCLOSED, POLL_START_EVENT_TYPE } from "matrix-js-sdk/src/@types/polls";
+import { M_POLL_KIND_DISCLOSED, PollStartEvent } from "matrix-events-sdk";
 
 import ScrollableBaseModal, { IScrollableBaseState } from "../dialogs/ScrollableBaseModal";
 import { IDialogProps } from "../dialogs/IDialogProps";
@@ -99,13 +98,12 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
 
     protected submit(): void {
         this.setState({ busy: true, canSubmit: false });
-        this.matrixClient.sendEvent(
-            this.props.room.roomId,
-            POLL_START_EVENT_TYPE.name,
-            makePollContent(
-                this.state.question, this.state.options, POLL_KIND_DISCLOSED.name,
-            ),
-        ).then(
+        const pollEvent = PollStartEvent.from(
+            this.state.question.trim(),
+            this.state.options.map(a => a.trim()).filter(a => !!a),
+            M_POLL_KIND_DISCLOSED,
+        ).serialize();
+        this.matrixClient.sendEvent(this.props.room.roomId, pollEvent.type, pollEvent.content).then(
             () => this.props.onFinished(true),
         ).catch(e => {
             console.error("Failed to post poll:", e);