socket: fix onWhatsApp
This commit is contained in:
@@ -90,7 +90,7 @@ export class LIDMappingStore {
|
|||||||
|
|
||||||
if (!lidUser) {
|
if (!lidUser) {
|
||||||
logger.trace(`No LID mapping found for PN user ${pnUser}; getting from USync`)
|
logger.trace(`No LID mapping found for PN user ${pnUser}; getting from USync`)
|
||||||
const { exists, lid } = (await this.onWhatsAppFunc?.(pn))?.[0]!
|
const { exists, lid } = (await this.onWhatsAppFunc?.(pn))?.[0]! // this function already adds LIDs to mapping
|
||||||
if (exists) {
|
if (exists) {
|
||||||
lidUser = jidDecode(lid)?.user
|
lidUser = jidDecode(lid)?.user
|
||||||
} else {
|
} else {
|
||||||
@@ -119,6 +119,7 @@ export class LIDMappingStore {
|
|||||||
|
|
||||||
// Look up reverse user mapping
|
// Look up reverse user mapping
|
||||||
const lidUser = decoded.user
|
const lidUser = decoded.user
|
||||||
|
// TODO: remove this style and instead load all mappings somehow, and then assign them in the map
|
||||||
const stored = await this.keys.get('lid-mapping', [`${lidUser}_reverse`])
|
const stored = await this.keys.get('lid-mapping', [`${lidUser}_reverse`])
|
||||||
const pnUser = stored[`${lidUser}_reverse`]
|
const pnUser = stored[`${lidUser}_reverse`]
|
||||||
|
|
||||||
|
|||||||
@@ -257,10 +257,8 @@ export const makeSocket = (config: SocketConfig) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const onWhatsApp = async (...jids: string[]) => {
|
const onWhatsApp = async (...jids: string[]) => {
|
||||||
const usyncQuery = new USyncQuery().withLIDProtocol()
|
const usyncQuery = new USyncQuery().withLIDProtocol().withContactProtocol()
|
||||||
|
|
||||||
// .withContactProtocol() when dealing with phone
|
|
||||||
// .withId simply with LIDs and WIDs
|
|
||||||
for (const jid of jids) {
|
for (const jid of jids) {
|
||||||
if (isLidUser(jid)) {
|
if (isLidUser(jid)) {
|
||||||
usyncQuery.withUser(new USyncUser().withId(jid)) // intentional
|
usyncQuery.withUser(new USyncUser().withId(jid)) // intentional
|
||||||
|
|||||||
Reference in New Issue
Block a user