(feat): track call invite when it is received
(fix): call invites getting sent by non-call-creators
This commit is contained in:
parent
6fda7f1c71
commit
ed2fd09def
2 changed files with 56 additions and 20 deletions
|
|
@ -6,6 +6,7 @@ import { log, toast } from "@tensamin/shared/log";
|
||||||
import { ttp } from "@tensamin/shared/data";
|
import { ttp } from "@tensamin/shared/data";
|
||||||
import { useCrypto } from "@tensamin/crypto/context";
|
import { useCrypto } from "@tensamin/crypto/context";
|
||||||
import { useStorage } from "@tensamin/storage/context";
|
import { useStorage } from "@tensamin/storage/context";
|
||||||
|
import { useSession } from "@tensamin/storage/session";
|
||||||
import { useUser } from "@tensamin/user/context";
|
import { useUser } from "@tensamin/user/context";
|
||||||
import { DeepFilterNoiseFilterProcessor } from "deepfilternet3-noise-filter";
|
import { DeepFilterNoiseFilterProcessor } from "deepfilternet3-noise-filter";
|
||||||
import {
|
import {
|
||||||
|
|
@ -890,7 +891,7 @@ export async function joinCall(
|
||||||
log(2, "call", "purple", "Call creation initialised");
|
log(2, "call", "purple", "Call creation initialised");
|
||||||
useCall.setState({
|
useCall.setState({
|
||||||
state: "encrypting",
|
state: "encrypting",
|
||||||
invitedUserId: sendInvite ? userId : null,
|
invitedUserId: sendInvite && !existingCallId ? userId : null,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (callSecret) {
|
if (callSecret) {
|
||||||
|
|
@ -1089,6 +1090,7 @@ export function useInitializeCall() {
|
||||||
const { send, subscribePush } = useTTP();
|
const { send, subscribePush } = useTTP();
|
||||||
const { getSharedSecret, decryptText, encryptText } = useCrypto();
|
const { getSharedSecret, decryptText, encryptText } = useCrypto();
|
||||||
const { load } = useStorage();
|
const { load } = useStorage();
|
||||||
|
const { insertCall } = useSession();
|
||||||
const { get } = useUser();
|
const { get } = useUser();
|
||||||
|
|
||||||
const callId = useCall((state) => state.callId);
|
const callId = useCall((state) => state.callId);
|
||||||
|
|
@ -1137,29 +1139,41 @@ export function useInitializeCall() {
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const respondToInvite = useCallback((accepted: boolean) => {
|
const respondToInvite = useCallback(
|
||||||
const invite = useCall.getState().incomingCallInvite;
|
(accepted: boolean) => {
|
||||||
|
const invite = useCall.getState().incomingCallInvite;
|
||||||
|
|
||||||
useCall.setState({ incomingCallInvite: null });
|
useCall.setState({ incomingCallInvite: null });
|
||||||
|
|
||||||
if (!invite) {
|
if (!invite) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (accepted) {
|
insertCall({
|
||||||
joinCall(invite.senderId, invite.callSecret, invite.callId, false).catch(
|
call_id: invite.callId,
|
||||||
(err) => {
|
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);
|
log(1, "call", "red", "Failed to join call", err);
|
||||||
},
|
});
|
||||||
);
|
return;
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
log(2, "call", "purple", "Declined call invite", {
|
log(2, "call", "purple", "Declined call invite", {
|
||||||
callId: invite.callId,
|
callId: invite.callId,
|
||||||
senderId: invite.senderId,
|
senderId: invite.senderId,
|
||||||
});
|
});
|
||||||
}, []);
|
},
|
||||||
|
[insertCall],
|
||||||
|
);
|
||||||
|
|
||||||
// listen to call invites
|
// listen to call invites
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ interface SessionContextType {
|
||||||
calls: Calls;
|
calls: Calls;
|
||||||
moveUserIdToTop: (userId: number) => void;
|
moveUserIdToTop: (userId: number) => void;
|
||||||
insertContact: (userId: number) => void;
|
insertContact: (userId: number) => void;
|
||||||
|
insertCall: (call: Calls[number]) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SessionContext = createContext<SessionContextType | undefined>(undefined);
|
const SessionContext = createContext<SessionContextType | undefined>(undefined);
|
||||||
|
|
@ -24,6 +25,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
||||||
const { load, save } = useStorage();
|
const { load, save } = useStorage();
|
||||||
const [contacts, setContacts] = useState<Contacts>([]);
|
const [contacts, setContacts] = useState<Contacts>([]);
|
||||||
const [communities, setCommunities] = useState<Communities>([]);
|
const [communities, setCommunities] = useState<Communities>([]);
|
||||||
|
const [calls, setCalls] = useState<Calls>([]);
|
||||||
|
|
||||||
// Get cached data and merge fresh data
|
// Get cached data and merge fresh data
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
@ -51,6 +53,15 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
|
||||||
});
|
});
|
||||||
}, [load, freshContacts, freshCommunities]);
|
}, [load, freshContacts, freshCommunities]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setCalls((prevCalls) => [
|
||||||
|
...freshCalls,
|
||||||
|
...prevCalls.filter(
|
||||||
|
(call) => !freshCalls.some((fresh) => fresh.call_id === call.call_id),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}, [freshCalls]);
|
||||||
|
|
||||||
// Save data
|
// Save data
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
save("cached_contacts", contacts);
|
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 (
|
return (
|
||||||
<SessionContext.Provider
|
<SessionContext.Provider
|
||||||
value={{
|
value={{
|
||||||
contacts,
|
contacts,
|
||||||
communities,
|
communities,
|
||||||
calls: freshCalls,
|
calls,
|
||||||
moveUserIdToTop,
|
moveUserIdToTop,
|
||||||
insertContact,
|
insertContact,
|
||||||
|
insertCall,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue