Wire up drag-drop file uploads for the thread view (#7860)
This commit is contained in:
parent
42e9ea4540
commit
8fccef86d8
30 changed files with 616 additions and 482 deletions
|
@ -20,8 +20,8 @@ import { IPreview } from "./IPreview";
|
|||
import { TagID } from "../models";
|
||||
import { _t, sanitizeForTranslation } from "../../../languageHandler";
|
||||
import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
|
||||
import ReplyChain from "../../../components/views/elements/ReplyChain";
|
||||
import { getHtmlText } from "../../../HtmlUtils";
|
||||
import { stripHTMLReply, stripPlainReply } from "../../../utils/Reply";
|
||||
|
||||
export class MessageEventPreview implements IPreview {
|
||||
public getTextFor(event: MatrixEvent, tagId?: TagID, isThread?: boolean): string {
|
||||
|
@ -44,13 +44,12 @@ export class MessageEventPreview implements IPreview {
|
|||
}
|
||||
|
||||
// XXX: Newer relations have a getRelation() function which is not compatible with replies.
|
||||
const mRelatesTo = event.getWireContent()['m.relates_to'];
|
||||
if (mRelatesTo && mRelatesTo['m.in_reply_to']) {
|
||||
if (event.getWireContent()['m.relates_to']?.['m.in_reply_to']) {
|
||||
// If this is a reply, get the real reply and use that
|
||||
if (hasHtml) {
|
||||
body = (ReplyChain.stripHTMLReply(body) || '').trim();
|
||||
body = (stripHTMLReply(body) || '').trim();
|
||||
} else {
|
||||
body = (ReplyChain.stripPlainReply(body) || '').trim();
|
||||
body = (stripPlainReply(body) || '').trim();
|
||||
}
|
||||
if (!body) return null; // invalid event, no preview
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue