(feat): track call invite when it is received

(fix): call invites getting sent by non-call-creators

apps/web/src/index.tsx

@@ -163,9 +163,7 @@ function AppShell() {
 }
 
 function CallInit() {
-  useInitializeCall();
-
-  return null;
+  return useInitializeCall();
 }
 
 const rootRoute = createRootRoute({

flake.nix

@@ -6,8 +6,8 @@
   outputs = {nixpkgs, ...}: let
     systems = ["x86_64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs systems;
-    version = "0.0.6";
-    x86_64DebHash = "sha256-rNlyNZFgYVRvJzX1sBz/qLHUdZoyfvHl5xuwb2BtU48=";
+    version = "0.0.7";
+    x86_64DebHash = "sha256-gRkUEx1T7mrCgFEVp0X/ZiaGrKWzO+cCvv33DKCkB+o=";
     forgejoBaseUrl = "https://git.methanium.net/tensamin/client/releases/download/${version}";
   in {
     packages = forAllSystems (system: let

packages/call/src/components/invitePopup.tsx

@@ -0,0 +1,58 @@
+import {
+  Avatar,
+  AvatarFallback,
+  AvatarImage,
+  Button,
+  Dialog,
+  DialogContent,
+} from "@tensamin/ui";
+import Wrapper from "@tensamin/user/wrapper";
+import { PhoneIncoming, PhoneMissed } from "lucide-react";
+
+export default function InvitePopup({
+  open,
+  setOpen,
+  onAccept,
+  user,
+}: {
+  open: boolean;
+  setOpen: (value: boolean) => void;
+  onAccept: (value: boolean) => void;
+  user: number;
+}) {
+  return (
+    <Wrapper
+      userId={user}
+      loading={null}
+      component={(user) => (
+        <Dialog open={open} onOpenChange={setOpen}>
+          <DialogContent className="flex flex-col gap-5 items-center justify-center w-65 h-80">
+            <Avatar className="size-30">
+              <AvatarImage src={user.avatar} />
+              <AvatarFallback className="text-5xl">
+                {user.display.slice(0, 2).toUpperCase()}
+              </AvatarFallback>
+            </Avatar>
+            <p className="text-xl font-medium">{user.display}</p>
+            <div className="w-full flex justify-center gap-3">
+              <Button
+                className="w-14 h-14"
+                variant="subtleDefault"
+                onClick={() => onAccept(true)}
+              >
+                <PhoneIncoming className="size-5" />
+              </Button>
+              <Button
+                className="w-14 h-14"
+                variant="destructive"
+                onClick={() => onAccept(false)}
+              >
+                <PhoneMissed className="size-5" />
+              </Button>
+            </div>
+          </DialogContent>
+        </Dialog>
+      )}
+    />
+  );
+}

packages/call/src/store.tsx

@@ -6,6 +6,7 @@ import { log, toast } from "@tensamin/shared/log";
 import { ttp } from "@tensamin/shared/data";
 import { useCrypto } from "@tensamin/crypto/context";
 import { useStorage } from "@tensamin/storage/context";
+import { useSession } from "@tensamin/storage/session";
 import { useUser } from "@tensamin/user/context";
 import { DeepFilterNoiseFilterProcessor } from "deepfilternet3-noise-filter";
 import {
@@ -24,7 +25,6 @@ import {
   getLogger,
 } from "livekit-client";
 import z from "zod";
-import { toast as sonnerToast } from "sonner";
 import {
   createScreenShareController,
   type ScreenShareSession,
@@ -33,6 +33,7 @@ import {
   getSpeakingDetector,
   disposeSpeakingDetector,
 } from "./speakingIndicator";
+import InvitePopup from "./components/invitePopup";
 
 // logging
 setLogExtension(
@@ -45,6 +46,11 @@ setLogExtension(
 
 type CallState = "closed" | "closing" | "connecting" | "open" | "encrypting";
 type CallView = "preview" | "focused" | "grid";
+type IncomingCallInvite = {
+  callId: string;
+  callSecret: string;
+  senderId: number;
+};
 type CurrentCallData =
   | (z.infer<typeof ttp.call_data.response> & { exists: boolean })
   | null;
@@ -83,6 +89,7 @@ type CallStore = {
   view: CallView;
   invitedUserId: number | null;
   callId: string | null;
+  incomingCallInvite: IncomingCallInvite | null;
   callSecret: string | null;
   livekitToken: string | null;
   currentCallData: CurrentCallData;
@@ -837,6 +844,7 @@ export async function disconnect() {
     state: "closing",
     invitedUserId: null,
     callId: null,
+    incomingCallInvite: null,
     callSecret: null,
     livekitToken: null,
     currentCallData: null,
@@ -883,7 +891,7 @@ export async function joinCall(
   log(2, "call", "purple", "Call creation initialised");
   useCall.setState({
     state: "encrypting",
-    invitedUserId: sendInvite ? userId : null,
+    invitedUserId: sendInvite && !existingCallId ? userId : null,
   });
 
   if (callSecret) {
@@ -999,6 +1007,7 @@ export function resetCallState() {
     view: "preview",
     invitedUserId: null,
     callId: null,
+    incomingCallInvite: null,
     callSecret: null,
     livekitToken: null,
     currentCallData: null,
@@ -1050,6 +1059,7 @@ export const useCall = create<CallStore>(() => ({
   view: "preview",
   invitedUserId: null,
   callId: null,
+  incomingCallInvite: null,
   callSecret: null,
   livekitToken: null,
   currentCallData: null,
@@ -1080,10 +1090,12 @@ export function useInitializeCall() {
   const { send, subscribePush } = useTTP();
   const { getSharedSecret, decryptText, encryptText } = useCrypto();
   const { load } = useStorage();
+  const { insertCall } = useSession();
   const { get } = useUser();
 
   const callId = useCall((state) => state.callId);
   const view = useCall((state) => state.view);
+  const incomingCallInvite = useCall((state) => state.incomingCallInvite);
 
   const listenersRegistered = useRef(false);
   const noiseFilter = useMemo(
@@ -1113,30 +1125,54 @@ export function useInitializeCall() {
   }, [decryptText, encryptText, get, getSharedSecret, load, navigate, send]);
 
   const showCallingScreen = useCallback(
-    async (callId: string, callSecret: string, senderId: number) => {
-      const senderName = await get(senderId).then((data) => data.display);
-
-      sonnerToast(`Incoming call from ${senderName}`, {
-        action: {
-          label: "Accept",
-          onClick: () => {
-            joinCall(senderId, callSecret, callId, false).catch((err) => {
-              log(1, "call", "red", "Failed to join call", err);
-            });
-          },
-        },
-        cancel: {
-          label: "Decline",
-          onClick: () => {
-            log(2, "call", "purple", "Declined call invite", {
-              callId,
-              senderId,
-            });
-          },
-        },
+    (callId: string, callSecret: string, senderId: number) => {
+      useCall.setState({
+        incomingCallInvite: { callId, callSecret, senderId },
       });
     },
-    [get],
+    [],
+  );
+
+  const setInvitePopupOpen = useCallback((open: boolean) => {
+    if (!open) {
+      useCall.setState({ incomingCallInvite: null });
+    }
+  }, []);
+
+  const respondToInvite = useCallback(
+    (accepted: boolean) => {
+      const invite = useCall.getState().incomingCallInvite;
+
+      useCall.setState({ incomingCallInvite: null });
+
+      if (!invite) {
+        return;
+      }
+
+      insertCall({
+        call_id: invite.callId,
+        call_secret: invite.callSecret,
+        call_members: [invite.senderId],
+      });
+
+      if (accepted) {
+        joinCall(
+          invite.senderId,
+          invite.callSecret,
+          invite.callId,
+          false,
+        ).catch((err) => {
+          log(1, "call", "red", "Failed to join call", err);
+        });
+        return;
+      }
+
+      log(2, "call", "purple", "Declined call invite", {
+        callId: invite.callId,
+        senderId: invite.senderId,
+      });
+    },
+    [insertCall],
   );
 
   // listen to call invites
@@ -1482,4 +1518,13 @@ export function useInitializeCall() {
         });
       });
   }, [callId, send, view]);
+
+  return incomingCallInvite ? (
+    <InvitePopup
+      open
+      setOpen={setInvitePopupOpen}
+      onAccept={respondToInvite}
+      user={incomingCallInvite.senderId}
+    />
+  ) : null;
 }

packages/chat/src/components/message.tsx

@@ -12,14 +12,9 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@tensamin/ui";
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuTrigger,
-} from "@tensamin/ui";
 import Wrapper from "@tensamin/user/wrapper";
 import { useChat } from "../context";
+import MessageContextMenu from "./messageContextMenu";
 
 function MessageComponent({
   grouped,
@@ -38,72 +33,66 @@ function MessageComponent({
       // pt-3 is to get a gap between messages
       className={`${grouped ? "" : "pt-3"} w-full flex justify-start transition-opacity duration-150 ${actuallyFailed || message.message_state === "awaiting" ? "opacity-50" : ""}`}
     >
-      <ContextMenu>
-        <ContextMenuTrigger
-          render={
-            <div
-              className={cn(
-                "group hover:bg-muted/50 select-text! justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
-                {
-                  "bg-(--destructive)/15 text-destructive-foreground":
-                    actuallyFailed,
-                },
-              )}
-            >
-              <Wrapper
-                loading={"State not achievable"}
-                userId={message.sent_by_self ? "own" : userId}
-                component={(user) => (
-                  <>
-                    {grouped ? (
-                      <p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
+      <MessageContextMenu
+        content={message.content}
+        messageId={message.send_time}
+      >
+        <div
+          className={cn(
+            "group hover:bg-muted/50 select-text! justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
+            {
+              "bg-(--destructive)/15 text-destructive-foreground":
+                actuallyFailed,
+            },
+          )}
+        >
+          <Wrapper
+            loading={"State not achievable"}
+            userId={message.sent_by_self ? "own" : userId}
+            component={(user) => (
+              <>
+                {grouped ? (
+                  <p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
+                    {new Date(message.send_time).toLocaleString([], {
+                      hour: "2-digit",
+                      minute: "2-digit",
+                    })}
+                  </p>
+                ) : (
+                  <Avatar className="mr-1 mb-auto mt-1 w-10">
+                    <AvatarImage src={user.avatar} />
+                    <AvatarFallback>
+                      {user.display.slice(0, 2).toUpperCase()}
+                    </AvatarFallback>
+                  </Avatar>
+                )}
+                {message.failed && message.message_state === "awaiting" && (
+                  <Tooltip>
+                    <TooltipContent>
+                      <p>Failed to send message</p>
+                    </TooltipContent>
+                    <TooltipTrigger render={<AlertTriangle size={17} />} />
+                  </Tooltip>
+                )}
+                <div className="flex flex-col">
+                  {!grouped && (
+                    <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([], {
                           hour: "2-digit",
                           minute: "2-digit",
                         })}
                       </p>
-                    ) : (
-                      <Avatar className="mr-1 mb-auto mt-1 w-10">
-                        <AvatarImage src={user.avatar} />
-                        <AvatarFallback>
-                          {user.display.slice(0, 2).toUpperCase()}
-                        </AvatarFallback>
-                      </Avatar>
-                    )}
-                    {message.failed && message.message_state === "awaiting" && (
-                      <Tooltip>
-                        <TooltipContent>
-                          <p>Failed to send message</p>
-                        </TooltipContent>
-                        <TooltipTrigger render={<AlertTriangle size={17} />} />
-                      </Tooltip>
-                    )}
-                    <div className="flex flex-col">
-                      {!grouped && (
-                        <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([], {
-                              hour: "2-digit",
-                              minute: "2-digit",
-                            })}
-                          </p>
-                        </div>
-                      )}
-                      <Text value={message.content} />
                     </div>
-                  </>
-                )}
-              />
-            </div>
-          }
-        />
-        <ContextMenuContent>
-          <ContextMenuItem>
-            <Text value={message.content} />
-          </ContextMenuItem>
-        </ContextMenuContent>
-      </ContextMenu>
+                  )}
+                  <Text value={message.content} />
+                </div>
+              </>
+            )}
+          />
+        </div>
+      </MessageContextMenu>
     </div>
   );
 }

packages/chat/src/components/messageContextMenu.tsx

@@ -0,0 +1,242 @@
+import {
+  cn,
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuGroup,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuSub,
+  ContextMenuSubContent,
+  ContextMenuSubTrigger,
+  ContextMenuTrigger,
+  Drawer,
+  DrawerContent,
+  DrawerTrigger,
+  useIsMobile,
+} from "@tensamin/ui";
+import { Pin, Clipboard, Pen, Reply, Forward, Trash } from "lucide-react";
+import { useMemo, useState } from "react";
+import type { ReactElement, ReactNode } from "react";
+
+async function copyText(text: string) {
+  await navigator.clipboard.writeText(text);
+}
+
+type MenuComponents = {
+  Content: (props: { className?: string; children: ReactNode }) => ReactElement;
+  Group: (props: { children: ReactNode }) => ReactElement;
+  Item: (props: {
+    children: ReactNode;
+    className?: string;
+    disabled?: boolean;
+    onClick?: () => void | Promise<void>;
+    variant?: "default" | "destructive";
+  }) => ReactElement;
+  Separator: (props: { className?: string }) => ReactElement;
+  Sub: (props: { children: ReactNode }) => ReactElement;
+  SubTrigger: (props: {
+    children: ReactNode;
+    onClick?: () => void | Promise<void>;
+  }) => ReactElement;
+  SubContent: (props: { children: ReactNode }) => ReactElement;
+};
+
+const desktopMenuComponents: MenuComponents = {
+  Content: ContextMenuContent,
+  Group: ContextMenuGroup,
+  Item: ContextMenuItem,
+  Separator: ContextMenuSeparator,
+  Sub: ContextMenuSub,
+  SubTrigger: ContextMenuSubTrigger,
+  SubContent: ContextMenuSubContent,
+};
+
+function getMobileMenuComponents(onClose: () => void): MenuComponents {
+  return {
+    Content: ({ className, children }) => (
+      <DrawerContent>
+        <div className={cn("p-3!", className)}>{children}</div>
+      </DrawerContent>
+    ),
+    Group: ({ children }) => <div>{children}</div>,
+    Item: ({ children, className, disabled, onClick, variant = "default" }) => {
+      async function handleClick() {
+        await onClick?.();
+        onClose();
+      }
+
+      return (
+        <button
+          type="button"
+          disabled={disabled}
+          data-variant={variant}
+          className={cn(
+            "relative flex w-full cursor-default items-center gap-1.5 rounded-md px-1.5 py-2 text-left text-sm outline-hidden select-none data-[variant=destructive]:text-destructive disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-[variant=destructive]:*:[svg]:text-destructive",
+            className,
+          )}
+          onClick={handleClick}
+        >
+          {children}
+        </button>
+      );
+    },
+    Separator: ({ className }) => (
+      <div className={cn("-mx-1 my-1 h-px bg-border", className)} />
+    ),
+    Sub: ({ children }) => <div>{children}</div>,
+    SubTrigger: ({ children, onClick }) => {
+      async function handleClick() {
+        await onClick?.();
+        onClose();
+      }
+
+      return (
+        <button
+          type="button"
+          className="flex w-full cursor-default items-center gap-1.5 rounded-md px-1.5 py-2 text-left text-sm outline-hidden select-none"
+          onClick={handleClick}
+        >
+          {children}
+        </button>
+      );
+    },
+    SubContent: ({ children }) => <div className="pl-3">{children}</div>,
+  };
+}
+
+function ReactionItems({ Item }: { Item: MenuComponents["Item"] }) {
+  return <Item>Cool item</Item>;
+}
+
+function MessageMenuContent({
+  components,
+  content,
+  devEnabled,
+  messageId,
+  onAddReaction,
+  showReactionItems = true,
+}: {
+  components: MenuComponents;
+  content: string;
+  devEnabled: boolean;
+  messageId: number;
+  onAddReaction?: () => void | Promise<void>;
+  showReactionItems?: boolean;
+}) {
+  const { Content, Group, Item, Separator, Sub, SubContent, SubTrigger } =
+    components;
+
+  return (
+    <Content>
+      <Group>
+        <Sub>
+          <SubTrigger onClick={onAddReaction}>Add Reaction</SubTrigger>
+          {showReactionItems && (
+            <SubContent>
+              <ReactionItems Item={Item} />
+            </SubContent>
+          )}
+        </Sub>
+        <Item disabled className="flex justify-between">
+          <p>Pin Message</p> <Pin />
+        </Item>
+        <Item
+          className="flex justify-between"
+          onClick={() => copyText(content)}
+        >
+          <p>Copy Raw</p> <Clipboard />
+        </Item>
+      </Group>
+      <Separator />
+      <Group>
+        <Item disabled className="flex justify-between">
+          <p>Edit Message</p> <Pen />
+        </Item>
+        <Item disabled className="flex justify-between">
+          <p>Reply</p> <Reply />
+        </Item>
+        <Item disabled className="flex justify-between">
+          <p>Forward</p> <Forward />
+        </Item>
+      </Group>
+      <Separator />
+      <Group>
+        <Item disabled variant="destructive" className="flex justify-between">
+          <p>Delete Message</p> <Trash />
+        </Item>
+      </Group>
+      {devEnabled && (
+        <>
+          <Separator />
+          <Group>
+            <Item
+              className="flex justify-between"
+              onClick={() => copyText(String(messageId))}
+            >
+              <p>Copy ID</p> <Clipboard />
+            </Item>
+          </Group>
+        </>
+      )}
+    </Content>
+  );
+}
+
+export default function MessageContextMenu({
+  children,
+  content,
+  messageId,
+}: {
+  children: ReactElement;
+  content: string;
+  messageId: number;
+}) {
+  const isMobile = useIsMobile();
+  const devEnabled = useMemo(
+    () => Number(localStorage.getItem("log_level")) >= 3,
+    [],
+  );
+  const [mainDrawerOpen, setMainDrawerOpen] = useState(false);
+  const [reactionDrawerOpen, setReactionDrawerOpen] = useState(false);
+  const mainDrawerComponents = getMobileMenuComponents(() =>
+    setMainDrawerOpen(false),
+  );
+  const reactionDrawerComponents = getMobileMenuComponents(() =>
+    setReactionDrawerOpen(false),
+  );
+
+  if (isMobile) {
+    return (
+      <>
+        <Drawer open={mainDrawerOpen} onOpenChange={setMainDrawerOpen}>
+          <DrawerTrigger asChild>{children}</DrawerTrigger>
+          <MessageMenuContent
+            components={mainDrawerComponents}
+            content={content}
+            devEnabled={devEnabled}
+            messageId={messageId}
+            onAddReaction={() => setReactionDrawerOpen(true)}
+            showReactionItems={false}
+          />
+        </Drawer>
+        <Drawer open={reactionDrawerOpen} onOpenChange={setReactionDrawerOpen}>
+          <DrawerContent>
+            <ReactionItems Item={reactionDrawerComponents.Item} />
+          </DrawerContent>
+        </Drawer>
+      </>
+    );
+  }
+
+  return (
+    <ContextMenu>
+      <ContextMenuTrigger render={children} />
+      <MessageMenuContent
+        components={desktopMenuComponents}
+        content={content}
+        devEnabled={devEnabled}
+        messageId={messageId}
+      />
+    </ContextMenu>
+  );
+}

packages/chat/todo.md

@@ -1 +1,2 @@
-- Add context menu to messages
+- Implement context menu features
+- Add default-emoji-hotkey in settings

packages/storage/src/session.tsx

@@ -15,6 +15,7 @@ interface SessionContextType {
   calls: Calls;
   moveUserIdToTop: (userId: number) => void;
   insertContact: (userId: number) => void;
+  insertCall: (call: Calls[number]) => void;
 }
 
 const SessionContext = createContext<SessionContextType | undefined>(undefined);
@@ -24,6 +25,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
   const { load, save } = useStorage();
   const [contacts, setContacts] = useState<Contacts>([]);
   const [communities, setCommunities] = useState<Communities>([]);
+  const [calls, setCalls] = useState<Calls>([]);
 
   // Get cached data and merge fresh data
   useEffect(() => {
@@ -51,6 +53,15 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
     });
   }, [load, freshContacts, freshCommunities]);
 
+  useEffect(() => {
+    setCalls((prevCalls) => [
+      ...freshCalls,
+      ...prevCalls.filter(
+        (call) => !freshCalls.some((fresh) => fresh.call_id === call.call_id),
+      ),
+    ]);
+  }, [freshCalls]);
+
   // Save data
   useEffect(() => {
     save("cached_contacts", contacts);
@@ -86,14 +97,25 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
     });
   };
 
+  const insertCall = (call: Calls[number]) => {
+    setCalls((prevCalls) => {
+      if (prevCalls.some((prevCall) => prevCall.call_id === call.call_id)) {
+        return prevCalls;
+      }
+
+      return [call, ...prevCalls];
+    });
+  };
+
   return (
     <SessionContext.Provider
       value={{
         contacts,
         communities,
-        calls: freshCalls,
+        calls,
         moveUserIdToTop,
         insertContact,
+        insertCall,
       }}
     >
       {children}