resolves theopenconversationkit#1630 [Whatsapp cloud Connector] fix o…

…n Load profile + handleInteractiveMessage
asus007 · Jun 14, 2024 · 4acd3bb · 4acd3bb
1 parent 0d92962
commit 4acd3bb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/bot/connector-whatsapp-cloud/src/main/kotlin/WhatsAppConnectorCloudConnector.kt b/bot/connector-whatsapp-cloud/src/main/kotlin/WhatsAppConnectorCloudConnector.kt
@@ -180,6 +180,4 @@ class WhatsAppConnectorCloudConnector internal constructor(
                 }
         }
     }
-
-    override fun loadProfile(callback: ConnectorCallback, userId: PlayerId): UserPreferences = UserPreferences()
 }
diff --git a/bot/connector-whatsapp-cloud/src/main/kotlin/services/WhatsAppCloudApiService.kt b/bot/connector-whatsapp-cloud/src/main/kotlin/services/WhatsAppCloudApiService.kt
@@ -92,11 +92,21 @@ class WhatsAppCloudApiService(private val apiClient: WhatsAppCloudApiClient) {
         token: String,
         messageRequest: WhatsAppCloudSendBotInteractiveMessage
     ) {
-        messageRequest.interactive.action?.buttons?.let { buttons ->
-            val updateButtons = buttons.map { button ->
-                updateButton(button)
+        messageRequest.interactive.action?.let { action ->
+            if (!action.buttons.isNullOrEmpty()) {
+                val updateButtons = action.buttons.map { button ->
+                    updateButton(button)
+                }
+                sendUpdatedInteractiveMessage(phoneNumberId, token, messageRequest, updateButtons)
+            } else {
+                send(messageRequest) {
+                    apiClient.graphApi.sendMessage(
+                        phoneNumberId,
+                        token,
+                        messageRequest
+                    ).execute()
+                }
             }
-            sendUpdatedInteractiveMessage(phoneNumberId, token, messageRequest, updateButtons)
         }
     }
 
@@ -348,4 +358,4 @@ class WhatsAppCloudApiService(private val apiClient: WhatsAppCloudApiClient) {
     }
 }
 
-private const val IMAGE_ID_CACHE = "whatsapp_image_id_cache"
+private const val IMAGE_ID_CACHE = "whatsapp_image_id_cache"