From 6b60168d3a171c5e97404a911f282f78b8d9133a Mon Sep 17 00:00:00 2001 From: Pieter Joost van de Sande Date: Wed, 27 Dec 2023 23:42:36 +0100 Subject: [PATCH 1/6] Add Native Flow Response reply type definition --- src/types.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/types.ts b/src/types.ts index f05d2147..779a65c4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -533,6 +533,12 @@ export type ServerInteractiveMessage = { }; button_reply: never; }; + | { + "type":"nfm_reply"; + "nfm_reply": { + "response_json": any, + } + } ⁠ }; export type ServerButtonMessage = { From f151793bbcc930930115d0145ce1f65ca0ef84a3 Mon Sep 17 00:00:00 2001 From: Pieter Joost van de Sande Date: Wed, 27 Dec 2023 23:32:14 +0000 Subject: [PATCH 2/6] ci: resolve build error --- src/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/types.ts b/src/types.ts index 779a65c4..79404cfd 100644 --- a/src/types.ts +++ b/src/types.ts @@ -532,13 +532,13 @@ export type ServerInteractiveMessage = { description: string; }; button_reply: never; - }; + } | { "type":"nfm_reply"; "nfm_reply": { "response_json": any, } - } ⁠ + }; }; export type ServerButtonMessage = { From c81c15b744ecb8cf45311231740e4435497877fa Mon Sep 17 00:00:00 2001 From: Pieter Joost van de Sande Date: Wed, 27 Dec 2023 23:43:13 +0000 Subject: [PATCH 3/6] feat: tighten nfm reply message type --- src/types.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/types.ts b/src/types.ts index 79404cfd..a70b7ecc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -535,10 +535,23 @@ export type ServerInteractiveMessage = { } | { "type":"nfm_reply"; - "nfm_reply": { - "response_json": any, + "nfm_reply": + | { + "name": "address_reply", + "body": string | undefined, + "response_json": any } - }; + | { + "name": "flow", + "body": "Sent", + "response_json": any + } + | { + "name": string | undefined, + "body": string | undefined, + "response_json": any + }; + }; }; export type ServerButtonMessage = { From 2f9883d6b32a2b613cdaaabbf5e88614677647df Mon Sep 17 00:00:00 2001 From: Pieter Joost van de Sande Date: Thu, 28 Dec 2023 08:51:54 +0100 Subject: [PATCH 4/6] chore: fix linting error no-explicit-any --- src/types.ts | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/types.ts b/src/types.ts index a70b7ecc..d56c3f6b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -534,24 +534,24 @@ export type ServerInteractiveMessage = { button_reply: never; } | { - "type":"nfm_reply"; - "nfm_reply": - | { - "name": "address_reply", - "body": string | undefined, - "response_json": any - } - | { - "name": "flow", - "body": "Sent", - "response_json": any - } - | { - "name": string | undefined, - "body": string | undefined, - "response_json": any - }; - }; + type: "nfm_reply"; + nfm_reply: + | { + name: "address_reply"; + body: string | undefined; + response_json: unknown; + } + | { + name: "flow"; + body: "Sent"; + response_json: unknown; + } + | { + name: string | undefined; + body: string | undefined; + response_json: unknown; + }; + }; }; export type ServerButtonMessage = { From 5d4e6717447e7fa4655a09dc067dc32196080b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Raiti?= <46955459+Secreto31126@users.noreply.github.com> Date: Thu, 28 Dec 2023 20:10:02 -0300 Subject: [PATCH 5/6] Minor changes --- src/types.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/types.ts b/src/types.ts index d56c3f6b..35f31663 100644 --- a/src/types.ts +++ b/src/types.ts @@ -523,6 +523,7 @@ export type ServerInteractiveMessage = { title: string; }; list_reply: never; + nfm_reply: never; } | { type: "list_reply"; @@ -532,13 +533,14 @@ export type ServerInteractiveMessage = { description: string; }; button_reply: never; + nfm_reply: never; } | { type: "nfm_reply"; nfm_reply: | { name: "address_reply"; - body: string | undefined; + body?: string; response_json: unknown; } | { @@ -547,10 +549,12 @@ export type ServerInteractiveMessage = { response_json: unknown; } | { - name: string | undefined; - body: string | undefined; + name?: string; + body?: string; response_json: unknown; }; + button_reply: never; + list_reply: never; }; }; From 48e64d4e5464589a523db085761ff833728a557f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Raiti?= <46955459+Secreto31126@users.noreply.github.com> Date: Thu, 28 Dec 2023 20:11:55 -0300 Subject: [PATCH 6/6] Replaced address_reply with address_message Based on the [documentation](https://developers.facebook.com/docs/whatsapp/cloud-api/guides/send-messages/?locale=en#receive-notifications-for-address-submissions) --- src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types.ts b/src/types.ts index 35f31663..ab11d778 100644 --- a/src/types.ts +++ b/src/types.ts @@ -539,7 +539,7 @@ export type ServerInteractiveMessage = { type: "nfm_reply"; nfm_reply: | { - name: "address_reply"; + name: "address_message"; body?: string; response_json: unknown; }