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.

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

Support sending and receiving stickers for WAC and D3C #610

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions handlers/dialog360/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ func (h *handler) processWhatsAppPayload(ctx context.Context, channel courier.Ch
} 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
80 changes: 61 additions & 19 deletions handlers/dialog360/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,20 @@ var testCasesD3C = []IncomingTestCase{
ExpectedAttachments: []string{"https://waba-v2.360dialog.io/whatsapp_business/attachments/?mid=id_image"},
ExpectedDate: time.Date(2016, 1, 30, 1, 57, 9, 0, time.UTC),
},
{
Label: "Receive Valid Sticker Message",
URL: d3CReceiveURL,
Data: string(test.ReadFile("../meta/testdata/wac/stickerWAC.json")),
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
NoQueueErrorCheck: true,
NoInvalidChannelCheck: true,
ExpectedMsgText: Sp(""),
ExpectedURN: "whatsapp:5678",
ExpectedExternalID: "external_id",
ExpectedAttachments: []string{"https://waba-v2.360dialog.io/whatsapp_business/attachments/?mid=id_sticker"},
ExpectedDate: time.Date(2016, 1, 30, 1, 57, 9, 0, time.UTC),
},
{
Label: "Receive Valid Video Message",
URL: d3CReceiveURL,
Expand Down Expand Up @@ -272,6 +286,10 @@ func buildMockD3MediaService(testChannels []courier.Channel, testCases []Incomin
fileURL = "https://lookaside.fbsbx.com/whatsapp_business/attachments/?mid=id_audio"
}

if strings.HasSuffix(r.URL.Path, "id_sticker") {
fileURL = "https://lookaside.fbsbx.com/whatsapp_business/attachments/?mid=id_sticker"
}

w.WriteHeader(http.StatusOK)
w.Write([]byte(fmt.Sprintf(`{ "url": "%s" }`, fileURL)))
}))
Expand Down Expand Up @@ -352,15 +370,15 @@ var SendTestCasesD3C = []OutgoingTestCase{
Label: "Audio Send",
MsgText: "audio caption",
MsgURN: "whatsapp:250788123123",
MsgAttachments: []string{"audio/mpeg:https://foo.bar/audio.mp3"},
MsgAttachments: []string{"audio/mpeg:http://mock.com/1234/test.mp3"},
MockResponses: map[string][]*httpx.MockResponse{
"*/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
},
},
ExpectedRequests: []ExpectedRequest{
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"audio","audio":{"link":"https://foo.bar/audio.mp3"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"audio","audio":{"link":"http://mock.com/1234/test.mp3"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"text","text":{"body":"audio caption","preview_url":false}}`},
},
ExpectedExtIDs: []string{"157b5e14568e8", "157b5e14568e8"},
Expand All @@ -369,7 +387,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
Label: "Document Send",
MsgText: "document caption",
MsgURN: "whatsapp:250788123123",
MsgAttachments: []string{"application/pdf:https://foo.bar/document.pdf"},
MsgAttachments: []string{"application/pdf:http://mock.com/1234/test.pdf"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -378,7 +396,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"document","document":{"link":"https://foo.bar/document.pdf","caption":"document caption","filename":"document.pdf"}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"document","document":{"link":"http://mock.com/1234/test.pdf","caption":"document caption","filename":"test.pdf"}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand All @@ -387,7 +405,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
Label: "Image Send",
MsgText: "image caption",
MsgURN: "whatsapp:250788123123",
MsgAttachments: []string{"image/jpeg:https://foo.bar/image.jpg"},
MsgAttachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -396,7 +414,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"image","image":{"link":"https://foo.bar/image.jpg","caption":"image caption"}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"image","image":{"link":"http://mock.com/1234/test.jpg","caption":"image caption"}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand All @@ -405,7 +423,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
Label: "Video Send",
MsgText: "video caption",
MsgURN: "whatsapp:250788123123",
MsgAttachments: []string{"video/mp4:https://foo.bar/video.mp4"},
MsgAttachments: []string{"video/mp4:http://mock.com/1234/test.mp4"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -414,7 +432,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"video","video":{"link":"https://foo.bar/video.mp4","caption":"video caption"}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"video","video":{"link":"http://mock.com/1234/test.mp4","caption":"video caption"}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand Down Expand Up @@ -507,7 +525,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
MsgText: "Interactive Button Msg",
MsgURN: "whatsapp:250788123123",
MsgQuickReplies: []string{"BUTTON1"},
MsgAttachments: []string{"image/jpeg:https://foo.bar/image.jpg"},
MsgAttachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -517,7 +535,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"image","image":{"link":"https://foo.bar/image.jpg"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"image","image":{"link":"http://mock.com/1234/test.jpg"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand All @@ -527,7 +545,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
MsgText: "Interactive Button Msg",
MsgURN: "whatsapp:250788123123",
MsgQuickReplies: []string{"BUTTON1"},
MsgAttachments: []string{"video/mp4:https://foo.bar/video.mp4"},
MsgAttachments: []string{"video/mp4:http://mock.com/1234/test.mp4"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -537,7 +555,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"video","video":{"link":"https://foo.bar/video.mp4"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"video","video":{"link":"http://mock.com/1234/test.mp4"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand All @@ -547,7 +565,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
MsgText: "Interactive Button Msg",
MsgURN: "whatsapp:250788123123",
MsgQuickReplies: []string{"BUTTON1"},
MsgAttachments: []string{"document/pdf:https://foo.bar/document.pdf"},
MsgAttachments: []string{"document/pdf:http://mock.com/1234/test.pdf"},
MockResponses: map[string][]*httpx.MockResponse{
"https://waba-v2.360dialog.io/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
Expand All @@ -557,7 +575,7 @@ var SendTestCasesD3C = []OutgoingTestCase{
ExpectedRequests: []ExpectedRequest{
{
Path: "/messages",
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"document","document":{"link":"https://foo.bar/document.pdf","filename":"document.pdf"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","header":{"type":"document","document":{"link":"http://mock.com/1234/test.pdf","filename":"test.pdf"}},"body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"BUTTON1"}}]}}}`,
},
},
ExpectedExtIDs: []string{"157b5e14568e8"},
Expand All @@ -567,15 +585,15 @@ var SendTestCasesD3C = []OutgoingTestCase{
MsgText: "Interactive Button Msg",
MsgURN: "whatsapp:250788123123",
MsgQuickReplies: []string{"ROW1", "ROW2", "ROW3"},
MsgAttachments: []string{"audio/mp3:https://foo.bar/audio.mp3"},
MsgAttachments: []string{"audio/mp3:http://mock.com/1234/test.mp3"},
MockResponses: map[string][]*httpx.MockResponse{
"*/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
},
},
ExpectedRequests: []ExpectedRequest{
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"audio","audio":{"link":"https://foo.bar/audio.mp3"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"audio","audio":{"link":"http://mock.com/1234/test.mp3"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"button","body":{"text":"Interactive Button Msg"},"action":{"buttons":[{"type":"reply","reply":{"id":"0","title":"ROW1"}},{"type":"reply","reply":{"id":"1","title":"ROW2"}},{"type":"reply","reply":{"id":"2","title":"ROW3"}}]}}}`},
},
ExpectedExtIDs: []string{"157b5e14568e8", "157b5e14568e8"},
Expand All @@ -585,15 +603,15 @@ var SendTestCasesD3C = []OutgoingTestCase{
MsgText: "Interactive List Msg",
MsgURN: "whatsapp:250788123123",
MsgQuickReplies: []string{"ROW1", "ROW2", "ROW3", "ROW4"},
MsgAttachments: []string{"image/jpeg:https://foo.bar/image.jpg"},
MsgAttachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
MockResponses: map[string][]*httpx.MockResponse{
"*/messages": {
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
httpx.NewMockResponse(201, nil, []byte(`{ "messages": [{"id": "157b5e14568e8"}] }`)),
},
},
ExpectedRequests: []ExpectedRequest{
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"image","image":{"link":"https://foo.bar/image.jpg"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"image","image":{"link":"http://mock.com/1234/test.jpg"}}`},
{Body: `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"interactive","interactive":{"type":"list","body":{"text":"Interactive List Msg"},"action":{"button":"Menu","sections":[{"rows":[{"id":"0","title":"ROW1"},{"id":"1","title":"ROW2"},{"id":"2","title":"ROW3"},{"id":"3","title":"ROW4"}]}]}}}`},
},
ExpectedExtIDs: []string{"157b5e14568e8", "157b5e14568e8"},
Expand Down Expand Up @@ -669,6 +687,30 @@ var SendTestCasesD3C = []OutgoingTestCase{
},
}

// setupMedia takes care of having the media files needed to our test server host
func setupMedia(mb *test.MockBackend) {
imageJPG := test.NewMockMedia("test.jpg", "image/jpeg", "http://mock.com/1234/test.jpg", 1024*1024, 640, 480, 0, nil)

audioM4A := test.NewMockMedia("test.m4a", "audio/mp4", "http://mock.com/2345/test.m4a", 1024*1024, 0, 0, 200, nil)
audioMP3 := test.NewMockMedia("test.mp3", "audio/mpeg", "http://mock.com/3456/test.mp3", 1024*1024, 0, 0, 200, []courier.Media{audioM4A})

thumbJPG := test.NewMockMedia("test.jpg", "image/jpeg", "http://mock.com/4567/test.jpg", 1024*1024, 640, 480, 0, nil)
videoMP4 := test.NewMockMedia("test.mp4", "video/mp4", "http://mock.com/5678/test.mp4", 1024*1024, 0, 0, 1000, []courier.Media{thumbJPG})

videoMOV := test.NewMockMedia("test.mov", "video/quicktime", "http://mock.com/6789/test.mov", 100*1024*1024, 0, 0, 2000, nil)

filePDF := test.NewMockMedia("test.pdf", "application/pdf", "http://mock.com/7890/test.pdf", 100*1024*1024, 0, 0, 0, nil)

stickerWEBP := test.NewMockMedia("test.webp", "image/webp", "http://mock.com/8901/test.webp", 50*1024, 480, 480, 0, nil)

mb.MockMedia(imageJPG)
mb.MockMedia(audioMP3)
mb.MockMedia(videoMP4)
mb.MockMedia(videoMOV)
mb.MockMedia(filePDF)
mb.MockMedia(stickerWEBP)
}

func TestOutgoing(t *testing.T) {
// shorter max msg length for testing
maxMsgLength = 100
Expand All @@ -679,5 +721,5 @@ func TestOutgoing(t *testing.T) {
})
checkRedacted := []string{"the-auth-token"}

RunOutgoingTestCases(t, ChannelWAC, newWAHandler(courier.ChannelType("D3C"), "360Dialog"), SendTestCasesD3C, checkRedacted, nil)
RunOutgoingTestCases(t, ChannelWAC, newWAHandler(courier.ChannelType("D3C"), "360Dialog"), SendTestCasesD3C, checkRedacted, setupMedia)
}
20 changes: 17 additions & 3 deletions handlers/media.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ const (
)

type MediaTypeSupport struct {
Types []string
MaxBytes int
Types []string
MaxBytes int
MaxWidth int
MaxHeight int
}

// Attachment is a resolved attachment
Expand Down Expand Up @@ -84,7 +86,10 @@ func resolveAttachment(ctx context.Context, b courier.Backend, contentType, medi
}

mediaType, _ := parseContentType(media.ContentType())
mediaSupport := support[mediaType]
mediaSupport, ok := support[MediaType(media.ContentType())]
if !ok {
mediaSupport = support[mediaType]
}

// our candidates are the uploaded media and any alternates of the same media type
candidates := append([]courier.Media{media}, filterMediaByType(media.Alternates(), mediaType)...)
Expand All @@ -99,6 +104,11 @@ func resolveAttachment(ctx context.Context, b courier.Backend, contentType, medi
candidates = filterMediaBySize(candidates, mediaSupport.MaxBytes)
}

// narrow down the candidates to the ones that don't exceed our max dimensions
if mediaSupport.MaxWidth > 0 && mediaSupport.MaxHeight > 0 {
candidates = filterMediaByDimensions(candidates, mediaSupport.MaxWidth, mediaSupport.MaxHeight)
}

// if we have no candidates, we can't use this media
if len(candidates) == 0 {
return nil, nil
Expand Down Expand Up @@ -144,6 +154,10 @@ func filterMediaBySize(in []courier.Media, maxBytes int) []courier.Media {
return filterMedia(in, func(m courier.Media) bool { return m.Size() <= maxBytes })
}

func filterMediaByDimensions(in []courier.Media, maxWidth int, MaxHeight int) []courier.Media {
return filterMedia(in, func(m courier.Media) bool { return m.Width() <= maxWidth && m.Height() <= MaxHeight })
}

func filterMedia(in []courier.Media, f func(courier.Media) bool) []courier.Media {
filtered := make([]courier.Media, 0, len(in))
for _, m := range in {
Expand Down
23 changes: 23 additions & 0 deletions handlers/media_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,29 @@ func TestResolveAttachments(t *testing.T) {
mediaSupport: map[handlers.MediaType]handlers.MediaTypeSupport{},
err: "invalid attachment format: http://mock.com/1234/test.jpg",
},
{ // 14: resolveable uploaded image URL with matching dimensions
attachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
mediaSupport: map[handlers.MediaType]handlers.MediaTypeSupport{handlers.MediaTypeImage: {Types: []string{"image/jpeg", "image/png"}, MaxWidth: 1000, MaxHeight: 1000}},
allowURLOnly: true,
resolved: []*handlers.Attachment{
{Type: handlers.MediaTypeImage, Name: "test.jpg", ContentType: "image/jpeg", URL: "http://mock.com/1234/test.jpg", Media: imageJPG, Thumbnail: nil},
},
},
{ // 15: resolveable uploaded image URL without matching dimensions
attachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
mediaSupport: map[handlers.MediaType]handlers.MediaTypeSupport{handlers.MediaTypeImage: {Types: []string{"image/jpeg", "image/png"}, MaxWidth: 100, MaxHeight: 100}},
allowURLOnly: true,
resolved: []*handlers.Attachment{},
errors: []*courier.ChannelError{courier.ErrorMediaUnresolveable("image/jpeg")},
},
{ // 16: resolveable uploaded image URL without matching dimensions by specific content type precendence
attachments: []string{"image/jpeg:http://mock.com/1234/test.jpg"},
mediaSupport: map[handlers.MediaType]handlers.MediaTypeSupport{handlers.MediaTypeImage: {Types: []string{"image/jpeg", "image/png"}, MaxWidth: 100, MaxHeight: 100}, handlers.MediaType("image/jpeg"): {Types: []string{"image/jpeg", "image/png"}, MaxWidth: 1000, MaxHeight: 1000}},
allowURLOnly: true,
resolved: []*handlers.Attachment{
{Type: handlers.MediaTypeImage, Name: "test.jpg", ContentType: "image/jpeg", URL: "http://mock.com/1234/test.jpg", Media: imageJPG, Thumbnail: nil},
},
},
}

for i, tc := range tcs {
Expand Down
2 changes: 2 additions & 0 deletions handlers/meta/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ func (h *handler) processWhatsAppPayload(ctx context.Context, channel courier.Ch
} else if msg.Type == "image" && msg.Image != nil {
text = msg.Image.Caption
mediaURL, err = h.resolveMediaURL(msg.Image.ID, token, clog)
} else if msg.Type == "sticker" && msg.Sticker != nil {
mediaURL, err = h.resolveMediaURL(msg.Sticker.ID, token, clog)
} else if msg.Type == "video" && msg.Video != nil {
text = msg.Video.Caption
mediaURL, err = h.resolveMediaURL(msg.Video.ID, token, clog)
Expand Down
2 changes: 1 addition & 1 deletion handlers/meta/testdata/wac/audio.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"audio": {
"file": "/usr/local/wamedia/shared/b1cf38-8734-4ad3-b4a1-ef0c10d0d683",
"id": "id_audio",
"mime_type": "image/jpeg",
"mime_type": "audio/mpeg",
"sha256": "29ed500fa64eb55fc19dc4124acb300e5dcc54a0f822a301ae99944db",
"caption": "Check out my new phone!"
},
Expand Down
Loading
Loading