Support template header components of type video or document as well

nyaruka · Jun 6, 2024 · fdbdcc8 · fdbdcc8
1 parent cc26883
commit fdbdcc8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/flows/actions/send_msg.go b/flows/actions/send_msg.go
@@ -128,14 +128,16 @@ func (a *SendMsgAction) getTemplateMsg(run flows.Run, urn urns.URN, channelRef *
 		evaluatedVariables[i] = v
 	}
 
-	// cross-reference with asset to get variable types
+	// cross-reference with asset to get variable types and filter out invalid values
 	variables := make([]*flows.TemplatingVariable, len(translation.Variables()))
 	for i, v := range translation.Variables() {
+		// we pad out any missing variables with empty values
+		value := ""
 		if i < len(evaluatedVariables) {
-			variables[i] = &flows.TemplatingVariable{Type: v.Type(), Value: evaluatedVariables[i]}
-		} else {
-			variables[i] = &flows.TemplatingVariable{Type: v.Type(), Value: ""}
+			value = evaluatedVariables[i]
 		}
+
+		variables[i] = &flows.TemplatingVariable{Type: v.Type(), Value: value}
 	}
 
 	// create a list of components that have variables
@@ -159,10 +161,11 @@ func (a *SendMsgAction) getTemplateMsg(run flows.Run, urn urns.URN, channelRef *
 		previewContent := comp.Content()
 		for key, index := range comp.Variables() {
 			variable := variables[index]
+
 			if variable.Type == "text" {
 				previewContent = strings.ReplaceAll(previewContent, fmt.Sprintf("{{%s}}", key), variable.Value)
-			} else if variable.Type == "image" && variable.Value != "" {
-				previewAttachments = append(previewAttachments, utils.Attachment("image:"+variable.Value))
+			} else if variable.Type == "image" || variable.Type == "video" || variable.Type == "document" {
+				previewAttachments = append(previewAttachments, utils.Attachment(variable.Value))
 			}
 		}
 

diff --git a/flows/actions/testdata/send_msg.json b/flows/actions/testdata/send_msg.json
@@ -927,7 +927,7 @@
                 "name": "cat_fact"
             },
             "template_variables": [
-                "http://example.com/cat2.jpg",
+                "image/jpeg:http://example.com/cat2.jpg",
                 "The first true cats came into existence about 12 million years ago and were the Proailurus."
             ]
         },
@@ -945,7 +945,7 @@
                     },
                     "text": "The first true cats came into existence about 12 million years ago and were the Proailurus.",
                     "attachments": [
-                        "image:http://example.com/cat2.jpg"
+                        "image/jpeg:http://example.com/cat2.jpg"
                     ],
                     "templating": {
                         "template": {
@@ -972,7 +972,7 @@
                         "variables": [
                             {
                                 "type": "image",
-                                "value": "http://example.com/cat2.jpg"
+                                "value": "image/jpeg:http://example.com/cat2.jpg"
                             },
                             {
                                 "type": "text",
@@ -987,13 +987,13 @@
         "templates": [
             "The Maine Coone is the only native American long haired breed.",
             "image/jpeg:http://example.com/cat1.jpg",
-            "http://example.com/cat2.jpg",
+            "image/jpeg:http://example.com/cat2.jpg",
             "The first true cats came into existence about 12 million years ago and were the Proailurus."
         ],
         "localizables": [
             "The Maine Coone is the only native American long haired breed.",
             "image/jpeg:http://example.com/cat1.jpg",
-            "http://example.com/cat2.jpg",
+            "image/jpeg:http://example.com/cat2.jpg",
             "The first true cats came into existence about 12 million years ago and were the Proailurus."
         ],
         "inspection": {