Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Whatsapp stickers #734

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Whatsapp stickers #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3c60bc
Add support to filter media by dimensions and content type precedence…
norkans7 Sep 5, 2023
1c58a29
Support receiving stickers
norkans7 Apr 23, 2024
4459d2b
Support sending stickers
norkans7 Apr 23, 2024
a393565
coverage
norkans7 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 46 additions & 21 deletions handlers/dialog360/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"github.com/nyaruka/courier/utils"
"github.com/nyaruka/gocommon/jsonx"
"github.com/nyaruka/gocommon/urns"
"github.com/pkg/errors"
)

const (
Expand All @@ -29,6 +30,15 @@
maxMsgLength = 4096
)

// see https://developers.facebook.com/docs/whatsapp/cloud-api/reference/media#supported-media-types
var mediaSupport = map[handlers.MediaType]handlers.MediaTypeSupport{
handlers.MediaType("image/webp"): {Types: []string{"image/webp"}, MaxBytes: 100 * 1024, MaxWidth: 512, MaxHeight: 512},
handlers.MediaTypeImage: {Types: []string{"image/jpeg", "image/png"}, MaxBytes: 5 * 1024 * 1024},
handlers.MediaTypeAudio: {Types: []string{"audio/aac", "audio/mp4", "audio/mpeg", "audio/amr", "audio/ogg"}, MaxBytes: 16 * 1024 * 1024},
handlers.MediaTypeVideo: {Types: []string{"video/mp4", "video/3gp"}, MaxBytes: 16 * 1024 * 1024},
handlers.MediaTypeApplication: {MaxBytes: 100 * 1024 * 1024},
}

func init() {
courier.RegisterHandler(newWAHandler(courier.ChannelType("D3C"), "360Dialog"))
}
Expand Down Expand Up @@ -160,6 +170,8 @@
} else if msg.Type == "image" && msg.Image != nil {
text = msg.Image.Caption
mediaURL, err = h.resolveMediaURL(channel, msg.Image.ID, clog)
} else if msg.Type == "sticker" && msg.Sticker != nil {
mediaURL, err = h.resolveMediaURL(channel, msg.Sticker.ID, clog)
} else if msg.Type == "video" && msg.Video != nil {
text = msg.Video.Caption
mediaURL, err = h.resolveMediaURL(channel, msg.Video.ID, clog)
Expand Down Expand Up @@ -311,23 +323,28 @@

var payloadAudio whatsapp.SendRequest

for i := 0; i < len(msgParts)+len(msg.Attachments()); i++ {
attachments, err := handlers.ResolveAttachments(ctx, h.Backend(), msg.Attachments(), mediaSupport, false, clog)
if err != nil {
return errors.Wrap(err, "error resolving attachments")
}

Check warning on line 329 in handlers/dialog360/handler.go

View check run for this annotation

Codecov / codecov/patch

handlers/dialog360/handler.go#L328-L329 

Added lines #L328 - L329 were not covered by tests

for i := 0; i < len(msgParts)+len(attachments); i++ {
payload := whatsapp.SendRequest{MessagingProduct: "whatsapp", RecipientType: "individual", To: msg.URN().Path()}

if len(msg.Attachments()) == 0 {
if len(attachments) == 0 {
// do we have a template?
if msg.Templating() != nil {
payload.Type = "template"
payload.Template = whatsapp.GetTemplatePayload(msg.Templating())
} else {
if i < (len(msgParts) + len(msg.Attachments()) - 1) {
if i < (len(msgParts) + len(attachments) - 1) {
// this is still a msg part
text := &whatsapp.Text{PreviewURL: false}
payload.Type = "text"
if strings.Contains(msgParts[i-len(msg.Attachments())], "https://") || strings.Contains(msgParts[i-len(msg.Attachments())], "http://") {
if strings.Contains(msgParts[i-len(attachments)], "https://") || strings.Contains(msgParts[i-len(attachments)], "http://") {

Check warning on line 344 in handlers/dialog360/handler.go

View check run for this annotation

Codecov / codecov/patch

handlers/dialog360/handler.go#L344 

Added line #L344 was not covered by tests
text.PreviewURL = true
}
text.Body = msgParts[i-len(msg.Attachments())]
text.Body = msgParts[i-len(attachments)]

Check warning on line 347 in handlers/dialog360/handler.go

View check run for this annotation

Codecov / codecov/patch

handlers/dialog360/handler.go#L347 

Added line #L347 was not covered by tests
payload.Text = text
} else {
if len(qrs) > 0 {
Expand All @@ -343,7 +360,7 @@
if len(qrs) <= 3 {
interactive := whatsapp.Interactive{Type: "button", Body: struct {
Text string "json:\"text\""
}{Text: msgParts[i-len(msg.Attachments())]}}
}{Text: msgParts[i-len(attachments)]}}

btns := make([]whatsapp.Button, len(qrs))
for i, qr := range qrs {
Expand All @@ -362,7 +379,7 @@
} else {
interactive := whatsapp.Interactive{Type: "list", Body: struct {
Text string "json:\"text\""
}{Text: msgParts[i-len(msg.Attachments())]}}
}{Text: msgParts[i-len(attachments)]}}

section := whatsapp.Section{
Rows: make([]whatsapp.SectionRow, len(qrs)),
Expand All @@ -388,31 +405,38 @@
// this is still a msg part
text := &whatsapp.Text{PreviewURL: false}
payload.Type = "text"
if strings.Contains(msgParts[i-len(msg.Attachments())], "https://") || strings.Contains(msgParts[i-len(msg.Attachments())], "http://") {
if strings.Contains(msgParts[i-len(attachments)], "https://") || strings.Contains(msgParts[i-len(attachments)], "http://") {
text.PreviewURL = true
}
text.Body = msgParts[i-len(msg.Attachments())]
text.Body = msgParts[i-len(attachments)]
payload.Text = text
}
}
}

} else if i < len(msg.Attachments()) && (len(qrs) == 0 || len(qrs) > 3) {
attType, attURL := handlers.SplitAttachment(msg.Attachments()[i])
attType = strings.Split(attType, "/")[0]
} else if i < len(attachments) && (len(qrs) == 0 || len(qrs) > 3) {
attURL := attachments[i].Media.URL()
attType := attachments[i].Type
attContentType := attachments[i].Media.ContentType()

if attType == "application" {
attType = "document"
}
payload.Type = attType
payload.Type = string(attType)
media := whatsapp.Media{Link: attURL}

if len(msgParts) == 1 && attType != "audio" && len(msg.Attachments()) == 1 && len(msg.QuickReplies()) == 0 {
if len(msgParts) == 1 && attType != "audio" && len(attachments) == 1 && len(msg.QuickReplies()) == 0 {
media.Caption = msgParts[i]
hasCaption = true
}

if attType == "image" {
payload.Image = &media
if attContentType == "image/webp" {
payload.Type = "sticker"
payload.Sticker = &media
} else {
payload.Image = &media
}
} else if attType == "audio" {
payload.Audio = &media
} else if attType == "video" {
Expand Down Expand Up @@ -442,10 +466,11 @@
Text string "json:\"text\""
}{Text: msgParts[i]}}

if len(msg.Attachments()) > 0 {
if len(attachments) > 0 {
hasCaption = true
attType, attURL := handlers.SplitAttachment(msg.Attachments()[i])
attType = strings.Split(attType, "/")[0]
attURL := attachments[i].Media.URL()
attType := attachments[i].Type

if attType == "application" {
attType = "document"
}
Expand Down Expand Up @@ -517,7 +542,7 @@
} else {
interactive := whatsapp.Interactive{Type: "list", Body: struct {
Text string "json:\"text\""
}{Text: msgParts[i-len(msg.Attachments())]}}
}{Text: msgParts[i-len(attachments)]}}

section := whatsapp.Section{
Rows: make([]whatsapp.SectionRow, len(qrs)),
Expand All @@ -543,10 +568,10 @@
// this is still a msg part
text := &whatsapp.Text{PreviewURL: false}
payload.Type = "text"
if strings.Contains(msgParts[i-len(msg.Attachments())], "https://") || strings.Contains(msgParts[i-len(msg.Attachments())], "http://") {
if strings.Contains(msgParts[i-len(attachments)], "https://") || strings.Contains(msgParts[i-len(attachments)], "http://") {
text.PreviewURL = true
}
text.Body = msgParts[i-len(msg.Attachments())]
text.Body = msgParts[i-len(attachments)]
payload.Text = text
}
}
Expand Down
Loading
Loading