Skip to content

[cherry-pick] fix WEBJS LID presence and GOWS chat summaries #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaqman wants to merge 1 commit into
base: core
Choose a base branch
from
Open

[cherry-pick] fix WEBJS LID presence and GOWS chat summaries #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion src/core/engines/gows/session.gows.core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,7 +2350,23 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {

protected async fetchChatSummary(chat, merge: boolean): Promise<ChatSummary> {
const id = toCusFormat(chat.id);
const name = chat.name;
let name = chat.name;
if (!name) {
try {
const jid = toJID(chat.id);
const request = new messages.EntityByIdRequest({
session: this.session,
id: jid,
});
const response = await promisify(this.client.GetContactById)(request);
const contactData = parseJson(response);
if (contactData) {
name = contactData.Name || contactData.PushName;
}
} catch (e) {
// Ignore contact lookup errors
}
}
const picture = await this.getContactProfilePicture(chat.id, false);
const lastMessageQuery: GetChatMessagesQuery = {
limit: 1,
Expand Down
16 changes: 14 additions & 2 deletions src/core/engines/webjs/session.webjs.core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,14 +1855,26 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {

@Activity()
public async getPresence(id: string): Promise<WAHAChatPresences> {
const chatId = toCusFormat(id);
let chatId = toCusFormat(id);
if (isLidUser(chatId)) {
const pn = await this.whatsapp.findPNByLid(chatId);
if (pn) {
chatId = toCusFormat(pn);
}
}
const presences = await this.whatsapp.getPresence(chatId);
return this.toWahaPresences(chatId, presences);
}

@Activity()
public async subscribePresence(id: string): Promise<any> {
const chatId = toCusFormat(id);
let chatId = toCusFormat(id);
if (isLidUser(chatId)) {
const pn = await this.whatsapp.findPNByLid(chatId);
if (pn) {
chatId = toCusFormat(pn);
}
}
await this.whatsapp.subscribePresence(chatId);
}

Expand Down