mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-02-07 14:23:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove reply fallbacks & add m.mentions

Browse source 
(WIP) the typing on line 301 and 303 needs fixing but apart from that this is mint
This commit is contained in:
nexy7574 2024-12-17 23:55:12 +00:00
parent 35f0e400ad
commit deba27c24d
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/app/features/room/RoomInput.tsx
View file

@ -10,9 +10,9 @@ import React, {
} from 'react';
import { useAtom, useAtomValue } from 'jotai';
import { isKeyHotkey } from 'is-hotkey';
import { EventType, IContent, MsgType, RelationType, Room } from 'matrix-js-sdk';
import { EventType, IContent, MsgType, RelationType, Room, IMentions } from 'matrix-js-sdk';
import { ReactEditor } from 'slate-react';
import { Transforms, Editor } from 'slate';
import {Transforms, Editor, Descendant} from 'slate';
import {
Box,
Dialog,
@ -109,6 +109,7 @@ import { useElementSizeObserver } from '../../hooks/useElementSizeObserver';
import { ReplyLayout, ThreadIndicator } from '../../components/message';
import { roomToParentsAtom } from '../../state/room/roomToParents';
import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
import {CustomElement, InlineElement, MentionElement, ParagraphElement} from '../../components/editor/slate';
interface RoomInputProps {
editor: Editor;
@ -248,7 +249,6 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
uploadBoardHandlers.current?.handleSend();
const commandName = getBeginCommand(editor);
let plainText = toPlainText(editor.children).trim();
let customHtml = trimCustomHtml(
toMatrixCustomHTML(editor.children, {
@ -289,25 +289,38 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
if (plainText === '') return;
let body = plainText;
let formattedBody = customHtml;
if (replyDraft) {
body = parseReplyBody(replyDraft.userId, trimReplyFromBody(replyDraft.body)) + body;
formattedBody =
parseReplyFormattedBody(
roomId,
replyDraft.userId,
replyDraft.eventId,
replyDraft.formattedBody
? trimReplyFromFormattedBody(replyDraft.formattedBody)
: sanitizeText(replyDraft.body)
) + formattedBody;
}
const body = plainText;
const formattedBody = customHtml;
const content: IContent = {
msgtype: msgType,
body,
};
const userIdMentions = new Set<string>();
let mentionsRoom = false;
editor.children.forEach((node: any): void => {
if (node.type === "paragraph") {
node.children.forEach((child: any): void => {
if (child.type !== undefined && child.type === "mention") {
if(child.name === "@room" && !child.id.startswith("@")) {
// Room mention, not MXID
mentionsRoom = true
} else {
userIdMentions.add(child.id)
}
}
})
}
})
const mMentions: IMentions = {}
if (userIdMentions.size > 0) {
mMentions.user_ids = Array.from(userIdMentions)
}
if(mentionsRoom) {
mMentions.room = true
}
content["m.mentions"] = mMentions
if (replyDraft || !customHtmlEqualsPlainText(formattedBody, body)) {
content.format = 'org.matrix.custom.html';
content.formatted_body = formattedBody;