Merge pull request #1313 from nyaruka/msgcontent_tweak

Allow `flows.MsgContent` to be unmarshalled from string

Author: rowanseymour

flows/msg.go

@@ -250,6 +250,18 @@ func (c *MsgContent) Empty() bool {
 	return c.Text == "" && len(c.Attachments) == 0 && len(c.QuickReplies) == 0
 }
 
+func (c *MsgContent) UnmarshalJSON(d []byte) error {
+	// if we just have a string we unmarshal it into the text field
+	if len(d) > 2 && d[0] == '"' && d[len(d)-1] == '"' {
+		return jsonx.Unmarshal(d, &c.Text)
+	}
+
+	// alias our type so we don't end up here again
+	type alias MsgContent
+
+	return jsonx.Unmarshal(d, (*alias)(c))
+}
+
 type BroadcastTranslations map[i18n.Language]*MsgContent
 
 // ForContact is a utility to help callers get the message content for a contact

flows/msg_test.go

@@ -126,6 +126,20 @@ func TestMsgContent(t *testing.T) {
 	assert.False(t, (&flows.MsgContent{Text: "hi"}).Empty())
 	assert.False(t, (&flows.MsgContent{Attachments: []utils.Attachment{"image:https://test.jpg"}}).Empty())
 	assert.False(t, (&flows.MsgContent{QuickReplies: []flows.QuickReply{{Text: "Ok"}}}).Empty())
+
+	var c1, c2 flows.MsgContent
+
+	// can unmarshal from object
+	err := json.Unmarshal([]byte(`{"text": "test1", "attachments": ["image:https://test.jpg"]}`), &c1)
+	assert.NoError(t, err)
+	assert.Equal(t, "test1", c1.Text)
+	assert.Equal(t, []utils.Attachment{"image:https://test.jpg"}, c1.Attachments)
+
+	// or text
+	err = json.Unmarshal([]byte(`"test2"`), &c2)
+	assert.NoError(t, err)
+	assert.Equal(t, "test2", c2.Text)
+	assert.Equal(t, []utils.Attachment(nil), c2.Attachments)
 }
 
 func TestBroadcastTranslations(t *testing.T) {