(wip): migrate ttp to mtp -> snake case to pascal case
This commit is contained in:
parent
ee5955fc75
commit
7f75a36d73
23 changed files with 214 additions and 248 deletions
|
|
@ -61,15 +61,15 @@ export default function InviteButton({
|
|||
>
|
||||
{contacts.map((contact) => (
|
||||
<Wrapper
|
||||
key={contact.user_id}
|
||||
userId={contact.user_id}
|
||||
key={contact.UserId}
|
||||
userId={contact.UserId}
|
||||
loading={<div>Loading...</div>}
|
||||
component={(user) => (
|
||||
<Button
|
||||
className="w-full justify-start"
|
||||
variant="ghost"
|
||||
onClick={() => {
|
||||
void sendCallInvite(contact.user_id).catch((err) => {
|
||||
void sendCallInvite(contact.UserId).catch((err) => {
|
||||
toast(
|
||||
"error",
|
||||
"Failed to send call invite. Check console for details.",
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ function Overlay({
|
|||
user: User;
|
||||
participant: Participant;
|
||||
}) {
|
||||
const isAdmin = getRoomMetadata()?.admins.includes(user.user_id) === true;
|
||||
const isAdmin = getRoomMetadata()?.admins.includes(user.UserId) === true;
|
||||
const isDeafened = participant.attributes["deafened"] === "true";
|
||||
|
||||
return (
|
||||
|
|
@ -171,7 +171,7 @@ export default function Base({
|
|||
const [avatarBackgroundColor, setAvatarBackgroundColor] = useState<
|
||||
string | undefined
|
||||
>(undefined);
|
||||
const isSpeaking = useIsSpeaking(user?.user_id ?? -1);
|
||||
const isSpeaking = useIsSpeaking(user?.UserId ?? -1);
|
||||
const screenSharePublication = getTrackPublicationBySource(
|
||||
participant,
|
||||
Track.Source.ScreenShare,
|
||||
|
|
@ -242,12 +242,12 @@ export default function Base({
|
|||
|
||||
const onClick = () => {
|
||||
if (view === "grid") {
|
||||
focusParticipant(user.user_id, type);
|
||||
focusParticipant(user.UserId, type);
|
||||
} else {
|
||||
if (user.user_id === focusedParticipantId) {
|
||||
if (user.UserId === focusedParticipantId) {
|
||||
setCallView("grid");
|
||||
} else {
|
||||
focusParticipant(user.user_id, type);
|
||||
focusParticipant(user.UserId, type);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -256,7 +256,7 @@ export default function Base({
|
|||
screenSharePublication?.isSubscribed && screenSharePublication.track;
|
||||
|
||||
const isFocusedInFocusedView =
|
||||
view === "focused" && user.user_id === focusedParticipantId;
|
||||
view === "focused" && user.UserId === focusedParticipantId;
|
||||
|
||||
return (
|
||||
<UIContextMenu>
|
||||
|
|
@ -276,7 +276,7 @@ export default function Base({
|
|||
variant="outline"
|
||||
onClick={(event) => {
|
||||
if (isFocusedInFocusedView) event.stopPropagation();
|
||||
startWatchingStream(user.user_id);
|
||||
startWatchingStream(user.UserId);
|
||||
}}
|
||||
>
|
||||
Watch Stream
|
||||
|
|
@ -286,7 +286,7 @@ export default function Base({
|
|||
variant="outline"
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
startWatchingStream(user.user_id);
|
||||
startWatchingStream(user.UserId);
|
||||
}}
|
||||
>
|
||||
<Plus className="w-8 h-8" />
|
||||
|
|
@ -295,8 +295,7 @@ export default function Base({
|
|||
</div>
|
||||
)}
|
||||
{view === "grid" ||
|
||||
(view === "focused" &&
|
||||
user.user_id !== focusedParticipantId) ? (
|
||||
(view === "focused" && user.UserId !== focusedParticipantId) ? (
|
||||
<Overlay type={type} user={user} participant={participant} />
|
||||
) : null}
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ export default function ContextMenu({
|
|||
|
||||
return (
|
||||
<ContextMenuContent className="p-1">
|
||||
{watchedStreamParticipantIds.includes(user.user_id) &&
|
||||
user.user_id !== ownId ? (
|
||||
{watchedStreamParticipantIds.includes(user.UserId) &&
|
||||
user.UserId !== ownId ? (
|
||||
<ContextMenuItem variant="destructive">Stop Watching</ContextMenuItem>
|
||||
) : null}
|
||||
<ContextMenuItem>Profile</ContextMenuItem>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ export default function TopBar() {
|
|||
<div className="w-full flex justify-between h-12">
|
||||
<div className="flex gap-1 m-3 ml-7">
|
||||
{users.map((user) => (
|
||||
<div key={user.user_id} className="-ml-4">
|
||||
<div key={user.UserId} className="-ml-4">
|
||||
<Tooltip>
|
||||
<TooltipTrigger
|
||||
render={
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ type GetSharedSecretFn = (
|
|||
type DecryptTextFn = (sharedSecret: string, text: string) => Promise<string>;
|
||||
type EncryptTextFn = (sharedSecret: string, text: string) => Promise<string>;
|
||||
type LoadFn = (key: string) => Promise<unknown>;
|
||||
type GetUserFn = (userId: number) => Promise<{ public_key: string }>;
|
||||
type GetUserFn = (userId: number) => Promise<{ PublicKey: string }>;
|
||||
type RemoteVideoTrackSelector = Track.Kind | Track.Source;
|
||||
|
||||
type Runtime = {
|
||||
|
|
@ -605,15 +605,15 @@ export async function openCallPage(callId: string) {
|
|||
export async function getCallToken(callId: string): Promise<string> {
|
||||
const response = await requireRuntime(useCall.getState().runtime)
|
||||
.send("call_token", {
|
||||
call_id: callId,
|
||||
CallId: callId,
|
||||
})
|
||||
.catch((err) => {
|
||||
log(1, "call", "red", "Failed to get call secret", err);
|
||||
throw err;
|
||||
});
|
||||
|
||||
const data = response.data as { call_token: string };
|
||||
return data.call_token;
|
||||
const data = response.data as { CallToken: string };
|
||||
return data.CallToken;
|
||||
}
|
||||
|
||||
// Encrypt the active call secret for a recipient and send the call invite.
|
||||
|
|
@ -629,10 +629,10 @@ export async function sendCallInvite(userId: number) {
|
|||
const privateKey = await runtime.load("private_key");
|
||||
const ownPublicKey = await runtime
|
||||
.getUser(ownUserId)
|
||||
.then((data) => data.public_key);
|
||||
.then((data) => data.PublicKey);
|
||||
const remotePublicKey = await runtime
|
||||
.getUser(userId)
|
||||
.then((data) => data.public_key);
|
||||
.then((data) => data.PublicKey);
|
||||
const sharedSecret = await runtime.getSharedSecret(
|
||||
privateKey,
|
||||
ownPublicKey,
|
||||
|
|
@ -644,9 +644,9 @@ export async function sendCallInvite(userId: number) {
|
|||
);
|
||||
|
||||
await runtime.send("call_invite", {
|
||||
receiver_id: userId,
|
||||
call_id: callId,
|
||||
call_secret: encryptedCallSecret,
|
||||
ReceiverId: userId,
|
||||
CallId: callId,
|
||||
CallSecret: encryptedCallSecret,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -900,8 +900,8 @@ export async function joinCall(
|
|||
await runtime.load("private_key"),
|
||||
await runtime
|
||||
.getUser((await runtime.load("user_id")) as number)
|
||||
.then((res) => res.public_key),
|
||||
await runtime.getUser(userId).then((res) => res.public_key),
|
||||
.then((res) => res.PublicKey),
|
||||
await runtime.getUser(userId).then((res) => res.PublicKey),
|
||||
);
|
||||
const decryptedSecret = await runtime.decryptText(
|
||||
sharedSecret,
|
||||
|
|
@ -1150,9 +1150,9 @@ export function useInitializeCall() {
|
|||
}
|
||||
|
||||
insertCall({
|
||||
call_id: invite.callId,
|
||||
call_secret: invite.callSecret,
|
||||
call_members: [invite.senderId],
|
||||
CallId: invite.callId,
|
||||
CallSecret: invite.callSecret,
|
||||
CallMembers: [invite.senderId],
|
||||
});
|
||||
|
||||
if (accepted) {
|
||||
|
|
@ -1180,13 +1180,13 @@ export function useInitializeCall() {
|
|||
subscribePush(async (message) => {
|
||||
if (message.type !== "call_invite") return;
|
||||
|
||||
const { call_id, call_secret, sender_id } = message.data as {
|
||||
call_id: string;
|
||||
call_secret: string;
|
||||
sender_id: number;
|
||||
const { CallId, CallSecret, SenderId } = message.data as {
|
||||
CallId: string;
|
||||
CallSecret: string;
|
||||
SenderId: number;
|
||||
};
|
||||
|
||||
showCallingScreen(call_id, call_secret, sender_id);
|
||||
showCallingScreen(CallId, CallSecret, SenderId);
|
||||
});
|
||||
}, [subscribePush, showCallingScreen]);
|
||||
|
||||
|
|
@ -1500,7 +1500,7 @@ export function useInitializeCall() {
|
|||
return;
|
||||
}
|
||||
|
||||
send("call_data", { call_id: callId })
|
||||
send("call_data", { CallId: callId })
|
||||
.then((data) => {
|
||||
setCurrentCallData({
|
||||
...(data.data as z.infer<typeof mtp.call_data.response>),
|
||||
|
|
@ -1513,7 +1513,7 @@ export function useInitializeCall() {
|
|||
error: err,
|
||||
});
|
||||
setCurrentCallData({
|
||||
user_ids: [],
|
||||
UserIds: [],
|
||||
exists: false,
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export default function Preview() {
|
|||
};
|
||||
}
|
||||
|
||||
void Promise.all(currentCallData.user_ids.map((id) => get(id)))
|
||||
void Promise.all(currentCallData.UserIds.map((id) => get(id)))
|
||||
.then((users) => {
|
||||
if (!active) {
|
||||
return;
|
||||
|
|
@ -44,7 +44,7 @@ export default function Preview() {
|
|||
<div className="flex flex-col gap-2">
|
||||
{data.map((user) => {
|
||||
return (
|
||||
<p key={user.user_id} className="text-2xl">
|
||||
<p key={user.UserId} className="text-2xl">
|
||||
User: {user.display}
|
||||
</p>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@ import type { RawMessages } from "../values";
|
|||
* @param send Parameter send.
|
||||
* @param amount Parameter amount.
|
||||
* @param offset Parameter offset.
|
||||
* @param user_id Parameter user_id.
|
||||
* @param UserId Parameter UserId.
|
||||
* @returns Promise<RawMessages>.
|
||||
*/
|
||||
export async function getMessages(
|
||||
send: BoundSendFn,
|
||||
amount: number,
|
||||
offset: number,
|
||||
user_id: number,
|
||||
UserId: number,
|
||||
): Promise<RawMessages> {
|
||||
const messages = await send("messages_get", {
|
||||
amount: amount,
|
||||
offset: offset,
|
||||
user_id: user_id,
|
||||
UserId,
|
||||
});
|
||||
|
||||
if (messages.type.startsWith("error")) {
|
||||
|
|
|
|||
|
|
@ -73,11 +73,11 @@ export default function InputComponent({
|
|||
|
||||
const reference = addLiveMessage({
|
||||
height: 0,
|
||||
not_encrypted: true,
|
||||
send_time: time,
|
||||
NotEncrypted: true,
|
||||
SendTime: time,
|
||||
content: currentValue,
|
||||
sent_by_self: true,
|
||||
message_state: "awaiting",
|
||||
SentBySelf: true,
|
||||
MessageState: "awaiting",
|
||||
});
|
||||
|
||||
log(3, "chat", "purple", "Live message added, encrypting...");
|
||||
|
|
@ -97,14 +97,14 @@ export default function InputComponent({
|
|||
send("message_send", {
|
||||
height: 0,
|
||||
content: encryptedContext,
|
||||
receiver_id: userId,
|
||||
send_time: time,
|
||||
ReceiverId: userId,
|
||||
SendTime: time,
|
||||
}).catch((e) => {
|
||||
log(0, "Chat", "red", "Failed to send message", e, {
|
||||
content: currentValue,
|
||||
encryptedContext,
|
||||
receiver_id: userId,
|
||||
send_time: time,
|
||||
ReceiverId: userId,
|
||||
SendTime: time,
|
||||
});
|
||||
reference.setFailed(true);
|
||||
toast("error", "Failed to send message");
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ function MessageComponent({
|
|||
};
|
||||
user: User | null;
|
||||
}) {
|
||||
const actuallyFailed = message.failed && message.message_state === "awaiting";
|
||||
const actuallyFailed = message.failed && message.MessageState === "awaiting";
|
||||
|
||||
// Fade-in
|
||||
const [hasFadedIn, setHasFadedIn] = useState(false);
|
||||
const opacityClass = !hasFadedIn
|
||||
? "opacity-0"
|
||||
: actuallyFailed || message.message_state === "awaiting"
|
||||
: actuallyFailed || message.MessageState === "awaiting"
|
||||
? "opacity-50"
|
||||
: "opacity-100";
|
||||
useEffect(() => {
|
||||
|
|
@ -80,21 +80,21 @@ function MessageComponent({
|
|||
const readConfirmations = await load("settings.read_confirmations");
|
||||
|
||||
if (readConfirmations) {
|
||||
if (!user?.user_id) return;
|
||||
if (!user?.UserId) return;
|
||||
|
||||
await send("message_state", {
|
||||
chat_partner_id: user?.user_id,
|
||||
send_time: message.send_time,
|
||||
message_state: "read",
|
||||
ChatPartnerId: user?.UserId,
|
||||
SendTime: message.SendTime,
|
||||
MessageState: "read",
|
||||
});
|
||||
} else {
|
||||
await send("message_state", {
|
||||
chat_partner_id: user?.user_id,
|
||||
send_time: message.send_time,
|
||||
message_state: "received",
|
||||
ChatPartnerId: user?.UserId,
|
||||
SendTime: message.SendTime,
|
||||
MessageState: "received",
|
||||
});
|
||||
}
|
||||
}, [load, message.send_time, user?.user_id, send]);
|
||||
}, [load, message.SendTime, user?.UserId, send]);
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ function MessageComponent({
|
|||
const receiveConfirmations = await load("settings.receive_confirmations");
|
||||
if (cancelled) return;
|
||||
|
||||
switch (message.message_state) {
|
||||
switch (message.MessageState) {
|
||||
case "sent":
|
||||
if (receiveConfirmations) {
|
||||
messageStateReadUpdate();
|
||||
|
|
@ -123,7 +123,7 @@ function MessageComponent({
|
|||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [message.message_state, load, messageStateReadUpdate]);
|
||||
}, [message.MessageState, load, messageStateReadUpdate]);
|
||||
|
||||
return (
|
||||
<div
|
||||
|
|
@ -132,7 +132,7 @@ function MessageComponent({
|
|||
>
|
||||
<MessageContextMenu
|
||||
content={message.content}
|
||||
messageId={message.send_time}
|
||||
messageId={message.SendTime}
|
||||
>
|
||||
<div
|
||||
className={cn(
|
||||
|
|
@ -147,7 +147,7 @@ function MessageComponent({
|
|||
<>
|
||||
{grouped ? (
|
||||
<p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
|
||||
{new Date(message.send_time).toLocaleString([], {
|
||||
{new Date(message.SendTime).toLocaleString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}
|
||||
|
|
@ -160,7 +160,7 @@ function MessageComponent({
|
|||
</AvatarFallback>
|
||||
</Avatar>
|
||||
)}
|
||||
{message.failed && message.message_state === "awaiting" && (
|
||||
{message.failed && message.MessageState === "awaiting" && (
|
||||
<Tooltip>
|
||||
<TooltipContent>
|
||||
<p>Failed to send message</p>
|
||||
|
|
@ -192,22 +192,22 @@ function MessageComponent({
|
|||
<div className="flex items-center gap-1">
|
||||
<p className="font-medium">{user.display}</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{new Date(message.send_time).toLocaleString([], {
|
||||
{new Date(message.SendTime).toLocaleString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}
|
||||
</p>
|
||||
<div>
|
||||
{message.message_state === "read" ? (
|
||||
{message.MessageState === "read" ? (
|
||||
<Check
|
||||
size={12}
|
||||
color="var(--primary-foreground-alt)"
|
||||
/>
|
||||
) : message.message_state === "received" ? (
|
||||
) : message.MessageState === "received" ? (
|
||||
<Check size={12} color="var(--muted-foreground)" />
|
||||
) : message.message_state === "sent" ? (
|
||||
) : message.MessageState === "sent" ? (
|
||||
<RefreshCw size={12} color="var(--muted-foreground)" />
|
||||
) : message.message_state === "sending" ? (
|
||||
) : message.MessageState === "sending" ? (
|
||||
<Ellipse size={12} color="var(--muted-foreground)" />
|
||||
) : null}
|
||||
</div>
|
||||
|
|
@ -231,11 +231,11 @@ function MessageComponent({
|
|||
|
||||
export default React.memo(MessageComponent, (prev, next) => {
|
||||
return (
|
||||
prev.message.send_time === next.message.send_time &&
|
||||
prev.message.SendTime === next.message.SendTime &&
|
||||
prev.message.content === next.message.content &&
|
||||
prev.message.height === next.message.height &&
|
||||
prev.message.sent_by_self === next.message.sent_by_self &&
|
||||
prev.message.message_state === next.message.message_state &&
|
||||
prev.message.SentBySelf === next.message.SentBySelf &&
|
||||
prev.message.MessageState === next.message.MessageState &&
|
||||
prev.message.failed === next.message.failed &&
|
||||
prev.grouped === next.grouped &&
|
||||
prev.user === next.user
|
||||
|
|
|
|||
|
|
@ -24,23 +24,23 @@ export const context = createContext<contextType | undefined>(undefined);
|
|||
const queryClient = new QueryClient();
|
||||
|
||||
function updateMessageStateBySendTime<
|
||||
T extends { send_time: number; message_state: RawMessage["message_state"] },
|
||||
T extends { SendTime: number; MessageState: RawMessage["MessageState"] },
|
||||
>(
|
||||
messages: T[],
|
||||
sendTime: number,
|
||||
messageState: RawMessage["message_state"],
|
||||
messageState: RawMessage["MessageState"],
|
||||
): { next: T[]; updated: boolean } {
|
||||
let updated = false;
|
||||
|
||||
const next = messages.map((item) => {
|
||||
if (item.send_time !== sendTime || item.message_state === messageState) {
|
||||
if (item.SendTime !== sendTime || item.MessageState === messageState) {
|
||||
return item;
|
||||
}
|
||||
|
||||
updated = true;
|
||||
return {
|
||||
...item,
|
||||
message_state: messageState,
|
||||
MessageState: messageState,
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -105,8 +105,8 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
const ownData = await get(ownId);
|
||||
const sharedSecret = await getSharedSecret(
|
||||
privateKey,
|
||||
ownData.public_key,
|
||||
recipientData.public_key,
|
||||
ownData.PublicKey,
|
||||
recipientData.PublicKey,
|
||||
);
|
||||
|
||||
if (active) {
|
||||
|
|
@ -135,7 +135,7 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
const messages = await send("messages_get", {
|
||||
amount,
|
||||
offset,
|
||||
user_id: userIdValue,
|
||||
UserId: userIdValue,
|
||||
});
|
||||
|
||||
if (messages.type.startsWith("error")) {
|
||||
|
|
@ -143,14 +143,14 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
}
|
||||
|
||||
const rawMessages = messages.data.messages;
|
||||
const sorted = [...rawMessages].sort((a, b) => a.send_time - b.send_time);
|
||||
const sorted = [...rawMessages].sort((a, b) => a.SendTime - b.SendTime);
|
||||
|
||||
if (sorted.length > 0) {
|
||||
const fetchedSendTimes = new Set(sorted.map((item) => item.send_time));
|
||||
const fetchedSendTimes = new Set(sorted.map((item) => item.SendTime));
|
||||
|
||||
setLiveMessagesState((prev) => {
|
||||
const filtered = prev.filter(
|
||||
(liveMessage) => !fetchedSendTimes.has(liveMessage.send_time),
|
||||
(liveMessage) => !fetchedSendTimes.has(liveMessage.SendTime),
|
||||
);
|
||||
|
||||
return filtered.length === prev.length ? prev : filtered;
|
||||
|
|
@ -179,7 +179,7 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
globalThis.crypto?.randomUUID?.() ??
|
||||
`${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
||||
|
||||
if (!message.sent_by_self) {
|
||||
if (!message.SentBySelf) {
|
||||
moveUserIdToTop(userIdValue);
|
||||
}
|
||||
|
||||
|
|
@ -219,20 +219,20 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
}
|
||||
|
||||
const rawData = message.data as {
|
||||
chat_partner_id: unknown;
|
||||
send_time: unknown;
|
||||
message_state: RawMessage["message_state"];
|
||||
ChatPartnerId: unknown;
|
||||
SendTime: unknown;
|
||||
MessageState: RawMessage["MessageState"];
|
||||
};
|
||||
|
||||
const nextState = {
|
||||
chat_partner_id: Number(rawData.chat_partner_id),
|
||||
send_time: Number(rawData.send_time),
|
||||
message_state: rawData.message_state,
|
||||
ChatPartnerId: Number(rawData.ChatPartnerId),
|
||||
SendTime: Number(rawData.SendTime),
|
||||
MessageState: rawData.MessageState,
|
||||
};
|
||||
|
||||
if (
|
||||
!Number.isFinite(nextState.chat_partner_id) ||
|
||||
!Number.isFinite(nextState.send_time)
|
||||
!Number.isFinite(nextState.ChatPartnerId) ||
|
||||
!Number.isFinite(nextState.SendTime)
|
||||
) {
|
||||
log(
|
||||
3,
|
||||
|
|
@ -243,7 +243,7 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (nextState.chat_partner_id !== userIdValue) {
|
||||
if (nextState.ChatPartnerId !== userIdValue) {
|
||||
log(
|
||||
3,
|
||||
"chat",
|
||||
|
|
@ -251,7 +251,7 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
"Cancel message state update due to user ID mismatch",
|
||||
{
|
||||
expected: userIdValue,
|
||||
received: nextState.chat_partner_id,
|
||||
received: nextState.ChatPartnerId,
|
||||
},
|
||||
);
|
||||
return;
|
||||
|
|
@ -260,8 +260,8 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
setLiveMessagesState((prev) => {
|
||||
const { next, updated } = updateMessageStateBySendTime(
|
||||
prev,
|
||||
nextState.send_time,
|
||||
nextState.message_state,
|
||||
nextState.SendTime,
|
||||
nextState.MessageState,
|
||||
);
|
||||
return updated ? next : prev;
|
||||
});
|
||||
|
|
@ -283,8 +283,8 @@ export default function Provider(props: { children: ReactNode }) {
|
|||
const pages = current.pages.map((page) => {
|
||||
const nextPage = updateMessageStateBySendTime(
|
||||
page,
|
||||
nextState.send_time,
|
||||
nextState.message_state,
|
||||
nextState.SendTime,
|
||||
nextState.MessageState,
|
||||
);
|
||||
|
||||
if (nextPage.updated) {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ function shouldFetchPreviousPage({
|
|||
}
|
||||
|
||||
function getMessageRenderKey(message: RawMessage | LiveMessage) {
|
||||
return "localId" in message ? message.localId : String(message.send_time);
|
||||
return "localId" in message ? message.localId : String(message.SendTime);
|
||||
}
|
||||
|
||||
function buildMessageChunks(
|
||||
|
|
@ -184,11 +184,11 @@ export default function Screen() {
|
|||
const dedupedMessages: RawMessage[] = [];
|
||||
|
||||
for (const message of [...pages].reverse().flat()) {
|
||||
if (seenSendTimes.has(message.send_time)) {
|
||||
if (seenSendTimes.has(message.SendTime)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
seenSendTimes.add(message.send_time);
|
||||
seenSendTimes.add(message.SendTime);
|
||||
dedupedMessages.push(message);
|
||||
}
|
||||
|
||||
|
|
@ -199,11 +199,11 @@ export default function Screen() {
|
|||
|
||||
const liveWithoutDuplicates = React.useMemo(() => {
|
||||
const historicalSendTimes = new Set(
|
||||
historicalMessages.map((message) => message.send_time),
|
||||
historicalMessages.map((message) => message.SendTime),
|
||||
);
|
||||
|
||||
return liveMessagesSnapshot.filter(
|
||||
(message) => !historicalSendTimes.has(message.send_time),
|
||||
(message) => !historicalSendTimes.has(message.SendTime),
|
||||
);
|
||||
}, [historicalMessages, liveMessagesSnapshot]);
|
||||
|
||||
|
|
@ -559,9 +559,9 @@ export default function Screen() {
|
|||
const lastMessage = messages[messageIndex - 1];
|
||||
const isGrouped =
|
||||
lastMessage &&
|
||||
lastMessage.sent_by_self === message.sent_by_self &&
|
||||
Math.round(lastMessage.send_time / 10000) ===
|
||||
Math.round(message.send_time / 10000);
|
||||
lastMessage.SentBySelf === message.SentBySelf &&
|
||||
Math.round(lastMessage.SendTime / 10000) ===
|
||||
Math.round(message.SendTime / 10000);
|
||||
|
||||
return (
|
||||
<Message
|
||||
|
|
@ -569,7 +569,7 @@ export default function Screen() {
|
|||
grouped={isGrouped}
|
||||
message={message}
|
||||
user={
|
||||
message.sent_by_self
|
||||
message.SentBySelf
|
||||
? (messageUsers.own ?? null)
|
||||
: (messageUsers.peer ?? null)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,47 +116,15 @@ function getProtocolErrorDetails(error: unknown) {
|
|||
};
|
||||
}
|
||||
|
||||
function toPascalCase(value: string) {
|
||||
return value
|
||||
.split("_")
|
||||
.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
|
||||
.join("");
|
||||
}
|
||||
|
||||
function toSnakeCase(value: string) {
|
||||
return value
|
||||
.replace(/([a-z0-9])([A-Z])/g, "$1_$2")
|
||||
.replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
|
||||
.toLowerCase();
|
||||
}
|
||||
|
||||
function mapDataKeys(value: unknown, mapKey: (key: string) => string): unknown {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((item) => mapDataKeys(item, mapKey));
|
||||
}
|
||||
|
||||
if (typeof value !== "object" || value === null) {
|
||||
return value;
|
||||
}
|
||||
|
||||
return Object.fromEntries(
|
||||
Object.entries(value).map(([key, entry]) => [
|
||||
mapKey(key),
|
||||
mapDataKeys(entry, mapKey),
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
// Zod schema validation
|
||||
function validateResponse<T extends keyof Schemas & string>(
|
||||
type: T,
|
||||
message: { id?: number; type: string; data: unknown },
|
||||
): ProtocolMessage<T> {
|
||||
const appType = APP_TYPES[message.type] ?? message.type;
|
||||
const data = mapDataKeys(message.data, toSnakeCase);
|
||||
|
||||
if (appType.startsWith("error")) {
|
||||
return { ...message, type: appType, data } as ProtocolMessage<T>;
|
||||
return { ...message, type: appType } as ProtocolMessage<T>;
|
||||
}
|
||||
|
||||
const schema = schemas[type]?.response;
|
||||
|
|
@ -164,7 +132,7 @@ function validateResponse<T extends keyof Schemas & string>(
|
|||
return message as ProtocolMessage<T>;
|
||||
}
|
||||
|
||||
const parsed = schema.safeParse(data);
|
||||
const parsed = schema.safeParse(message.data);
|
||||
if (!parsed.success) {
|
||||
throw new Error(
|
||||
`Response validation failed for ${type}: ${parsed.error.message}`,
|
||||
|
|
@ -223,7 +191,7 @@ export function Provider(props: {
|
|||
|
||||
const message = await client.request(
|
||||
WIRE_TYPES[type],
|
||||
mapDataKeys(data ?? {}, toPascalCase) as Record<string, unknown>,
|
||||
(data ?? {}) as Record<string, unknown>,
|
||||
options,
|
||||
);
|
||||
return validateResponse(type, message);
|
||||
|
|
@ -282,10 +250,10 @@ export function Provider(props: {
|
|||
const interval = setInterval(async () => {
|
||||
try {
|
||||
const originalNow = Date.now();
|
||||
const data = await send("ping", { last_ping: originalNow });
|
||||
const data = await send("ping", { LastPing: originalNow });
|
||||
setOwnPing(Date.now() - originalNow);
|
||||
|
||||
const remotePing = data.data.ping_iota;
|
||||
const remotePing = data.data.PingIota;
|
||||
if (typeof remotePing === "number") {
|
||||
setIotaPing(remotePing);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,41 +35,41 @@ export default function Provider(props: { children: React.ReactNode }) {
|
|||
useEffect(() => {
|
||||
return subscribePush(async (ttpMessage) => {
|
||||
if (ttpMessage.type === "message_live") {
|
||||
const { message, sender_id } = ttpMessage.data as {
|
||||
const { message, SenderId } = ttpMessage.data as {
|
||||
message: z.infer<typeof messageSchema>;
|
||||
sender_id: number;
|
||||
SenderId: number;
|
||||
};
|
||||
|
||||
const user = await get(sender_id);
|
||||
const user = await get(SenderId);
|
||||
|
||||
const decryptedContent = await decryptText(
|
||||
await getSharedSecret(
|
||||
await load("private_key"),
|
||||
await get(await load("user_id")).then((data) => data.public_key),
|
||||
user.public_key,
|
||||
await get(await load("user_id")).then((data) => data.PublicKey),
|
||||
user.PublicKey,
|
||||
),
|
||||
message.content,
|
||||
);
|
||||
|
||||
// Update message state
|
||||
if (userId === sender_id) {
|
||||
if (userId === SenderId) {
|
||||
addLiveMessage({
|
||||
...message,
|
||||
content: decryptedContent,
|
||||
sent_by_self: false,
|
||||
SentBySelf: false,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// todo: add notification symbol to conversation cards (incl. message start)
|
||||
|
||||
moveUserIdToTop(sender_id);
|
||||
moveUserIdToTop(SenderId);
|
||||
|
||||
if (await load("settings.receive_confirmations")) {
|
||||
void send(
|
||||
"message_state",
|
||||
{
|
||||
message_state: "received",
|
||||
MessageState: "received",
|
||||
},
|
||||
{
|
||||
id: ttpMessage.id,
|
||||
|
|
@ -87,14 +87,14 @@ export default function Provider(props: { children: React.ReactNode }) {
|
|||
body: decryptedContent,
|
||||
icon: user.avatar || user.display.slice(0, 2).toUpperCase(),
|
||||
badge: user.avatar || user.display.slice(0, 2).toUpperCase(),
|
||||
tag: `message-${user.user_id}`,
|
||||
tag: `message-${user.UserId}`,
|
||||
silent: true,
|
||||
});
|
||||
|
||||
notification.onclick = () => {
|
||||
window.focus();
|
||||
navigate({
|
||||
to: `/chat?id=${user.user_id}`,
|
||||
to: `/chat?id=${user.UserId}`,
|
||||
});
|
||||
|
||||
notification.close();
|
||||
|
|
|
|||
|
|
@ -14,28 +14,28 @@ const fileFromMessage = z.object({
|
|||
|
||||
export const message = z.object({
|
||||
height: z.number(),
|
||||
not_encrypted: z.boolean().optional(),
|
||||
sent_by_self: z.boolean().optional(),
|
||||
send_time: z.number(),
|
||||
NotEncrypted: z.boolean().optional(),
|
||||
SentBySelf: z.boolean().optional(),
|
||||
SendTime: z.number(),
|
||||
content: z.base64(),
|
||||
files: z.array(fileFromMessage).optional(),
|
||||
tint: z.string().length(7).startsWith("#").optional(),
|
||||
avatar: z.boolean().optional(),
|
||||
display: z.boolean().optional(),
|
||||
message_state: z
|
||||
MessageState: z
|
||||
.enum(["read", "received", "sent", "sending", "awaiting"]) // awaiting for 'internal' use
|
||||
.default("received"),
|
||||
});
|
||||
|
||||
export const failedUser = {
|
||||
display: "Failed",
|
||||
iota_id: 0,
|
||||
omikron_connections: [],
|
||||
online_status: "user_borked",
|
||||
public_key: "",
|
||||
sub_end: 0,
|
||||
sub_level: 0,
|
||||
user_id: 0,
|
||||
IotaId: 0,
|
||||
OmikronConnections: [],
|
||||
OnlineStatus: "user_borked",
|
||||
PublicKey: "",
|
||||
SubEnd: 0,
|
||||
SubLevel: 0,
|
||||
UserId: 0,
|
||||
username: "unknown",
|
||||
} as z.infer<typeof mtp.get_user_data.response>;
|
||||
|
||||
|
|
@ -43,12 +43,12 @@ const authPayload = z.object({
|
|||
communities: z.array(z.object({})).optional(),
|
||||
contacts: z.array(
|
||||
z.object({
|
||||
last_message_at: z.number(),
|
||||
user_id: z.number(),
|
||||
last_message: z
|
||||
LastMessageAt: z.number(),
|
||||
UserId: z.number(),
|
||||
LastMessage: z
|
||||
.object({
|
||||
content: z.base64(),
|
||||
sender_id: z.number(),
|
||||
SenderId: z.number(),
|
||||
})
|
||||
.optional(),
|
||||
messages: z.array(message),
|
||||
|
|
@ -56,9 +56,9 @@ const authPayload = z.object({
|
|||
),
|
||||
calls: z.array(
|
||||
z.object({
|
||||
call_id: z.string(),
|
||||
call_secret: z.base64().optional(),
|
||||
call_members: z.array(z.number()),
|
||||
CallId: z.string(),
|
||||
CallSecret: z.base64().optional(),
|
||||
CallMembers: z.array(z.number()),
|
||||
}),
|
||||
),
|
||||
});
|
||||
|
|
@ -92,10 +92,10 @@ const user = z.object({
|
|||
about: z.string().max(255).optional(),
|
||||
avatar: z.string().optional(),
|
||||
display: z.string().min(1).max(15),
|
||||
iota_id: z.number(),
|
||||
omikron_connections: z.array(z.number()),
|
||||
omikron_id: z.number().optional(),
|
||||
online_status: z.enum([
|
||||
IotaId: z.number(),
|
||||
OmikronConnections: z.array(z.number()),
|
||||
OmikronId: z.number().optional(),
|
||||
OnlineStatus: z.enum([
|
||||
"user_offline",
|
||||
"user_online",
|
||||
"user_dnd",
|
||||
|
|
@ -106,11 +106,11 @@ const user = z.object({
|
|||
"iota_online",
|
||||
"iota_borked",
|
||||
]),
|
||||
public_key: z.base64(),
|
||||
PublicKey: z.base64(),
|
||||
status: z.string().max(15).optional(),
|
||||
sub_end: z.number(),
|
||||
sub_level: z.number(),
|
||||
user_id: z.number(),
|
||||
SubEnd: z.number(),
|
||||
SubLevel: z.number(),
|
||||
UserId: z.number(),
|
||||
username: z.string().min(1).max(15),
|
||||
});
|
||||
export const mtp = {
|
||||
|
|
@ -120,7 +120,7 @@ export const mtp = {
|
|||
},
|
||||
get_user_data: {
|
||||
request: z.object({
|
||||
user_id: z.number().optional(),
|
||||
UserId: z.number().optional(),
|
||||
username: z.string().optional(),
|
||||
}),
|
||||
response: user,
|
||||
|
|
@ -131,22 +131,22 @@ export const mtp = {
|
|||
},
|
||||
ping: {
|
||||
request: z.object({
|
||||
last_ping: z.number(),
|
||||
LastPing: z.number(),
|
||||
}),
|
||||
response: z.object({
|
||||
ping_iota: z.number(),
|
||||
PingIota: z.number(),
|
||||
}),
|
||||
},
|
||||
message_live: {
|
||||
request: z.object({}).optional(),
|
||||
response: z.object({
|
||||
sender_id: z.number(),
|
||||
SenderId: z.number(),
|
||||
message,
|
||||
}),
|
||||
},
|
||||
messages_get: {
|
||||
request: z.object({
|
||||
user_id: z.number(),
|
||||
UserId: z.number(),
|
||||
amount: z.number(),
|
||||
offset: z.number(),
|
||||
}),
|
||||
|
|
@ -158,35 +158,35 @@ export const mtp = {
|
|||
request: z.object({
|
||||
height: z.number(),
|
||||
content: z.base64(),
|
||||
receiver_id: z.number(),
|
||||
send_time: z.number(),
|
||||
ReceiverId: z.number(),
|
||||
SendTime: z.number(),
|
||||
files: z.array(fileFromMessage).optional(),
|
||||
}),
|
||||
response: z.object({}),
|
||||
},
|
||||
add_conversation: {
|
||||
request: z.object({
|
||||
chat_partner_id: z.number().optional(),
|
||||
chat_partner_name: z.string().min(1).max(15).optional(),
|
||||
ChatPartnerId: z.number().optional(),
|
||||
ChatPartnerName: z.string().min(1).max(15).optional(),
|
||||
}),
|
||||
response: z.object({}),
|
||||
},
|
||||
message_state: {
|
||||
request: z
|
||||
.object({
|
||||
chat_partner_id: z.number(),
|
||||
send_time: z.number(),
|
||||
message_state: message.shape.message_state,
|
||||
ChatPartnerId: z.number(),
|
||||
SendTime: z.number(),
|
||||
MessageState: message.shape.MessageState,
|
||||
})
|
||||
.or(
|
||||
z.object({
|
||||
message_state: message.shape.message_state,
|
||||
MessageState: message.shape.MessageState,
|
||||
}),
|
||||
),
|
||||
response: z.object({
|
||||
chat_partner_id: z.number(),
|
||||
message_state: message.shape.message_state,
|
||||
send_time: z.number(),
|
||||
ChatPartnerId: z.number(),
|
||||
MessageState: message.shape.MessageState,
|
||||
SendTime: z.number(),
|
||||
}),
|
||||
},
|
||||
|
||||
|
|
@ -200,7 +200,7 @@ export const mtp = {
|
|||
},
|
||||
authenticate_app: {
|
||||
request: z.object({
|
||||
app_identifier: z.string(),
|
||||
AppIdentifier: z.string(),
|
||||
}),
|
||||
response: z.object({
|
||||
challenge: z.base64(),
|
||||
|
|
@ -208,8 +208,8 @@ export const mtp = {
|
|||
},
|
||||
create_app: {
|
||||
request: z.object({
|
||||
app_public_key: z.base64(),
|
||||
app_identifier: z.string(),
|
||||
AppPublicKey: z.base64(),
|
||||
AppIdentifier: z.string(),
|
||||
}),
|
||||
response: z.object({}),
|
||||
},
|
||||
|
|
@ -217,30 +217,30 @@ export const mtp = {
|
|||
// Calls
|
||||
call_token: {
|
||||
request: z.object({
|
||||
call_id: z.string(),
|
||||
CallId: z.string(),
|
||||
}),
|
||||
response: z.object({
|
||||
call_token: z.string(),
|
||||
CallToken: z.string(),
|
||||
}),
|
||||
},
|
||||
call_data: {
|
||||
request: z.object({
|
||||
call_id: z.string(),
|
||||
CallId: z.string(),
|
||||
}),
|
||||
response: z.object({
|
||||
user_ids: z.array(z.number()),
|
||||
UserIds: z.array(z.number()),
|
||||
}),
|
||||
},
|
||||
call_invite: {
|
||||
request: z.object({
|
||||
call_id: z.string(),
|
||||
call_secret: z.base64(),
|
||||
receiver_id: z.number(),
|
||||
CallId: z.string(),
|
||||
CallSecret: z.base64(),
|
||||
ReceiverId: z.number(),
|
||||
}),
|
||||
response: z.object({
|
||||
call_id: z.string().optional(),
|
||||
call_secret: z.base64().optional(),
|
||||
sender_id: z.number().optional(),
|
||||
CallId: z.string().optional(),
|
||||
CallSecret: z.base64().optional(),
|
||||
SenderId: z.number().optional(),
|
||||
}),
|
||||
},
|
||||
error_no_iota: {
|
||||
|
|
@ -355,7 +355,7 @@ export const storageDefaults: Storage = {
|
|||
|
||||
// User Status
|
||||
export function getStatusColor(
|
||||
status: z.infer<typeof mtp.get_user_data.response.shape.online_status>,
|
||||
status: z.infer<typeof mtp.get_user_data.response.shape.OnlineStatus>,
|
||||
) {
|
||||
switch (status) {
|
||||
case "user_online":
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
|||
const calls = [
|
||||
...freshCalls,
|
||||
...localCalls.filter(
|
||||
(call) => !freshCalls.some((fresh) => fresh.call_id === call.call_id),
|
||||
(call) => !freshCalls.some((fresh) => fresh.CallId === call.CallId),
|
||||
),
|
||||
];
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
|||
...freshContacts,
|
||||
...cachedData.filter(
|
||||
(item) =>
|
||||
!freshContacts.some((fresh) => fresh.user_id === item.user_id),
|
||||
!freshContacts.some((fresh) => fresh.UserId === item.UserId),
|
||||
),
|
||||
]);
|
||||
});
|
||||
|
|
@ -69,7 +69,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
|||
const moveUserIdToTop = (userId: number) => {
|
||||
setContacts((prevContacts) => {
|
||||
const userIndex = prevContacts.findIndex(
|
||||
(contact) => contact.user_id === userId,
|
||||
(contact) => contact.UserId === userId,
|
||||
);
|
||||
if (userIndex === -1) return prevContacts;
|
||||
const [user] = prevContacts.splice(userIndex, 1);
|
||||
|
|
@ -79,13 +79,13 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
|||
|
||||
const insertContact = (userId: number) => {
|
||||
setContacts((prevContacts) => {
|
||||
if (prevContacts.some((contact) => contact.user_id === userId)) {
|
||||
if (prevContacts.some((contact) => contact.UserId === userId)) {
|
||||
return prevContacts;
|
||||
}
|
||||
|
||||
const newUser = {
|
||||
user_id: userId,
|
||||
last_message_at: new Date().getTime(),
|
||||
UserId: userId,
|
||||
LastMessageAt: new Date().getTime(),
|
||||
messages: [],
|
||||
} satisfies Contacts[0];
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
|||
|
||||
const insertCall = (call: Calls[number]) => {
|
||||
setLocalCalls((prevCalls) => {
|
||||
if (prevCalls.some((prevCall) => prevCall.call_id === call.call_id)) {
|
||||
if (prevCalls.some((prevCall) => prevCall.CallId === call.CallId)) {
|
||||
return prevCalls;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
|
|||
// Get Shared Secret
|
||||
const sharedSecret = await getSharedSecret(
|
||||
await load("private_key"),
|
||||
user.public_key,
|
||||
user.PublicKey,
|
||||
appPublicKey,
|
||||
).catch((err) => {
|
||||
log(1, "tauth", "red", "Failed to get shared secret", err, {
|
||||
|
|
@ -92,8 +92,8 @@ export default function Wrapper({ children }: { children: ReactNode }) {
|
|||
|
||||
// Save Session
|
||||
await send("create_app", {
|
||||
app_public_key: appPublicKey,
|
||||
app_identifier: identifier,
|
||||
AppPublicKey: appPublicKey,
|
||||
AppIdentifier: identifier,
|
||||
});
|
||||
|
||||
// Open Redirect URL
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ export default function UserProvider(props: { children: React.ReactNode }) {
|
|||
}
|
||||
|
||||
const request = (async () => {
|
||||
const userData = await send("get_user_data", { user_id: userId });
|
||||
const userData = await send("get_user_data", { UserId: userId });
|
||||
const user = {
|
||||
...userData.data,
|
||||
avatar: userData.data.avatar
|
||||
|
|
|
|||
Loading…
Reference in a new issue