imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace hardcoded strings with MsgType constants (#10604)

Browse source 
* replace hardcoded strings with MsgType constants

* fix import and revert comments

Signed-off-by: Ken Wu kenqiwu@gmail.com

* fix import

Signed-off-by: Ken Wu kenqiwu@gmail.com

---------

Signed-off-by: Ken Wu kenqiwu@gmail.com
This commit is contained in:
kenwuuu 2023-04-17 02:37:29 -07:00 • committed by GitHub
parent 4d859a34e7
commit dc4bb237d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/FilePanel.tsx
View file

@ -154,11 +154,8 @@ class FilePanel extends React.Component<IProps, IState> {
}, },
}); });
const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter); filter.filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter);
filter.filterId = filterId; return room.getOrCreateFilteredTimelineSet(filter);
const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
return timelineSet;
} }
private onPaginationRequest = ( private onPaginationRequest = (

5
src/components/views/elements/EventTilePreview.tsx
View file

@ -18,6 +18,7 @@ import React from "react";
import classnames from "classnames"; import classnames from "classnames";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { MsgType } from "matrix-js-sdk/src/@types/event";
import * as Avatar from "../../../Avatar"; import * as Avatar from "../../../Avatar";
import EventTile from "../rooms/EventTile"; import EventTile from "../rooms/EventTile";
@ -78,12 +79,12 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
sender: this.props.userId, sender: this.props.userId,
content: { content: {
"m.new_content": { "m.new_content": {
msgtype: "m.text", msgtype: MsgType.Text,
body: message, body: message,
displayname: this.props.displayName, displayname: this.props.displayName,
avatar_url: this.props.avatarUrl, avatar_url: this.props.avatarUrl,
}, },
"msgtype": "m.text", "msgtype": MsgType.Text,
"body": message, "body": message,
"displayname": this.props.displayName, "displayname": this.props.displayName,
"avatar_url": this.props.avatarUrl, "avatar_url": this.props.avatarUrl,

3
src/components/views/messages/EditHistoryMessage.tsx
View file

@ -17,6 +17,7 @@ limitations under the License.
import React, { createRef } from "react"; import React, { createRef } from "react";
import { EventStatus, IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; import { EventStatus, IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
import classNames from "classnames"; import classNames from "classnames";
import { MsgType } from "matrix-js-sdk/src/@types/event";
import * as HtmlUtils from "../../../HtmlUtils"; import * as HtmlUtils from "../../../HtmlUtils";
import { editBodyDiffToHtml } from "../../../utils/MessageDiffUtils"; import { editBodyDiffToHtml } from "../../../utils/MessageDiffUtils";
@ -166,7 +167,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
returnString: false, returnString: false,
}); });
} }
if (mxEvent.getContent().msgtype === "m.emote") { if (mxEvent.getContent().msgtype === MsgType.Emote) {
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender(); const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
contentContainer = ( contentContainer = (
<div className="mx_EventTile_content" ref={this.content}> <div className="mx_EventTile_content" ref={this.content}>

4
src/components/views/rooms/SendMessageComposer.tsx
View file

@ -18,7 +18,7 @@ import React, { ClipboardEvent, createRef, KeyboardEvent } from "react";
import EMOJI_REGEX from "emojibase-regex"; import EMOJI_REGEX from "emojibase-regex";
import { IContent, MatrixEvent, IEventRelation, IMentions } from "matrix-js-sdk/src/models/event"; import { IContent, MatrixEvent, IEventRelation, IMentions } from "matrix-js-sdk/src/models/event";
import { DebouncedFunc, throttle } from "lodash"; import { DebouncedFunc, throttle } from "lodash";
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
@ -187,7 +187,7 @@ export function createMessageContent(
const body = textSerialize(model); const body = textSerialize(model);
const content: IContent = { const content: IContent = {
msgtype: isEmote ? "m.emote" : "m.text", msgtype: isEmote ? MsgType.Emote : MsgType.Text,
body: body, body: body,
}; };
const formattedBody = htmlSerializeIfNeeded(model, { const formattedBody = htmlSerializeIfNeeded(model, {

2
src/utils/exportUtils/HtmlExport.tsx
View file

@ -344,7 +344,7 @@ export default class HTMLExporter extends Exporter {
protected createModifiedEvent(text: string, mxEv: MatrixEvent, italic = true): MatrixEvent { protected createModifiedEvent(text: string, mxEv: MatrixEvent, italic = true): MatrixEvent {
const modifiedContent = { const modifiedContent = {
msgtype: "m.text", msgtype: MsgType.Text,
body: `${text}`, body: `${text}`,
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: `${text}`, formatted_body: `${text}`,