Merge pull request #888 from Fanatics/container-thread-field

add thread_ts to container
slack-go · Jul 16, 2021 · f5878c7 · f5878c7
2 parents 62fceea + 5690e81
commit f5878c7
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 0 deletions.
diff --git a/interactions.go b/interactions.go
@@ -121,6 +121,7 @@ type Container struct {
 	Type         string      `json:"type"`
 	ViewID       string      `json:"view_id"`
 	MessageTs    string      `json:"message_ts"`
+	ThreadTs     string      `json:"thread_ts,omitempty"`
 	AttachmentID json.Number `json:"attachment_id"`
 	ChannelID    string      `json:"channel_id"`
 	IsEphemeral  bool        `json:"is_ephemeral"`

diff --git a/interactions_test.go b/interactions_test.go
@@ -454,3 +454,87 @@ func TestInteractionCallback_InteractionTypeBlockActions_Unmarshal(t *testing.T)
 		cb.BlockActionState.Values["section_block_id"]["multi_convos"].SelectedConversations,
 		[]string{"G12345"})
 }
+
+func TestInteractionCallback_Container_Marshal_And_Unmarshal(t *testing.T) {
+	// Contrived - you generally won't see all of the fields set in a single message
+	raw := []byte(
+		`
+		{
+			"container": {
+				"type": "message",
+				"view_id": "viewID",
+				"message_ts": "messageTS",
+				"attachment_id": "123",
+				"channel_id": "channelID",
+				"is_ephemeral": false,
+				"is_app_unfurl": false
+			}
+		}
+		`)
+
+	expected := &InteractionCallback{
+		Container: Container{
+			Type:         "message",
+			ViewID:       "viewID",
+			MessageTs:    "messageTS",
+			AttachmentID: "123",
+			ChannelID:    "channelID",
+			IsEphemeral:  false,
+			IsAppUnfurl:  false,
+		},
+		RawState: json.RawMessage(`{}`),
+	}
+
+	actual := new(InteractionCallback)
+	err := json.Unmarshal(raw, actual)
+	assert.NoError(t, err)
+	assert.Equal(t, expected.Container, actual.Container)
+
+	expectedJSON := []byte(`{"type":"message","view_id":"viewID","message_ts":"messageTS","attachment_id":123,"channel_id":"channelID","is_ephemeral":false,"is_app_unfurl":false}`)
+	actualJSON, err := json.Marshal(actual.Container)
+	assert.NoError(t, err)
+	assert.Equal(t, expectedJSON, actualJSON)
+}
+
+func TestInteractionCallback_In_Thread_Container_Marshal_And_Unmarshal(t *testing.T) {
+	// Contrived - you generally won't see all of the fields set in a single message
+	raw := []byte(
+		`
+		{
+			"container": {
+				"type": "message",
+				"view_id": "viewID",
+				"message_ts": "messageTS",
+				"thread_ts": "threadTS",
+				"attachment_id": "123",
+				"channel_id": "channelID",
+				"is_ephemeral": false,
+				"is_app_unfurl": false
+			}
+		}
+		`)
+
+	expected := &InteractionCallback{
+		Container: Container{
+			Type:         "message",
+			ViewID:       "viewID",
+			MessageTs:    "messageTS",
+			ThreadTs:     "threadTS",
+			AttachmentID: "123",
+			ChannelID:    "channelID",
+			IsEphemeral:  false,
+			IsAppUnfurl:  false,
+		},
+		RawState: json.RawMessage(`{}`),
+	}
+
+	actual := new(InteractionCallback)
+	err := json.Unmarshal(raw, actual)
+	assert.NoError(t, err)
+	assert.Equal(t, expected.Container, actual.Container)
+
+	expectedJSON := []byte(`{"type":"message","view_id":"viewID","message_ts":"messageTS","thread_ts":"threadTS","attachment_id":123,"channel_id":"channelID","is_ephemeral":false,"is_app_unfurl":false}`)
+	actualJSON, err := json.Marshal(actual.Container)
+	assert.NoError(t, err)
+	assert.Equal(t, expectedJSON, actualJSON)
+}