Rosetta/desktop
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Приведение chacha_key_plain к hex для транспортировки

Browse Source
This commit is contained in:
RoyceDa
2026-03-28 17:20:03 +02:00
parent 81f5e66c56
commit f5bfa153b6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/components/MessageAttachments/MessageReplyMessages.tsx
View File

@@ -5,6 +5,7 @@ import { ReplyedMessage } from "../ReplyedMessage/ReplyedMessage";
import { IconX } from "@tabler/icons-react"; import { IconX } from "@tabler/icons-react";
import { useSetting } from "@/app/providers/SettingsProvider/useSetting"; import { useSetting } from "@/app/providers/SettingsProvider/useSetting";
import { modals } from "@mantine/modals"; import { modals } from "@mantine/modals";
import { MessageReply } from "@/app/providers/DialogProvider/useReplyMessages";
export function MessageReplyMessages(props: AttachmentProps) { export function MessageReplyMessages(props: AttachmentProps) {
const colors = useRosettaColors(); const colors = useRosettaColors();
@@ -14,7 +15,7 @@ export function MessageReplyMessages(props: AttachmentProps) {
('bgInReplyMessages', ''); ('bgInReplyMessages', '');
const reply = JSON.parse(props.attachment.blob); const reply = JSON.parse(props.attachment.blob);
//console.info("Mreply", reply); console.info("Mreply", reply);
const closeAlert = () => { const closeAlert = () => {
modals.openConfirmModal({ modals.openConfirmModal({
@@ -40,8 +41,8 @@ export function MessageReplyMessages(props: AttachmentProps) {
{reply.length <= 0 && {reply.length <= 0 &&
<Skeleton h={50} w={'100%'}></Skeleton> <Skeleton h={50} w={'100%'}></Skeleton>
} }
{reply.map((msg, index) => ( {reply.map((msg : MessageReply, index) => (
<ReplyedMessage parent={props.parent} chacha_key_plain={msg.chacha_key_plain} key={index} messageReply={msg}></ReplyedMessage> <ReplyedMessage parent={props.parent} chacha_key_plain={Buffer.from(msg.chacha_key_plain, 'hex').toString('utf-8')} key={index} messageReply={msg}></ReplyedMessage>
))} ))}
{showAlertInReplyMessages && <Alert style={{ {showAlertInReplyMessages && <Alert style={{
borderTopLeftRadius: 0, borderTopLeftRadius: 0,

1
app/providers/DialogProvider/useReplyMessages.ts
View File

@@ -52,6 +52,7 @@ export function useReplyMessages() {
*/ */
return; return;
} }
message.chacha_key_plain = Buffer.from(message.chacha_key_plain).toString('hex');
replyMessages.messages.push(message); replyMessages.messages.push(message);
const sortedByTime = replyMessages.messages.sort((a, b) => a.timestamp - b.timestamp); const sortedByTime = replyMessages.messages.sort((a, b) => a.timestamp - b.timestamp);