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

Fix editing of non-html replies (#8418)

Browse source
This commit is contained in:
Michael Telatynski 2022-04-27 09:43:10 +01:00 • committed by GitHub
parent e718242912
commit 83ab266533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/editor/deserialize.ts
View file

@ -16,12 +16,14 @@ limitations under the License.
*/
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { MsgType } from "matrix-js-sdk/src/@types/event";
import { checkBlockNode } from "../HtmlUtils";
import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks";
import { Part, PartCreator, Type } from "./parts";
import SdkConfig from "../SdkConfig";
import { textToHtmlRainbow } from "../utils/colour";
import { stripPlainReply } from "../utils/Reply";
const LIST_TYPES = ["UL", "OL", "LI"];
@ -288,7 +290,7 @@ export function parsePlainTextMessage(
export function parseEvent(event: MatrixEvent, pc: PartCreator, opts: IParseOptions = { shouldEscape: true }) {
const content = event.getContent();
let parts: Part[];
const isEmote = content.msgtype === "m.emote";
const isEmote = content.msgtype === MsgType.Emote;
let isRainbow = false;
if (content.format === "org.matrix.custom.html") {
@ -297,7 +299,11 @@ export function parseEvent(event: MatrixEvent, pc: PartCreator, opts: IParseOpti
isRainbow = true;
}
} else {
parts = parsePlainTextMessage(content.body || "", pc, opts);
let body = content.body || "";
if (event.replyEventId) {
body = stripPlainReply(body);
}
parts = parsePlainTextMessage(body, pc, opts);
}
if (isEmote && isRainbow) {