Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/lib/queries/chat/findChat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query";

import { api } from "../api";
import { UseQueryParams } from "../types";
import { FindChatsApiChat, normalizeChat } from "./findChats";
import { FindChatResponse } from "./types";

interface IParams {
Expand All @@ -11,14 +12,14 @@ interface IParams {

const queryKey = (params: Partial<IParams>) => ["chats", "findChats", JSON.stringify(params)];

export const findChat = async ({ instanceName, remoteJid }: IParams) => {
const response = await api.post(`/chat/findChats/${instanceName}`, {
export const findChat = async ({ instanceName, remoteJid }: IParams): Promise<FindChatResponse> => {
const response = await api.post<FindChatsApiChat[] | FindChatsApiChat>(`/chat/findChats/${instanceName}`, {
where: { remoteJid },
});
if (Array.isArray(response.data)) {
return response.data[0];
return normalizeChat(response.data[0]);
}
return response.data;
return normalizeChat(response.data);
};

export const useFindChat = (props: UseQueryParams<FindChatResponse> & Partial<IParams>) => {
Expand Down
22 changes: 19 additions & 3 deletions src/lib/queries/chat/findChats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,33 @@ import { api } from "../api";
import { UseQueryParams } from "../types";
import { FindChatsResponse } from "./types";

export type FindChatsApiChat = Omit<Partial<FindChatsResponse[number]>, "id"> &
Pick<FindChatsResponse[number], "remoteJid"> & {
id?: string | null;
};

interface IParams {
instanceName: string;
}

const queryKey = (params: Partial<IParams>) => ["chats", "findChats", JSON.stringify(params)];

export const findChats = async ({ instanceName }: IParams) => {
const response = await api.post(`/chat/findChats/${instanceName}`, {
export const normalizeChat = (chat: FindChatsApiChat): FindChatsResponse[number] => ({
...chat,
id: chat.id ?? chat.remoteJid,
pushName: chat.pushName ?? "",
labels: chat.labels ?? null,
profilePicUrl: chat.profilePicUrl ?? "",
createdAt: chat.createdAt ?? "",
updatedAt: chat.updatedAt ?? "",
instanceId: chat.instanceId ?? "",
});

export const findChats = async ({ instanceName }: IParams): Promise<FindChatsResponse> => {
const response = await api.post<FindChatsApiChat[]>(`/chat/findChats/${instanceName}`, {
where: {},
});
return response.data;
return response.data.map(normalizeChat);
};

export const useFindChats = (props: UseQueryParams<FindChatsResponse> & Partial<IParams>) => {
Expand Down
6 changes: 6 additions & 0 deletions src/lib/whatsapp/jid.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const CONTACT_JID_SUFFIXES = ["@s.whatsapp.net", "@lid"] as const;
const GROUP_JID_SUFFIX = "@g.us";

export const isContactJid = (remoteJid: string): boolean => CONTACT_JID_SUFFIXES.some((suffix) => remoteJid.endsWith(suffix));

export const isGroupJid = (remoteJid: string): boolean => remoteJid.endsWith(GROUP_JID_SUFFIX);
5 changes: 3 additions & 2 deletions src/pages/instance/Chat/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { useInstance } from "@/contexts/InstanceContext";
import { useFindChats } from "@/lib/queries/chat/findChats";
import { getToken, TOKEN_ID } from "@/lib/queries/token";
import { cn } from "@/lib/utils";
import { isContactJid, isGroupJid } from "@/lib/whatsapp/jid";

import { connectSocket, disconnectSocket } from "@/services/websocket/socket";

Expand Down Expand Up @@ -114,8 +115,8 @@ function Chat() {

const visibleChats = useMemo(() => {
const isContacts = kind === "contacts";
const filtered = allChats.filter((c) =>
isContacts ? c.remoteJid.includes("@s.whatsapp.net") : c.remoteJid.includes("@g.us"),
const filtered = allChats.filter((chat) =>
isContacts ? isContactJid(chat.remoteJid) : isGroupJid(chat.remoteJid),
);
if (!search.trim()) return filtered;
const q = search.toLowerCase();
Expand Down