TTP -> MTP, A lot of other stuff #21

Merged
alois merged 81 commits from dev into main 2026-07-21 11:57:33 +03:00
3 changed files with 39 additions and 20 deletions
Showing only changes of commit de0a153bce - Show all commits

(wip): chat decryption stuff
Some checks failed
/ build-web (push) Successful in 6m57s
/ build-desktop (linux) (push) Failing after 7m41s
/ build-mobile (push) Successful in 17m43s
/ release (push) Has been skipped

Alois 2026-07-06 00:42:54 +02:00

View file

@ -29,6 +29,9 @@ import MessageContextMenu from "./messageContextMenu";
import Media from "./media"; import Media from "./media";
import { useStorage } from "@tensamin/storage/context"; import { useStorage } from "@tensamin/storage/context";
import { useMTP } from "@tensamin/mtp"; import { useMTP } from "@tensamin/mtp";
import { useChat } from "../context";
import { decryptChatText } from "@tensamin/crypto/chatSecret";
import { log, toast } from "@tensamin/shared/log";
function MessageComponent({ function MessageComponent({
grouped, grouped,
@ -125,25 +128,42 @@ function MessageComponent({
}; };
}, [message.MessageState, load, messageStateReadUpdate]); }, [message.MessageState, load, messageStateReadUpdate]);
// Message decryption
const { chatSecret } = useChat();
const [decryptedContent, setDecryptedContent] = useState<string | undefined>(
undefined,
);
useEffect(() => {
if (!chatSecret) return;
decryptChatText(chatSecret, message.Content).then(
setDecryptedContent,
(err) => {
toast("error", "Failed to decrypt message", String(err));
log(1, "chat", "red", err);
},
);
}, [chatSecret, message.Content]);
return ( return (
<div <div
// pt-3 is to get a gap between messages // pt-3 is to get a gap between messages
className={`${grouped ? "" : "pt-3"} w-full flex justify-start transition-opacity duration-150 ${opacityClass}`} className={`${grouped ? "" : "pt-3"} w-full flex justify-start transition-opacity duration-150 ${opacityClass}`}
> >
<MessageContextMenu {user && decryptedContent ? (
content={message.Content} <MessageContextMenu
messageId={message.SendTime} content={message.Content}
> messageId={message.SendTime}
<div
className={cn(
"group hover:bg-muted/50 select-text! relative justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
{
"bg-(--destructive)/15 text-destructive-foreground":
actuallyFailed,
},
)}
> >
{user ? ( <div
className={cn(
"group hover:bg-muted/50 select-text! relative justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
{
"bg-(--destructive)/15 text-destructive-foreground":
actuallyFailed,
},
)}
>
<> <>
{grouped ? ( {grouped ? (
<p className="w-9 text-xs group-hover:visible invisible text-muted-foreground"> <p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
@ -220,11 +240,11 @@ function MessageComponent({
)} )}
</div> </div>
</> </>
) : ( </div>
"Loading" </MessageContextMenu>
)} ) : (
</div> "Loading"
</MessageContextMenu> )}
</div> </div>
); );
} }

View file

@ -16,7 +16,6 @@ import {
deriveChatId, deriveChatId,
deriveChatSecretId, deriveChatSecretId,
decryptChatText, decryptChatText,
encryptChatText,
kemPublicKeyFromPublicKeyBundle, kemPublicKeyFromPublicKeyBundle,
ownKemPublicKeyFromKeyring, ownKemPublicKeyFromKeyring,
randomChatSecret, randomChatSecret,

View file

@ -53,7 +53,7 @@ const authPayload = z.object({
UserId: z.number(), UserId: z.number(),
LastMessage: z LastMessage: z
.object({ .object({
content: z.base64(), Content: z.base64(),
SenderId: z.number(), SenderId: z.number(),
}) })
.optional(), .optional(),