mirror of
https://github.com/cheveguerra/whaticket-community.git
synced 2026-04-18 03:39:29 +00:00
Corrigido problema ao renderizar VCards
Resolvido problema ao renderizar VCards. Não consegui realizar a renderização de Multi_VCards mas deixei comentado a rotina quando for resolvido o problema de retornar body vazio ao enviar ou receber Multi_VCards
This commit is contained in:
@@ -12,12 +12,18 @@ import CheckContactNumber from "../services/WbotServices/CheckNumber"
|
||||
import CheckIsValidContact from "../services/WbotServices/CheckIsValidContact";
|
||||
import GetProfilePicUrl from "../services/WbotServices/GetProfilePicUrl";
|
||||
import AppError from "../errors/AppError";
|
||||
import GetContactService from "../services/ContactServices/GetContactService";
|
||||
|
||||
type IndexQuery = {
|
||||
searchParam: string;
|
||||
pageNumber: string;
|
||||
};
|
||||
|
||||
type IndexGetContactQuery = {
|
||||
name: string;
|
||||
number: string;
|
||||
};
|
||||
|
||||
interface ExtraInfo {
|
||||
name: string;
|
||||
value: string;
|
||||
@@ -40,6 +46,17 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
|
||||
return res.json({ contacts, count, hasMore });
|
||||
};
|
||||
|
||||
export const getContact = async (req: Request, res: Response): Promise<Response> => {
|
||||
const { name, number } = req.body as IndexGetContactQuery;
|
||||
|
||||
const contact = await GetContactService({
|
||||
name,
|
||||
number
|
||||
});
|
||||
|
||||
return res.status(200).json(contact);
|
||||
};
|
||||
|
||||
export const store = async (req: Request, res: Response): Promise<Response> => {
|
||||
const newContact: ContactData = req.body;
|
||||
newContact.number = newContact.number.replace("-", "").replace(" ", "");
|
||||
|
||||
@@ -18,6 +18,8 @@ contactRoutes.get("/contacts/:contactId", isAuth, ContactController.show);
|
||||
|
||||
contactRoutes.post("/contacts", isAuth, ContactController.store);
|
||||
|
||||
contactRoutes.post("/contact", isAuth, ContactController.getContact);
|
||||
|
||||
contactRoutes.put("/contacts/:contactId", isAuth, ContactController.update);
|
||||
|
||||
contactRoutes.delete("/contacts/:contactId", isAuth, ContactController.remove);
|
||||
|
||||
29
backend/src/services/ContactServices/GetContactService.ts
Normal file
29
backend/src/services/ContactServices/GetContactService.ts
Normal file
@@ -0,0 +1,29 @@
|
||||
import AppError from "../../errors/AppError";
|
||||
import Contact from "../../models/Contact";
|
||||
|
||||
interface ExtraInfo {
|
||||
name: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
interface Request {
|
||||
name: string;
|
||||
number: string;
|
||||
email?: string;
|
||||
profilePicUrl?: string;
|
||||
extraInfo?: ExtraInfo[];
|
||||
}
|
||||
|
||||
const GetContactService = async ({ name, number }: Request): Promise<Contact> => {
|
||||
const numberExists = await Contact.findOne({
|
||||
where: { number }
|
||||
});
|
||||
|
||||
if (!numberExists) {
|
||||
throw new AppError("CONTACT_NOT_FIND");
|
||||
}
|
||||
|
||||
return numberExists;
|
||||
};
|
||||
|
||||
export default GetContactService;
|
||||
@@ -22,6 +22,8 @@ import FindOrCreateTicketService from "../TicketServices/FindOrCreateTicketServi
|
||||
import ShowWhatsAppService from "../WhatsappService/ShowWhatsAppService";
|
||||
import { debounce } from "../../helpers/Debounce";
|
||||
import UpdateTicketService from "../TicketServices/UpdateTicketService";
|
||||
import CreateContactService from "../ContactServices/CreateContactService";
|
||||
import GetContactService from "../ContactServices/GetContactService";
|
||||
|
||||
interface Session extends Client {
|
||||
id?: number;
|
||||
@@ -196,6 +198,7 @@ const isValidMsg = (msg: WbotMessage): boolean => {
|
||||
msg.type === "image" ||
|
||||
msg.type === "document" ||
|
||||
msg.type === "vcard" ||
|
||||
//msg.type === "multi_vcard" ||
|
||||
msg.type === "sticker"
|
||||
)
|
||||
return true;
|
||||
@@ -222,7 +225,9 @@ const handleMessage = async (
|
||||
// media messages sent from me from cell phone, first comes with "hasMedia = false" and type = "image/ptt/etc"
|
||||
// in this case, return and let this message be handled by "media_uploaded" event, when it will have "hasMedia = true"
|
||||
|
||||
if (!msg.hasMedia && msg.type !== "chat" && msg.type !== "vcard") return;
|
||||
if (!msg.hasMedia && msg.type !== "chat" && msg.type !== "vcard"
|
||||
//&& msg.type !== "multi_vcard"
|
||||
) return;
|
||||
|
||||
msgContact = await wbot.getContactById(msg.to);
|
||||
} else {
|
||||
@@ -249,32 +254,93 @@ const handleMessage = async (
|
||||
|
||||
const contact = await verifyContact(msgContact);
|
||||
|
||||
if ( unreadMessages === 0 && whatsapp.farewellMessage && whatsapp.farewellMessage === msg.body) return;
|
||||
if (unreadMessages === 0 && whatsapp.farewellMessage && whatsapp.farewellMessage === msg.body) return;
|
||||
|
||||
const ticket = await FindOrCreateTicketService(
|
||||
contact,
|
||||
wbot.id!,
|
||||
unreadMessages,
|
||||
groupContact
|
||||
);
|
||||
const ticket = await FindOrCreateTicketService(
|
||||
contact,
|
||||
wbot.id!,
|
||||
unreadMessages,
|
||||
groupContact
|
||||
);
|
||||
|
||||
if (msg.hasMedia) {
|
||||
await verifyMediaMessage(msg, ticket, contact);
|
||||
} else {
|
||||
await verifyMessage(msg, ticket, contact);
|
||||
if (msg.hasMedia) {
|
||||
await verifyMediaMessage(msg, ticket, contact);
|
||||
} else {
|
||||
await verifyMessage(msg, ticket, contact);
|
||||
}
|
||||
|
||||
if (
|
||||
!ticket.queue &&
|
||||
!chat.isGroup &&
|
||||
!msg.fromMe &&
|
||||
!ticket.userId &&
|
||||
whatsapp.queues.length >= 1
|
||||
) {
|
||||
await verifyQueue(wbot, msg, ticket, contact);
|
||||
}
|
||||
|
||||
if (msg.type === "vcard") { try { const array = msg.body.split("\n"); const obj = []; let contact = ""; for (let index = 0; index < array.length; index++) { const v = array[index]; const values = v.split(":"); for (let ind = 0; ind < values.length; ind++) { if (values[ind].indexOf("+") !== -1) { obj.push({ number: values[ind] }); } if (values[ind].indexOf("FN") !== -1) { contact = values[ind + 1]; } } } for await (const ob of obj) { const cont = await CreateContactService({ name: contact, number: ob.number.replace(/\D/g, "") }); } } catch (error) { console.log(error); } }
|
||||
|
||||
/*if (msg.type === "multi_vcard") {
|
||||
try {
|
||||
const array = msg.vCards.toString().split("\n");
|
||||
let name = "";
|
||||
let number = "";
|
||||
const obj = [];
|
||||
const conts = [];
|
||||
for (let index = 0; index < array.length; index++) {
|
||||
const v = array[index];
|
||||
const values = v.split(":");
|
||||
for (let ind = 0; ind < values.length; ind++) {
|
||||
if (values[ind].indexOf("+") !== -1) {
|
||||
number = values[ind];
|
||||
}
|
||||
if (values[ind].indexOf("FN") !== -1) {
|
||||
name = values[ind + 1];
|
||||
}
|
||||
if (name !== "" && number !== "") {
|
||||
obj.push({
|
||||
name,
|
||||
number
|
||||
});
|
||||
name = "";
|
||||
number = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-restricted-syntax
|
||||
for await (const ob of obj) {
|
||||
try {
|
||||
const cont = await CreateContactService({
|
||||
name: ob.name,
|
||||
number: ob.number.replace(/\D/g, "")
|
||||
});
|
||||
conts.push({
|
||||
id: cont.id,
|
||||
name: cont.name,
|
||||
number: cont.number
|
||||
});
|
||||
} catch (error) {
|
||||
if (error.message === "ERR_DUPLICATED_CONTACT") {
|
||||
const cont = await GetContactService({
|
||||
name: ob.name,
|
||||
number: ob.number.replace(/\D/g, ""),
|
||||
email: ""
|
||||
});
|
||||
conts.push({
|
||||
id: cont.id,
|
||||
name: cont.name,
|
||||
number: cont.number
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
msg.body = JSON.stringify(conts);
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
|
||||
if (
|
||||
!ticket.queue &&
|
||||
!chat.isGroup &&
|
||||
!msg.fromMe &&
|
||||
!ticket.userId &&
|
||||
whatsapp.queues.length >= 1
|
||||
) {
|
||||
await verifyQueue(wbot, msg, ticket, contact);
|
||||
}
|
||||
|
||||
|
||||
}*/
|
||||
|
||||
} catch (err) {
|
||||
Sentry.captureException(err);
|
||||
|
||||
Reference in New Issue
Block a user