Skip to content

Commit c3e8d5f

Browse files
author
BENKACI Amira
committed
send message type image
1 parent c46d40f commit c3e8d5f

14 files changed

+22
-18
lines changed

bot/connector-whatsapp-cloud/src/main/kotlin/WhatsAppCloudBuilder.kt

+7-3
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,15 @@ fun BotBus.whatsAppCloudText(
9595
fun BotBus.whatsAppCloudImage(
9696
id: String,
9797
link: String? = null,
98-
caption: String? = null,
98+
caption: CharSequence? = null,
9999
): WhatsAppCloudBotImageMessage =
100100
WhatsAppCloudBotImageMessage(
101101
messagingProduct = "whatsapp",
102-
image = WhatsAppCloudBotImage(id, link, caption),
102+
image = WhatsAppCloudBotImage(
103+
id = id,
104+
link = link,
105+
caption = translate(caption).toString()
106+
),
103107
recipientType = WhatsAppCloudBotRecipientType.individual,
104108
userId = userId.id,
105109
)
@@ -340,7 +344,7 @@ fun <T : Bus<T>> T.whatsAppCloudTextParameterTemplate(
340344
typeParameter: CharSequence?,
341345
textButton: CharSequence?
342346
): TextParameter = TextParameter(
343-
type = ParameterType.valueOf((typeParameter).toString()),
347+
type = ParameterType.valueOf(translate(typeParameter).toString()),
344348
text = translate(textButton).toString(),
345349
)
346350

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudBotMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
4141
JsonSubTypes.Type(value = WhatsAppCloudBotImageMessage::class, name = "image")
4242
)
4343

44-
abstract class WhatsAppCloudBotMessage ( val type: WhatsAppCoudBotMessageType, @JsonIgnore internal open val userId: String?) :
44+
abstract class WhatsAppCloudBotMessage (val type: WhatsAppCloudBotMessageType, @JsonIgnore internal open val userId: String?) :
4545
ConnectorMessage, WhatsAppCloudConnectorMessage() {
4646

4747
@get:JsonIgnore

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCoudBotMessageType.kt bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudBotMessageType.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
package ai.tock.bot.connector.whatsapp.cloud.model.send.message
1818

19-
enum class WhatsAppCoudBotMessageType {
19+
enum class WhatsAppCloudBotMessageType {
2020
text, reaction, image, audio , video, location, contacts, interactive, template
2121
}

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotImageMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ data class WhatsAppCloudSendBotImageMessage(
2323
val image: WhatsAppCloudBotImage,
2424
override val recipientType: WhatsAppCloudBotRecipientType,
2525
override val to: String,
26-
) : WhatsAppCloudSendBotMessage(WhatsAppCoudBotMessageType.image)
26+
) : WhatsAppCloudSendBotMessage(WhatsAppCloudBotMessageType.image)

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotInteractiveMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ data class WhatsAppCloudSendBotInteractiveMessage(
2323
val interactive: WhatsAppCloudBotInteractive,
2424
override val recipientType: WhatsAppCloudBotRecipientType,
2525
override val to: String,
26-
) : WhatsAppCloudSendBotMessage(WhatsAppCoudBotMessageType.interactive)
26+
) : WhatsAppCloudSendBotMessage(WhatsAppCloudBotMessageType.interactive)

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotLocationMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ data class WhatsAppCloudSendBotLocationMessage(
2323
val location: WhatsAppCloudBotLocation,
2424
override val recipientType: WhatsAppCloudBotRecipientType,
2525
override val to: String,
26-
) : WhatsAppCloudSendBotMessage(WhatsAppCoudBotMessageType.location)
26+
) : WhatsAppCloudSendBotMessage(WhatsAppCloudBotMessageType.location)

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
3333
JsonSubTypes.Type(value = WhatsAppCloudSendBotImageMessage::class, name = "image"),
3434
)
3535

36-
abstract class WhatsAppCloudSendBotMessage(val type: WhatsAppCoudBotMessageType) {
36+
abstract class WhatsAppCloudSendBotMessage(val type: WhatsAppCloudBotMessageType) {
3737

3838
@get:JsonProperty("messaging_product")
3939
abstract val messagingProduct:String

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotTemplateMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ data class WhatsAppCloudSendBotTemplateMessage(
2323
val template: WhatsAppCloudBotTemplate,
2424
override val recipientType: WhatsAppCloudBotRecipientType,
2525
override val to: String,
26-
) : WhatsAppCloudSendBotMessage(WhatsAppCoudBotMessageType.template)
26+
) : WhatsAppCloudSendBotMessage(WhatsAppCloudBotMessageType.template)

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/WhatsAppCloudSendBotTextMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ data class WhatsAppCloudSendBotTextMessage (
2626
override val to: String,
2727
@get:JsonProperty("preview_url")
2828
val previewUrl: Boolean = false,
29-
) : WhatsAppCloudSendBotMessage(WhatsAppCoudBotMessageType.text)
29+
) : WhatsAppCloudSendBotMessage(WhatsAppCloudBotMessageType.text)

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/content/WhatsAppCloudBotImageMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data class WhatsAppCloudBotImageMessage (
2626
val image: WhatsAppCloudBotImage,
2727
override val recipientType: WhatsAppCloudBotRecipientType,
2828
override val userId: String? = null,
29-
) : WhatsAppCloudBotMessage(WhatsAppCoudBotMessageType.image, userId) {
29+
) : WhatsAppCloudBotMessage(WhatsAppCloudBotMessageType.image, userId) {
3030
override fun toSendBotMessage(recipientId: String): WhatsAppCloudSendBotMessage =
3131
WhatsAppCloudSendBotImageMessage(
3232
messagingProduct,

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/content/WhatsAppCloudBotInteractiveMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data class WhatsAppCloudBotInteractiveMessage (
2525
val interactive: WhatsAppCloudBotInteractive,
2626
override val recipientType: WhatsAppCloudBotRecipientType,
2727
override val userId: String? = null,
28-
): WhatsAppCloudBotMessage(WhatsAppCoudBotMessageType.interactive, userId) {
28+
): WhatsAppCloudBotMessage(WhatsAppCloudBotMessageType.interactive, userId) {
2929
override fun toGenericMessage(): GenericMessage? {
3030
val texts = mapOf(GenericMessage.TEXT_PARAM to (interactive.body?.text ?: ""))
3131
return GenericMessage(

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/content/WhatsAppCloudBotLocationMessage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotM
2020
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotRecipientType
2121
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudSendBotLocationMessage
2222
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudSendBotMessage
23-
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCoudBotMessageType
23+
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotMessageType
2424
import ai.tock.bot.engine.message.GenericMessage
2525

2626
data class WhatsAppCloudBotLocationMessage(
2727
override val messagingProduct: String,
2828
val location: WhatsAppCloudBotLocation,
2929
override val recipientType: WhatsAppCloudBotRecipientType,
3030
override val userId: String? = null,
31-
) : WhatsAppCloudBotMessage(WhatsAppCoudBotMessageType.location, userId) {
31+
) : WhatsAppCloudBotMessage(WhatsAppCloudBotMessageType.location, userId) {
3232
override fun toSendBotMessage(recipientId: String): WhatsAppCloudSendBotMessage =
3333
WhatsAppCloudSendBotLocationMessage(
3434
messagingProduct,

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/content/WhatsAppCloudBotTemplateMessage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotM
2020
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotRecipientType
2121
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudSendBotMessage
2222
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudSendBotTemplateMessage
23-
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCoudBotMessageType
23+
import ai.tock.bot.connector.whatsapp.cloud.model.send.message.WhatsAppCloudBotMessageType
2424
import ai.tock.bot.engine.message.GenericMessage
2525

2626
data class WhatsAppCloudBotTemplateMessage(
2727
override val messagingProduct: String,
2828
val template: WhatsAppCloudBotTemplate,
2929
override val recipientType: WhatsAppCloudBotRecipientType,
3030
override val userId: String? = null,
31-
) : WhatsAppCloudBotMessage(WhatsAppCoudBotMessageType.template, userId) {
31+
) : WhatsAppCloudBotMessage(WhatsAppCloudBotMessageType.template, userId) {
3232
override fun toSendBotMessage(recipientId: String): WhatsAppCloudSendBotMessage =
3333
WhatsAppCloudSendBotTemplateMessage(
3434
messagingProduct,

bot/connector-whatsapp-cloud/src/main/kotlin/model/send/message/content/WhatsAppCloudBotTextMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data class WhatsAppCloudBotTextMessage (
2626
val text: TextContent,
2727
override val recipientType: WhatsAppCloudBotRecipientType,
2828
override val userId: String? = null,
29-
) : WhatsAppCloudBotMessage(WhatsAppCoudBotMessageType.text, userId) {
29+
) : WhatsAppCloudBotMessage(WhatsAppCloudBotMessageType.text, userId) {
3030
override fun toSendBotMessage(recipientId: String): WhatsAppCloudSendBotMessage =
3131
WhatsAppCloudSendBotTextMessage(
3232
messagingProduct,

0 commit comments

Comments
 (0)