From 3478f2b6796a31cf678752c2ab4b0b343051ebc6 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sat, 6 May 2023 01:27:50 +0300 Subject: [PATCH 1/6] Update messages.ts --- src/Utils/messages.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts index 7a4ef9a..ceb7b37 100644 --- a/src/Utils/messages.ts +++ b/src/Utils/messages.ts @@ -487,7 +487,17 @@ export const generateWAMessageContent = async( m[messageType].contextInfo = m[messageType] || { } m[messageType].contextInfo.mentionedJid = message.mentions } - + + if('edit' in message) { + m = { + protocolMessage: { + key: message.edit, + editedMessage: m, + type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT + } + } + } + return WAProto.Message.fromObject(m) } @@ -886,4 +896,4 @@ export const assertMediaContent = (content: proto.IMessage | null | undefined) = } return mediaContent -} \ No newline at end of file +} From f5742ae33c86d19832d13f5ab530e36dd44fa537 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sat, 6 May 2023 01:31:07 +0300 Subject: [PATCH 2/6] Update Message.ts --- src/Types/Message.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Types/Message.ts b/src/Types/Message.ts index 34853ed..dc50f3c 100644 --- a/src/Types/Message.ts +++ b/src/Types/Message.ts @@ -55,6 +55,7 @@ type Mentionable = { type ViewOnce = { viewOnce?: boolean } + type Buttonable = { /** add buttons to the message */ buttons?: proto.Message.ButtonsMessage.IButton[] @@ -65,6 +66,9 @@ type Templatable = { footer?: string } +type Editable = { + edited?: WAMessageKey +} type Listable = { /** Sections of the List */ sections?: proto.Message.ListMessage.ISection[] @@ -117,7 +121,7 @@ export type AnyMediaMessageContent = ( fileName?: string caption?: string } & Buttonable & Templatable)) - & { mimetype?: string } + & { mimetype?: string } & Editable export type ButtonReplyInfo = { displayText: string @@ -134,11 +138,11 @@ export type AnyRegularMessageContent = ( text: string linkPreview?: WAUrlInfo | null } - & Mentionable & Buttonable & Templatable & Listable) + & Mentionable & Buttonable & Templatable & Listable & Editable) | AnyMediaMessageContent | ({ poll: PollMessageOptions - } & Mentionable & Buttonable & Templatable) + } & Mentionable & Buttonable & Templatable & Editable) | { contacts: { displayName?: string From 66c2e9c0b6438c523019602d695e2a3e15f4b16f Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sat, 6 May 2023 01:44:29 +0300 Subject: [PATCH 3/6] Update Message.ts --- src/Types/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Types/Message.ts b/src/Types/Message.ts index dc50f3c..a7a1a04 100644 --- a/src/Types/Message.ts +++ b/src/Types/Message.ts @@ -67,7 +67,7 @@ type Templatable = { footer?: string } type Editable = { - edited?: WAMessageKey + edit?: WAMessageKey } type Listable = { /** Sections of the List */ From 47f570cd86d224034fd03625c989978275ac775a Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sat, 6 May 2023 01:54:13 +0300 Subject: [PATCH 4/6] Update typedoc.json --- typedoc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/typedoc.json b/typedoc.json index 5c7b1d1..b19ab35 100644 --- a/typedoc.json +++ b/typedoc.json @@ -4,5 +4,6 @@ "excludeProtected": true, "excludeExternals": true, "includeVersion": false, + "declaration": false, "out": "docs" } From 49c2195f82db5d4f0e417fc92403b83fd5efceba Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Wed, 10 May 2023 23:48:09 +0300 Subject: [PATCH 5/6] ESLINT --- src/Utils/messages.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts index ceb7b37..779e36c 100644 --- a/src/Utils/messages.ts +++ b/src/Utils/messages.ts @@ -487,8 +487,8 @@ export const generateWAMessageContent = async( m[messageType].contextInfo = m[messageType] || { } m[messageType].contextInfo.mentionedJid = message.mentions } - - if('edit' in message) { + + if('edit' in message) { m = { protocolMessage: { key: message.edit, @@ -496,8 +496,8 @@ export const generateWAMessageContent = async( type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT } } - } - + } + return WAProto.Message.fromObject(m) } From 9cce97e55567f910db21463750112e2cf0b8fcf2 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Wed, 10 May 2023 23:49:39 +0300 Subject: [PATCH 6/6] ESLint fix --- src/Utils/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts index 779e36c..3de8edc 100644 --- a/src/Utils/messages.ts +++ b/src/Utils/messages.ts @@ -497,7 +497,7 @@ export const generateWAMessageContent = async( } } } - + return WAProto.Message.fromObject(m) }