@neelegirl/baileys 1.5.2 → 1.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -21
- package/README.md +195 -187
- package/WAProto/WAProto.proto +537 -236
- package/WAProto/index.d.ts +5971 -2388
- package/WAProto/index.js +17298 -6513
- package/lib/Defaults/baileys-version.json +3 -3
- package/lib/Defaults/index.d.ts +77 -67
- package/lib/Defaults/index.js +148 -136
- package/lib/Defaults/phonenumber-mcc.json +223 -223
- package/lib/Signal/WASignalGroup/GroupProtocol.js +1908 -1908
- package/lib/Signal/WASignalGroup/ciphertext-message.d.ts +9 -0
- package/lib/Signal/WASignalGroup/ciphertext-message.js +19 -0
- package/lib/Signal/WASignalGroup/ciphertext_message.js +15 -15
- package/lib/Signal/WASignalGroup/group-session-builder.d.ts +17 -0
- package/lib/Signal/WASignalGroup/group-session-builder.js +72 -0
- package/lib/Signal/WASignalGroup/group.proto +41 -41
- package/lib/Signal/WASignalGroup/group_cipher.d.ts +19 -0
- package/lib/Signal/WASignalGroup/group_cipher.js +101 -110
- package/lib/Signal/WASignalGroup/group_session_builder.js +45 -45
- package/lib/Signal/WASignalGroup/index.d.ts +11 -0
- package/lib/Signal/WASignalGroup/index.js +61 -6
- package/lib/Signal/WASignalGroup/keyhelper.d.ts +16 -0
- package/lib/Signal/WASignalGroup/keyhelper.js +58 -13
- package/lib/Signal/WASignalGroup/protobufs.js +2 -2
- package/lib/Signal/WASignalGroup/queue_job.js +68 -68
- package/lib/Signal/WASignalGroup/readme.md +5 -5
- package/lib/Signal/WASignalGroup/sender-chain-key.d.ts +14 -0
- package/lib/Signal/WASignalGroup/sender-chain-key.js +47 -0
- package/lib/Signal/WASignalGroup/sender-key-distribution-message.d.ts +17 -0
- package/lib/Signal/WASignalGroup/sender-key-distribution-message.js +71 -0
- package/lib/Signal/WASignalGroup/sender-key-message.d.ts +19 -0
- package/lib/Signal/WASignalGroup/sender-key-message.js +73 -0
- package/lib/Signal/WASignalGroup/sender-key-name.d.ts +19 -0
- package/lib/Signal/WASignalGroup/sender-key-name.js +59 -0
- package/lib/Signal/WASignalGroup/sender-key-record.d.ts +32 -0
- package/lib/Signal/WASignalGroup/sender-key-record.js +58 -0
- package/lib/Signal/WASignalGroup/sender-key-state.d.ts +44 -0
- package/lib/Signal/WASignalGroup/sender-key-state.js +147 -0
- package/lib/Signal/WASignalGroup/sender-message-key.d.ts +11 -0
- package/lib/Signal/WASignalGroup/sender-message-key.js +33 -0
- package/lib/Signal/WASignalGroup/sender_chain_key.js +49 -49
- package/lib/Signal/WASignalGroup/sender_key_distribution_message.js +77 -77
- package/lib/Signal/WASignalGroup/sender_key_message.js +91 -91
- package/lib/Signal/WASignalGroup/sender_key_name.js +69 -69
- package/lib/Signal/WASignalGroup/sender_key_record.js +55 -55
- package/lib/Signal/WASignalGroup/sender_key_state.js +128 -128
- package/lib/Signal/WASignalGroup/sender_message_key.js +38 -38
- package/lib/Signal/libsignal.d.ts +5 -1
- package/lib/Signal/libsignal.js +390 -161
- package/lib/Signal/lid-mapping.d.ts +28 -0
- package/lib/Signal/lid-mapping.js +184 -0
- package/lib/Socket/Client/abstract-socket-client.d.ts +15 -15
- package/lib/Socket/Client/abstract-socket-client.js +13 -13
- package/lib/Socket/Client/index.d.ts +2 -2
- package/lib/Socket/Client/mobile-socket-client.d.ts +12 -12
- package/lib/Socket/Client/mobile-socket-client.js +65 -65
- package/lib/Socket/Client/types.d.ts +1 -1
- package/lib/Socket/Client/websocket.d.ts +1 -1
- package/lib/Socket/business.d.ts +6 -6
- package/lib/Socket/business.js +152 -5
- package/lib/Socket/chats.d.ts +3 -4
- package/lib/Socket/chats.js +31 -26
- package/lib/Socket/communities.d.ts +223 -223
- package/lib/Socket/communities.js +432 -432
- package/lib/Socket/groups.d.ts +2 -4
- package/lib/Socket/groups.js +22 -14
- package/lib/Socket/index.d.ts +69 -69
- package/lib/Socket/index.js +3 -2
- package/lib/Socket/messages-recv.d.ts +3 -6
- package/lib/Socket/messages-recv.js +1449 -1707
- package/lib/Socket/messages-send.d.ts +2 -4
- package/lib/Socket/messages-send.js +617 -126
- package/lib/Socket/mex.d.ts +2 -2
- package/lib/Socket/mex.js +46 -46
- package/lib/Socket/newsletter.d.ts +2 -4
- package/lib/Socket/newsletter.js +294 -285
- package/lib/Socket/socket.js +318 -132
- package/lib/Socket/usync.js +3 -3
- package/lib/Store/index.d.ts +4 -4
- package/lib/Store/index.js +23 -23
- package/lib/Store/make-cache-manager-store.d.ts +13 -13
- package/lib/Store/make-cache-manager-store.js +89 -89
- package/lib/Store/make-in-memory-store.d.ts +122 -122
- package/lib/Store/make-in-memory-store.js +428 -428
- package/lib/Store/make-ordered-dictionary.d.ts +11 -11
- package/lib/Store/make-ordered-dictionary.js +85 -85
- package/lib/Store/object-repository.d.ts +9 -9
- package/lib/Store/object-repository.js +30 -30
- package/lib/Types/Auth.d.ts +5 -4
- package/lib/Types/Bussines.js +3 -0
- package/lib/Types/Bussiness.d.ts +28 -0
- package/lib/Types/Chat.d.ts +13 -8
- package/lib/Types/Contact.d.ts +4 -1
- package/lib/Types/Events.d.ts +13 -16
- package/lib/Types/GroupMetadata.d.ts +1 -1
- package/lib/Types/Message.d.ts +18 -7
- package/lib/Types/Message.js +7 -1
- package/lib/Types/MexUpdates.d.ts +8 -8
- package/lib/Types/MexUpdates.js +17 -17
- package/lib/Types/Newsletter.d.ts +1 -1
- package/lib/Types/Product.d.ts +1 -1
- package/lib/Types/Signal.d.ts +31 -1
- package/lib/Types/Socket.d.ts +34 -13
- package/lib/Types/State.d.ts +1 -1
- package/lib/Types/USync.d.ts +2 -2
- package/lib/Types/index.d.ts +16 -15
- package/lib/Types/index.js +4 -2
- package/lib/Utils/auth-utils.d.ts +20 -20
- package/lib/Utils/auth-utils.js +527 -204
- package/lib/Utils/baileys-event-stream.d.ts +17 -17
- package/lib/Utils/baileys-event-stream.js +69 -69
- package/lib/Utils/business.d.ts +28 -28
- package/lib/Utils/business.js +254 -254
- package/lib/Utils/chat-utils.d.ts +81 -81
- package/lib/Utils/chat-utils.js +808 -780
- package/lib/Utils/crypto.d.ts +55 -55
- package/lib/Utils/crypto.js +188 -178
- package/lib/Utils/decode-wa-message.d.ts +52 -40
- package/lib/Utils/decode-wa-message.js +322 -252
- package/lib/Utils/event-buffer.d.ts +38 -38
- package/lib/Utils/event-buffer.js +594 -564
- package/lib/Utils/generics.d.ts +131 -129
- package/lib/Utils/generics.js +629 -623
- package/lib/Utils/history.d.ts +22 -22
- package/lib/Utils/history.js +103 -109
- package/lib/Utils/index.d.ts +20 -19
- package/lib/Utils/index.js +39 -38
- package/lib/Utils/link-preview.d.ts +22 -22
- package/lib/Utils/link-preview.js +119 -119
- package/lib/Utils/logger.d.ts +13 -13
- package/lib/Utils/logger.js +7 -7
- package/lib/Utils/lt-hash.d.ts +13 -13
- package/lib/Utils/lt-hash.js +57 -57
- package/lib/Utils/make-mutex.d.ts +8 -8
- package/lib/Utils/make-mutex.js +48 -48
- package/lib/Utils/message-retry-manager.d.ts +88 -0
- package/lib/Utils/message-retry-manager.js +160 -0
- package/lib/Utils/messages-media.d.ts +134 -128
- package/lib/Utils/messages-media.js +868 -805
- package/lib/Utils/messages.d.ts +104 -102
- package/lib/Utils/messages.js +1744 -1578
- package/lib/Utils/noise-handler.d.ts +20 -19
- package/lib/Utils/noise-handler.js +164 -154
- package/lib/Utils/process-message.d.ts +48 -48
- package/lib/Utils/process-message.js +427 -428
- package/lib/Utils/signal.d.ts +41 -41
- package/lib/Utils/signal.js +165 -165
- package/lib/Utils/use-mongo-file-auth-state.d.ts +5 -5
- package/lib/Utils/use-mongo-file-auth-state.js +83 -83
- package/lib/Utils/use-multi-file-auth-state.d.ts +17 -17
- package/lib/Utils/use-multi-file-auth-state.js +237 -237
- package/lib/Utils/use-single-file-auth-state.d.ts +12 -12
- package/lib/Utils/use-single-file-auth-state.js +79 -79
- package/lib/Utils/validate-connection.d.ts +12 -12
- package/lib/Utils/validate-connection.js +219 -186
- package/lib/WABinary/constants.d.ts +29 -29
- package/lib/WABinary/constants.js +1315 -1315
- package/lib/WABinary/decode.d.ts +8 -8
- package/lib/WABinary/decode.js +287 -287
- package/lib/WABinary/encode.d.ts +2 -2
- package/lib/WABinary/encode.js +264 -264
- package/lib/WABinary/generic-utils.d.ts +27 -27
- package/lib/WABinary/generic-utils.js +141 -141
- package/lib/WABinary/index.d.ts +5 -5
- package/lib/WABinary/index.js +24 -24
- package/lib/WABinary/jid-utils.d.ts +58 -53
- package/lib/WABinary/jid-utils.js +103 -91
- package/lib/WABinary/types.d.ts +21 -21
- package/lib/WABinary/types.js +2 -2
- package/lib/WAM/BinaryInfo.d.ts +15 -15
- package/lib/WAM/BinaryInfo.js +16 -16
- package/lib/WAM/constants.d.ts +46 -46
- package/lib/WAM/constants.js +15370 -15370
- package/lib/WAM/encode.d.ts +2 -2
- package/lib/WAM/encode.js +163 -164
- package/lib/WAM/index.d.ts +3 -3
- package/lib/WAM/index.js +22 -22
- package/lib/WAUSync/Protocols/USyncBotProfileProtocol.d.ts +27 -27
- package/lib/WAUSync/Protocols/USyncBotProfileProtocol.js +68 -68
- package/lib/WAUSync/Protocols/USyncContactProtocol.d.ts +3 -3
- package/lib/WAUSync/Protocols/USyncDeviceProtocol.d.ts +2 -2
- package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.d.ts +2 -2
- package/lib/WAUSync/Protocols/USyncLIDProtocol.d.ts +9 -8
- package/lib/WAUSync/Protocols/USyncLIDProtocol.js +37 -29
- package/lib/WAUSync/Protocols/USyncStatusProtocol.d.ts +2 -2
- package/lib/WAUSync/Protocols/index.d.ts +6 -6
- package/lib/WAUSync/USyncQuery.d.ts +3 -3
- package/lib/WAUSync/index.d.ts +3 -3
- package/lib/index.d.ts +13 -13
- package/lib/index.js +33 -33
- package/package.json +96 -94
- package/lib/Socket/registration.d.ts +0 -266
- package/lib/Socket/registration.js +0 -166
package/lib/Socket/groups.d.ts
CHANGED
|
@@ -59,10 +59,6 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
|
|
|
59
59
|
lid: string
|
|
60
60
|
id: string
|
|
61
61
|
}[] | undefined>
|
|
62
|
-
onWhatsApp: (...jids: string[]) => Promise<{
|
|
63
|
-
jid: string
|
|
64
|
-
exists: unknown
|
|
65
|
-
}[] | undefined>
|
|
66
62
|
fetchBlocklist: () => Promise<string[]>
|
|
67
63
|
fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>
|
|
68
64
|
fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>
|
|
@@ -94,6 +90,8 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
|
|
|
94
90
|
id: string
|
|
95
91
|
fromMe?: boolean | undefined
|
|
96
92
|
}[], star: boolean) => Promise<void>
|
|
93
|
+
addOrEditQuickReply: (quickReply: import("../Types/Bussines").QuickReplyAction) => Promise<void>
|
|
94
|
+
removeQuickReply: (timestamp: string) => Promise<void>
|
|
97
95
|
addOrEditContact: (jid: string, contact: ContactAction) => Promise<void>
|
|
98
96
|
removeContact: (jid: string) => Promise<void>
|
|
99
97
|
executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>
|
package/lib/Socket/groups.js
CHANGED
|
@@ -8,8 +8,8 @@ const WABinary_1 = require("../WABinary")
|
|
|
8
8
|
const chats_1 = require("./chats")
|
|
9
9
|
|
|
10
10
|
const makeGroupsSocket = (config) => {
|
|
11
|
-
const
|
|
12
|
-
const { authState, ev, query, upsertMessage } =
|
|
11
|
+
const baron = chats_1.makeChatsSocket(config)
|
|
12
|
+
const { authState, ev, query, upsertMessage } = baron
|
|
13
13
|
|
|
14
14
|
const groupQuery = async (jid, type, content) => (query({
|
|
15
15
|
tag: 'iq',
|
|
@@ -61,22 +61,22 @@ const makeGroupsSocket = (config) => {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
baron.ev.emit('groups.update', Object.values(data))
|
|
65
65
|
return data
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
|
|
68
|
+
baron.ws.on('CB:ib,,dirty', async (node) => {
|
|
69
69
|
const { attrs } = WABinary_1.getBinaryNodeChild(node, 'dirty')
|
|
70
70
|
if (attrs.type !== 'groups') {
|
|
71
71
|
return
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
await groupFetchAllParticipating()
|
|
75
|
-
await
|
|
75
|
+
await baron.cleanDirtyBits('groups')
|
|
76
76
|
})
|
|
77
77
|
|
|
78
78
|
return {
|
|
79
|
-
...
|
|
79
|
+
...baron,
|
|
80
80
|
groupQuery,
|
|
81
81
|
groupMetadata,
|
|
82
82
|
groupCreate: async (subject, participants) => {
|
|
@@ -299,16 +299,20 @@ const makeGroupsSocket = (config) => {
|
|
|
299
299
|
const extractGroupMetadata = (result) => {
|
|
300
300
|
const group = WABinary_1.getBinaryNodeChild(result, 'group')
|
|
301
301
|
const descChild = WABinary_1.getBinaryNodeChild(group, 'description')
|
|
302
|
+
const mode = group.attrs.addressing_mode === 'lid' ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN
|
|
302
303
|
|
|
303
304
|
let desc
|
|
304
305
|
let descId
|
|
306
|
+
let descOwner
|
|
307
|
+
let descOwnerLid
|
|
305
308
|
|
|
306
309
|
if (descChild) {
|
|
307
310
|
desc = WABinary_1.getBinaryNodeChildString(descChild, 'body')
|
|
308
311
|
descId = descChild.attrs.id
|
|
312
|
+
descOwner = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn) : WABinary_1.jidNormalizedUser(descChild.attrs.participant)
|
|
313
|
+
descOwnerLid = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant) : undefined
|
|
309
314
|
}
|
|
310
315
|
|
|
311
|
-
const mode = group.attrs.addressing_mode
|
|
312
316
|
const groupId = group.attrs.id.includes('@') ? group.attrs.id : WABinary_1.jidEncode(group.attrs.id, 'g.us')
|
|
313
317
|
const eph = WABinary_1.getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration
|
|
314
318
|
const memberAddMode = WABinary_1.getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add'
|
|
@@ -317,14 +321,18 @@ const extractGroupMetadata = (result) => {
|
|
|
317
321
|
id: groupId,
|
|
318
322
|
addressingMode: mode,
|
|
319
323
|
subject: group.attrs.subject,
|
|
320
|
-
subjectOwner: mode ===
|
|
324
|
+
subjectOwner: mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.s_o_pn : group.attrs.s_o,
|
|
325
|
+
subjectOwnerLid: group.attrs.s_o,
|
|
321
326
|
subjectTime: +group.attrs.s_t,
|
|
322
327
|
size: group.attrs?.size ? +group.attrs.size : WABinary_1.getBinaryNodeChildren(group, 'participant').length,
|
|
323
328
|
creation: +group.attrs.creation,
|
|
324
|
-
owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode ===
|
|
329
|
+
owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.creator_pn : group.attrs.creator) : undefined,
|
|
330
|
+
ownerLid: group.attrs.creator ? WABinary_1.jidNormalizedUser(group.attrs.creator) : undefined,
|
|
325
331
|
ownerCountry: group.attrs.creator_country_code,
|
|
326
332
|
desc,
|
|
327
333
|
descId,
|
|
334
|
+
descOwner,
|
|
335
|
+
descOwnerLid,
|
|
328
336
|
linkedParent: WABinary_1.getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
|
|
329
337
|
restrict: !!WABinary_1.getBinaryNodeChild(group, 'locked'),
|
|
330
338
|
announce: !!WABinary_1.getBinaryNodeChild(group, 'announcement'),
|
|
@@ -334,11 +342,11 @@ const extractGroupMetadata = (result) => {
|
|
|
334
342
|
memberAddMode,
|
|
335
343
|
participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
|
|
336
344
|
return {
|
|
337
|
-
id:
|
|
338
|
-
jid:
|
|
339
|
-
lid:
|
|
340
|
-
admin: (attrs.type || null)
|
|
341
|
-
}
|
|
345
|
+
id: mode === Types_1.WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid,
|
|
346
|
+
jid: mode === Types_1.WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid,
|
|
347
|
+
lid: mode === Types_1.WAMessageAddressingMode.LID ? attrs.jid : attrs.lid,
|
|
348
|
+
admin: (attrs.type || null),
|
|
349
|
+
}
|
|
342
350
|
}),
|
|
343
351
|
ephemeralDuration: eph ? +eph : undefined,
|
|
344
352
|
}
|
package/lib/Socket/index.d.ts
CHANGED
|
@@ -1,83 +1,83 @@
|
|
|
1
|
-
import { UserFacingSocketConfig, ContactAction } from '
|
|
1
|
+
import { UserFacingSocketConfig, ContactAction } from '@neelegirl/baileys/lib/Types'
|
|
2
2
|
|
|
3
3
|
declare const makeWASocket: (config: UserFacingSocketConfig) => {
|
|
4
|
-
logger: import("
|
|
5
|
-
getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("
|
|
6
|
-
getCatalog: ({ jid, limit, cursor }: import("
|
|
7
|
-
products: import("
|
|
4
|
+
logger: import("@neelegirl/baileys/lib/Utils/logger").ILogger
|
|
5
|
+
getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("@neelegirl/baileys/lib/Types").OrderDetails>
|
|
6
|
+
getCatalog: ({ jid, limit, cursor }: import("@neelegirl/baileys/lib/Types").GetCatalogOptions) => Promise<{
|
|
7
|
+
products: import("@neelegirl/baileys/lib/Types").Product[]
|
|
8
8
|
nextPageCursor: string | undefined
|
|
9
9
|
}>
|
|
10
10
|
getCollections: (jid?: string | undefined, limit?: number) => Promise<{
|
|
11
|
-
collections: import("
|
|
11
|
+
collections: import("@neelegirl/baileys/lib/Types").CatalogCollection[]
|
|
12
12
|
}>
|
|
13
|
-
productCreate: (create: import("
|
|
13
|
+
productCreate: (create: import("@neelegirl/baileys/lib/Types").ProductCreate) => Promise<import("@neelegirl/baileys/lib/Types").Product>
|
|
14
14
|
productDelete: (productIds: string[]) => Promise<{
|
|
15
15
|
deleted: number
|
|
16
16
|
}>
|
|
17
|
-
productUpdate: (productId: string, update: import("
|
|
18
|
-
sendMessageAck: ({ tag, attrs, content }: import("
|
|
19
|
-
sendRetryRequest: (node: import("
|
|
17
|
+
productUpdate: (productId: string, update: import("@neelegirl/baileys/lib/Types").ProductUpdate) => Promise<import("@neelegirl/baileys/lib/Types").Product>
|
|
18
|
+
sendMessageAck: ({ tag, attrs, content }: import("@neelegirl/baileys/lib").BinaryNode, errorCode?: number | undefined) => Promise<void>
|
|
19
|
+
sendRetryRequest: (node: import("@neelegirl/baileys/lib").BinaryNode, forceIncludeKeys?: boolean) => Promise<void>
|
|
20
20
|
offerCall: (toJid: string, isVideo?: boolean) => Promise<{
|
|
21
21
|
id: any
|
|
22
22
|
to: string
|
|
23
23
|
}>
|
|
24
24
|
nodelogger: (node: BinaryNode) => Promise<void>
|
|
25
25
|
rejectCall: (callId: string, callFrom: string) => Promise<void>
|
|
26
|
-
fetchMessageHistory: (count: number, oldestMsgKey: import("
|
|
27
|
-
requestPlaceholderResend: (messageKey: import("
|
|
28
|
-
getPrivacyTokens: (jids: string[]) => Promise<import("
|
|
26
|
+
fetchMessageHistory: (count: number, oldestMsgKey: import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey, oldestMsgTimestamp: number | import("long").Long) => Promise<string>
|
|
27
|
+
requestPlaceholderResend: (messageKey: import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey) => Promise<string | undefined>
|
|
28
|
+
getPrivacyTokens: (jids: string[]) => Promise<import("@neelegirl/baileys/lib").BinaryNode>
|
|
29
29
|
assertSessions: (jids: string[], force: boolean) => Promise<boolean>
|
|
30
|
-
relayMessage: (jid: string, message: import("
|
|
31
|
-
sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: import("
|
|
32
|
-
sendReceipts: (keys: import("
|
|
33
|
-
readMessages: (keys: import("
|
|
34
|
-
refreshMediaConn: (forceGet?: boolean) => Promise<import("
|
|
35
|
-
waUploadToServer: import("
|
|
30
|
+
relayMessage: (jid: string, message: import("@neelegirl/baileys/lib/Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: import("@neelegirl/baileys/lib/Types").MessageRelayOptions) => Promise<string>
|
|
31
|
+
sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: import("@neelegirl/baileys/lib/Types").MessageReceiptType) => Promise<void>
|
|
32
|
+
sendReceipts: (keys: import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey[], type: import("@neelegirl/baileys/lib/Types").MessageReceiptType) => Promise<void>
|
|
33
|
+
readMessages: (keys: import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey[]) => Promise<void>
|
|
34
|
+
refreshMediaConn: (forceGet?: boolean) => Promise<import("@neelegirl/baileys/lib/Types").MediaConnInfo>
|
|
35
|
+
waUploadToServer: import("@neelegirl/baileys/lib/Types").WAMediaUploadFunction
|
|
36
36
|
fetchPrivacySettings: (force?: boolean) => Promise<{
|
|
37
37
|
[_: string]: string
|
|
38
38
|
}>
|
|
39
|
-
sendPeerDataOperationMessage: (pdoMessage: import("
|
|
40
|
-
createParticipantNodes: (jids: string[], message: import("
|
|
39
|
+
sendPeerDataOperationMessage: (pdoMessage: import("@neelegirl/baileys/lib/Types").WAProto.Message.IPeerDataOperationRequestMessage) => Promise<string>
|
|
40
|
+
createParticipantNodes: (jids: string[], message: import("@neelegirl/baileys/lib/Types").WAProto.IMessage, extraAttrs?: {
|
|
41
41
|
[key: string]: string
|
|
42
42
|
} | undefined) => Promise<{
|
|
43
|
-
nodes: import("
|
|
43
|
+
nodes: import("@neelegirl/baileys/lib").BinaryNode[]
|
|
44
44
|
shouldIncludeDeviceIdentity: boolean
|
|
45
45
|
}>
|
|
46
46
|
profilePictureUrl: (jids: string) => Promise<string>
|
|
47
|
-
getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<import("
|
|
47
|
+
getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<import("@neelegirl/baileys/lib").JidWithDevice[]>
|
|
48
48
|
getEphemeralGroup: (jid: string) => Promise<number>
|
|
49
|
-
updateMediaMessage: (message: import("
|
|
50
|
-
sendStatusMentions: (content: import("
|
|
51
|
-
sendMessage: (jid: string, content: import("
|
|
49
|
+
updateMediaMessage: (message: import("@neelegirl/baileys/lib/Types").WAProto.IWebMessageInfo) => Promise<import("@neelegirl/baileys/lib/Types").WAProto.IWebMessageInfo>
|
|
50
|
+
sendStatusMentions: (content: import("@neelegirl/baileys/lib/Types").WAProto.IMessage, jid: string, Private?: boolean) => Promise<string>
|
|
51
|
+
sendMessage: (jid: string, content: import("@neelegirl/baileys/lib/Types").AnyMessageContent, options?: import("@neelegirl/baileys/lib/Types").MiscMessageGenerationOptions) => Promise<import("@neelegirl/baileys/lib/Types").WAProto.WebMessageInfo | undefined>
|
|
52
52
|
subscribeNewsletterUpdates: (jid: string) => Promise<{
|
|
53
53
|
duration: string
|
|
54
54
|
}>
|
|
55
|
-
newsletterReactionMode: (jid: string, mode: import("
|
|
55
|
+
newsletterReactionMode: (jid: string, mode: import("@neelegirl/baileys/lib/Types").NewsletterReactionMode) => Promise<void>
|
|
56
56
|
newsletterUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>
|
|
57
57
|
newsletterUpdateName: (jid: string, name: string) => Promise<void>
|
|
58
|
-
newsletterUpdatePicture: (jid: string, content: import("
|
|
58
|
+
newsletterUpdatePicture: (jid: string, content: import("@neelegirl/baileys/lib/Types").WAMediaUpload) => Promise<void>
|
|
59
59
|
newsletterRemovePicture: (jid: string) => Promise<void>
|
|
60
60
|
newsletterUnfollow: (jid: string) => Promise<void>
|
|
61
61
|
newsletterFollow: (jid: string) => Promise<void>
|
|
62
62
|
newsletterUnmute: (jid: string) => Promise<void>
|
|
63
63
|
newsletterMute: (jid: string) => Promise<void>
|
|
64
|
-
newsletterCreate: (name: string, description?: string, picture?: import("
|
|
64
|
+
newsletterCreate: (name: string, description?: string, picture?: import("@neelegirl/baileys/lib/Types").WAMediaUpload) => Promise<import("@neelegirl/baileys/lib/Types").NewsletterMetadata>
|
|
65
65
|
newsletterQuery: (jid: string, type: string, content: BinaryNode) => Promise<BinaryNode>
|
|
66
66
|
newsletterWMexQuery: (jid?: string | undefined, query_id: number, content: BinaryNode) => Promise<BinaryNode>
|
|
67
|
-
newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("
|
|
67
|
+
newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("@neelegirl/baileys/lib/Types").NewsletterViewRole | undefined) => Promise<import("@neelegirl/baileys/lib/Types").NewsletterMetadata>
|
|
68
68
|
newsletterFetchAllParticipating: () => Promise<{
|
|
69
|
-
[_: string]: import("
|
|
69
|
+
[_: string]: import("@neelegirl/baileys/lib/Types").NewsletterMetadata
|
|
70
70
|
}>
|
|
71
71
|
newsletterAdminCount: (jid: string) => Promise<number>
|
|
72
72
|
newsletterChangeOwner: (jid: string, userLid: string) => Promise<void>
|
|
73
73
|
newsletterDemote: (jid: string, userLid: string) => Promise<void>
|
|
74
74
|
newsletterDelete: (jid: string) => Promise<void>
|
|
75
75
|
newsletterReactMessage: (jid: string, server_id: string, code?: string | undefined) => Promise<void>
|
|
76
|
-
newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number | undefined) => Promise<import("
|
|
77
|
-
newsletterFetchUpdates: (jid: string, count: number, after?: number | undefined, since?: number | undefined) => Promise<import("
|
|
76
|
+
newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number | undefined) => Promise<import("@neelegirl/baileys/lib/Types").NewsletterFetchedUpdate[]>
|
|
77
|
+
newsletterFetchUpdates: (jid: string, count: number, after?: number | undefined, since?: number | undefined) => Promise<import("@neelegirl/baileys/lib/Types").NewsletterFetchedUpdate[]>
|
|
78
78
|
groupQuery: (jid: string, type: string, content: BinaryNode) => Promise<BinaryNode>
|
|
79
|
-
groupMetadata: (jid: string) => Promise<import("
|
|
80
|
-
groupCreate: (subject: string, participants: string[]) => Promise<import("
|
|
79
|
+
groupMetadata: (jid: string) => Promise<import("@neelegirl/baileys/lib/Types").GroupMetadata>
|
|
80
|
+
groupCreate: (subject: string, participants: string[]) => Promise<import("@neelegirl/baileys/lib/Types").GroupMetadata>
|
|
81
81
|
groupLeave: (id: string) => Promise<void>
|
|
82
82
|
groupUpdateSubject: (jid: string, subject: string) => Promise<void>
|
|
83
83
|
groupRequestParticipantsList: (jid: string) => Promise<{
|
|
@@ -87,32 +87,32 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
|
|
|
87
87
|
status: string
|
|
88
88
|
jid: string
|
|
89
89
|
}[]>
|
|
90
|
-
groupParticipantsUpdate: (jid: string, participants: string[], action: import("
|
|
90
|
+
groupParticipantsUpdate: (jid: string, participants: string[], action: import("@neelegirl/baileys/lib/Types").ParticipantAction) => Promise<{
|
|
91
91
|
status: string
|
|
92
92
|
jid: string
|
|
93
|
-
content: import("
|
|
93
|
+
content: import("@neelegirl/baileys/lib").BinaryNode
|
|
94
94
|
}[]>
|
|
95
95
|
groupUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>
|
|
96
96
|
groupInviteCode: (jid: string) => Promise<string | undefined>
|
|
97
97
|
groupRevokeInvite: (jid: string) => Promise<string | undefined>
|
|
98
98
|
groupAcceptInvite: (code: string) => Promise<string | undefined>
|
|
99
99
|
groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>
|
|
100
|
-
groupAcceptInviteV4: (key: string | import("
|
|
101
|
-
groupGetInviteInfo: (code: string) => Promise<import("
|
|
100
|
+
groupAcceptInviteV4: (key: string | import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey, inviteMessage: import("@neelegirl/baileys/lib/Types").WAProto.Message.IGroupInviteMessage) => Promise<string>
|
|
101
|
+
groupGetInviteInfo: (code: string) => Promise<import("@neelegirl/baileys/lib/Types").GroupMetadata>
|
|
102
102
|
groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>
|
|
103
103
|
groupSettingUpdate: (jid: string, setting: "announcement" | "locked" | "not_announcement" | "unlocked") => Promise<void>
|
|
104
104
|
groupMemberAddMode: (jid: string, mode: "all_member_add" | "admin_add") => Promise<void>
|
|
105
105
|
groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>
|
|
106
106
|
groupFetchAllParticipating: () => Promise<{
|
|
107
|
-
[_: string]: import("
|
|
107
|
+
[_: string]: import("@neelegirl/baileys/lib/Types").GroupMetadata
|
|
108
108
|
}>
|
|
109
109
|
processingMutex: {
|
|
110
110
|
mutex<T>(code: () => T | Promise<T>): Promise<T>
|
|
111
111
|
}
|
|
112
|
-
upsertMessage: (msg: import("
|
|
113
|
-
appPatch: (patchCreate: import("
|
|
112
|
+
upsertMessage: (msg: import("@neelegirl/baileys/lib/Types").WAProto.IWebMessageInfo, type: import("@neelegirl/baileys/lib/Types").MessageUpsertType) => Promise<void>
|
|
113
|
+
appPatch: (patchCreate: import("@neelegirl/baileys/lib/Types").WAPatchCreate) => Promise<void>
|
|
114
114
|
createCallLink: (type: 'audio' | 'video', event?: number, timeoutMs?: number) => Promise<void>
|
|
115
|
-
sendPresenceUpdate: (type: import("
|
|
115
|
+
sendPresenceUpdate: (type: import("@neelegirl/baileys/lib/Types").WAPresence, toJid?: string | undefined) => Promise<void>
|
|
116
116
|
presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>
|
|
117
117
|
getBotListV2: () => Promise<BotListInfo[]>
|
|
118
118
|
getLidUser: (jid: string) => Promise<{
|
|
@@ -124,68 +124,68 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
|
|
|
124
124
|
exists: unknown
|
|
125
125
|
}[] | undefined>
|
|
126
126
|
fetchBlocklist: () => Promise<string[]>
|
|
127
|
-
fetchStatus: (...jids: string[]) => Promise<import("
|
|
128
|
-
fetchDisappearingDuration: (...jids: string[]) => Promise<import("
|
|
129
|
-
updateProfilePicture: (jid: string, content: import("
|
|
127
|
+
fetchStatus: (...jids: string[]) => Promise<import("@neelegirl/baileys/lib").USyncQueryResultList[] | undefined>
|
|
128
|
+
fetchDisappearingDuration: (...jids: string[]) => Promise<import("@neelegirl/baileys/lib").USyncQueryResultList[] | undefined>
|
|
129
|
+
updateProfilePicture: (jid: string, content: import("@neelegirl/baileys/lib/Types").WAMediaUpload) => Promise<void>
|
|
130
130
|
removeProfilePicture: (jid: string) => Promise<void>
|
|
131
131
|
updateProfileStatus: (status: string) => Promise<void>
|
|
132
132
|
updateProfileName: (name: string) => Promise<void>
|
|
133
133
|
updateBlockStatus: (jid: string, action: "block" | "unblock") => Promise<void>
|
|
134
|
-
updateCallPrivacy: (value: import("
|
|
135
|
-
updateLastSeenPrivacy: (value: import("
|
|
136
|
-
updateOnlinePrivacy: (value: import("
|
|
137
|
-
updateProfilePicturePrivacy: (value: import("
|
|
138
|
-
updateStatusPrivacy: (value: import("
|
|
139
|
-
updateReadReceiptsPrivacy: (value: import("
|
|
140
|
-
updateGroupsAddPrivacy: (value: import("
|
|
134
|
+
updateCallPrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyCallValue) => Promise<void>
|
|
135
|
+
updateLastSeenPrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyValue) => Promise<void>
|
|
136
|
+
updateOnlinePrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyOnlineValue) => Promise<void>
|
|
137
|
+
updateProfilePicturePrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyValue) => Promise<void>
|
|
138
|
+
updateStatusPrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyValue) => Promise<void>
|
|
139
|
+
updateReadReceiptsPrivacy: (value: import("@neelegirl/baileys/lib/Types").WAReadReceiptsValue) => Promise<void>
|
|
140
|
+
updateGroupsAddPrivacy: (value: import("@neelegirl/baileys/lib/Types").WAPrivacyGroupAddValue) => Promise<void>
|
|
141
141
|
updateDefaultDisappearingMode: (duration: number) => Promise<void>
|
|
142
142
|
updateDisableLinkPreviewsPrivacy: (isPreviewsDisabled: boolean) => Promise<void>
|
|
143
|
-
getBusinessProfile: (jid: string) => Promise<void | import("
|
|
143
|
+
getBusinessProfile: (jid: string) => Promise<void | import("@neelegirl/baileys/lib/Types").WABusinessProfile>
|
|
144
144
|
resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
|
|
145
|
-
chatModify: (mod: import("
|
|
145
|
+
chatModify: (mod: import("@neelegirl/baileys/lib/Types").ChatModification, jid: string) => Promise<void>
|
|
146
146
|
cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>
|
|
147
|
-
addLabel: (jid: string, labels: import("
|
|
147
|
+
addLabel: (jid: string, labels: import("@neelegirl/baileys/lib/Types/Label").LabelActionBody) => Promise<void>
|
|
148
148
|
addChatLabel: (jid: string, labelId: string) => Promise<void>
|
|
149
149
|
removeChatLabel: (jid: string, labelId: string) => Promise<void>
|
|
150
150
|
addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>
|
|
151
151
|
removeMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>
|
|
152
|
-
clearMessage: (jid: string, key: import("
|
|
152
|
+
clearMessage: (jid: string, key: import("@neelegirl/baileys/lib/Types").WAProto.IMessageKey, timeStamp: number | import("long").Long) => Promise<void>
|
|
153
153
|
star: (jid: string, messages: {
|
|
154
154
|
id: string
|
|
155
155
|
fromMe?: boolean | undefined
|
|
156
156
|
}[], star: boolean) => Promise<void>
|
|
157
157
|
addOrEditContact: (jid: string, contact: ContactAction) => Promise<void>
|
|
158
158
|
removeContact: (jid: string) => Promise<void>
|
|
159
|
-
executeUSyncQuery: (usyncQuery: import("
|
|
159
|
+
executeUSyncQuery: (usyncQuery: import("@neelegirl/baileys/lib").USyncQuery) => Promise<import("@neelegirl/baileys/lib").USyncQueryResult | undefined>
|
|
160
160
|
type: "md"
|
|
161
|
-
ws: import("
|
|
162
|
-
ev: import("
|
|
163
|
-
process(handler: (events: Partial<import("
|
|
161
|
+
ws: import("@neelegirl/baileys/lib/Socket/Client").WebSocketClient
|
|
162
|
+
ev: import("@neelegirl/baileys/lib/Types").BaileysEventEmitter & {
|
|
163
|
+
process(handler: (events: Partial<import("@neelegirl/baileys/lib/Types").BaileysEventMap>) => void | Promise<void>): () => void
|
|
164
164
|
buffer(): void
|
|
165
165
|
createBufferedFunction<A extends any[], T_1>(work: (...args: A) => Promise<T_1>): (...args: A) => Promise<T_1>
|
|
166
166
|
flush(force?: boolean | undefined): boolean
|
|
167
167
|
isBuffering(): boolean
|
|
168
168
|
}
|
|
169
169
|
authState: {
|
|
170
|
-
creds: import("
|
|
171
|
-
keys: import("
|
|
170
|
+
creds: import("@neelegirl/baileys/lib/Types").AuthenticationCreds
|
|
171
|
+
keys: import("@neelegirl/baileys/lib/Types").SignalKeyStoreWithTransaction
|
|
172
172
|
}
|
|
173
|
-
signalRepository: import("
|
|
174
|
-
user: import("
|
|
173
|
+
signalRepository: import("@neelegirl/baileys/lib/Types").SignalRepository
|
|
174
|
+
user: import("@neelegirl/baileys/lib/Types").Contact | undefined
|
|
175
175
|
generateMessageTag: () => string
|
|
176
|
-
query: (node: import("
|
|
176
|
+
query: (node: import("@neelegirl/baileys/lib").BinaryNode, timeoutMs?: number | undefined) => Promise<import("@neelegirl/baileys/lib").BinaryNode>
|
|
177
177
|
waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<T_2>
|
|
178
178
|
waitForSocketOpen: () => Promise<void>
|
|
179
179
|
sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>
|
|
180
|
-
sendNode: (frame: import("
|
|
180
|
+
sendNode: (frame: import("@neelegirl/baileys/lib").BinaryNode) => Promise<void>
|
|
181
181
|
logout: (msg?: string | undefined) => Promise<void>
|
|
182
182
|
end: (error: Error | undefined) => void
|
|
183
183
|
onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void
|
|
184
184
|
uploadPreKeys: (count?: number) => Promise<void>
|
|
185
185
|
uploadPreKeysToServerIfRequired: () => Promise<void>
|
|
186
186
|
requestPairingCode: (phoneNumber: string, code?: string) => Promise<string>
|
|
187
|
-
waitForConnectionUpdate: (check: (u: Partial<import("
|
|
188
|
-
sendWAMBuffer: (wamBuffer: Buffer) => Promise<import("
|
|
187
|
+
waitForConnectionUpdate: (check: (u: Partial<import("@neelegirl/baileys/lib/Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>
|
|
188
|
+
sendWAMBuffer: (wamBuffer: Buffer) => Promise<import("@neelegirl/baileys/lib").BinaryNode>
|
|
189
189
|
}
|
|
190
190
|
|
|
191
191
|
export default makeWASocket
|
package/lib/Socket/index.js
CHANGED
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true })
|
|
4
4
|
|
|
5
5
|
const Defaults_1 = require("../Defaults")
|
|
6
|
-
const
|
|
6
|
+
const communities_1 = require("./communities")
|
|
7
|
+
|
|
7
8
|
// export the last socket layer
|
|
8
9
|
const makeWASocket = (config) => {
|
|
9
10
|
const newConfig = {
|
|
@@ -17,7 +18,7 @@ const makeWASocket = (config) => {
|
|
|
17
18
|
newConfig.shouldSyncHistoryMessage = () => !!newConfig.syncFullHistory
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
return
|
|
21
|
+
return communities_1.makeCommunitiesSocket(newConfig)
|
|
21
22
|
}
|
|
22
23
|
|
|
23
24
|
exports.default = makeWASocket
|
|
@@ -10,7 +10,6 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
|
|
|
10
10
|
id: any
|
|
11
11
|
to: string
|
|
12
12
|
}>
|
|
13
|
-
nodelogger: (node: BinaryNode) => Promise<void>
|
|
14
13
|
rejectCall: (callId: string, callFrom: string) => Promise<void>
|
|
15
14
|
fetchMessageHistory: (count: number, oldestMsgKey: WAMessageKey, oldestMsgTimestamp: number | Long) => Promise<string>
|
|
16
15
|
requestPlaceholderResend: (messageKey: WAMessageKey) => Promise<string | undefined>
|
|
@@ -107,10 +106,6 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
|
|
|
107
106
|
lid: string
|
|
108
107
|
id: string
|
|
109
108
|
}[] | undefined>
|
|
110
|
-
onWhatsApp: (...jids: string[]) => Promise<{
|
|
111
|
-
jid: string
|
|
112
|
-
exists: unknown
|
|
113
|
-
}[] | undefined>
|
|
114
109
|
fetchBlocklist: () => Promise<string[]>
|
|
115
110
|
fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>
|
|
116
111
|
fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>
|
|
@@ -142,6 +137,8 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
|
|
|
142
137
|
id: string
|
|
143
138
|
fromMe?: boolean | undefined
|
|
144
139
|
}[], star: boolean) => Promise<void>
|
|
140
|
+
addOrEditQuickReply: (quickReply: import("../Types/Bussines").QuickReplyAction) => Promise<void>
|
|
141
|
+
removeQuickReply: (timestamp: string) => Promise<void>
|
|
145
142
|
addOrEditContact: (jid: string, contact: ContactAction) => Promise<void>
|
|
146
143
|
removeContact: (jid: string) => Promise<void>
|
|
147
144
|
executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>
|
|
@@ -174,4 +171,4 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
|
|
|
174
171
|
requestPairingCode: (phoneNumber: string, code?: string) => Promise<string>
|
|
175
172
|
waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>
|
|
176
173
|
sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>
|
|
177
|
-
}
|
|
174
|
+
}
|