Move block context unmarshalling logic

block_context.go

@@ -1,9 +1,5 @@
 package slack
 
-import (
-	"encoding/json"
-)
-
 // ContextBlock defines data that is used to display message context, which can
 // include both images and text.
 //
@@ -32,43 +28,3 @@ func NewContextBlock(blockID string, elements ContextElements) *ContextBlock {
 		Elements: elements,
 	}
 }
-
-// UnmarshalJSON implements the Unmarshaller interface for ContextElements, so that any JSON
-// unmarshalling is delegated and proper type determination can be made before unmarshal
-func (e *ContextElements) UnmarshalJSON(data []byte) error {
-	var raw []json.RawMessage
-	err := json.Unmarshal(data, &raw)
-	if err != nil {
-		return err
-	}
-
-	for _, r := range raw {
-		var obj map[string]interface{}
-		err := json.Unmarshal(r, &obj)
-		if err != nil {
-			return err
-		}
-
-		contextElementType := ""
-		if t, ok := obj["type"].(string); ok {
-			contextElementType = t
-		}
-
-		switch contextElementType {
-		case PlainTextType, MarkdownType:
-			elem, err := unmarshalBlockObject(r, &TextBlockObject{})
-			if err != nil {
-				return err
-			}
-			e.TextObjects = append(e.TextObjects, elem.(*TextBlockObject))
-		case "image":
-			elem, err := unmarshalBlockElement(r, &ImageBlockElement{})
-			if err != nil {
-				return err
-			}
-			e.ImageElements = append(e.ImageElements, elem.(*ImageBlockElement))
-		}
-	}
-
-	return nil
-}

block_conv.go

@@ -2,7 +2,7 @@ package slack
 
 import "encoding/json"
 
-// Conv/JSON encoding logic for Blocks
+// Marshalling/unmarshalling logic for Blocks
 
 // UnmarshalJSON implements the Unmarshaller interface for Blocks, so that any JSON
 // unmarshalling is delegated and proper type determination can be made before unmarshal
@@ -87,7 +87,7 @@ func (b *Blocks) appendToBlocks(appendBlocks []Block) {
 	}
 }
 
-// Conv/JSON encoding logic for BlockElements
+// Marshalling/unmarshalling logic for BlockElements
 
 // MarshalJSON implements the Marshaller interface for BlockElements so that any JSON
 // marshalling is delegated and proper type determination can be made before marshal
@@ -204,7 +204,7 @@ func toBlockElementSlice(elements *BlockElements) []BlockElement {
 	return slice
 }
 
-// Conv/JSON encoding related logic for Accessory
+// Marshalling/unmarshalling logic for Accessory
 
 // MarshalJSON implements the Marshaller interface for Accessory so that any JSON
 // marshalling is delegated and proper type determination can be made before marshal
@@ -293,7 +293,7 @@ func toBlockElement(element *Accessory) BlockElement {
 	return nil
 }
 
-// Conv/JSON encoding related logic for ContextElements
+// Marshalling/unmarsalling logic for ContextElements
 
 // MarshalJSON implements the Marshaller interface for ContextElements so that any JSON
 // marshalling is delegated and proper type determination can be made before marshal
@@ -317,3 +317,43 @@ func toMixedElements(elements *ContextElements) []mixedElement {
 
 	return slice
 }
+
+// UnmarshalJSON implements the Unmarshaller interface for ContextElements, so that any JSON
+// unmarshalling is delegated and proper type determination can be made before unmarshal
+func (e *ContextElements) UnmarshalJSON(data []byte) error {
+	var raw []json.RawMessage
+	err := json.Unmarshal(data, &raw)
+	if err != nil {
+		return err
+	}
+
+	for _, r := range raw {
+		var obj map[string]interface{}
+		err := json.Unmarshal(r, &obj)
+		if err != nil {
+			return err
+		}
+
+		contextElementType := ""
+		if t, ok := obj["type"].(string); ok {
+			contextElementType = t
+		}
+
+		switch contextElementType {
+		case PlainTextType, MarkdownType:
+			elem, err := unmarshalBlockObject(r, &TextBlockObject{})
+			if err != nil {
+				return err
+			}
+			e.TextObjects = append(e.TextObjects, elem.(*TextBlockObject))
+		case "image":
+			elem, err := unmarshalBlockElement(r, &ImageBlockElement{})
+			if err != nil {
+				return err
+			}
+			e.ImageElements = append(e.ImageElements, elem.(*ImageBlockElement))
+		}
+	}
+
+	return nil
+}