Merge pull request #177 from thrawn01/thrawn/develop

Update Event Objects

CHANGELOG

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.2] - 2019-03-28
+### Changes
+* Uncommented DeliveryStatus.Code and change it to an integer (See #175)
+* Added UserVariables to all Message events (See #176)
+
 ## [3.3.1] - 2019-03-13
 ### Changes
 * Updated Template calls to reflect the most recent Template API changes.

events/events.go

@@ -54,12 +54,13 @@ type Accepted struct {
 	Message  Message  `json:"message"`
 	Flags    Flags    `json:"flags"`
 
-	Recipient       string     `json:"recipient"`
-	RecipientDomain string     `json:"recipient-domain"`
-	Method          string     `json:"method"`
-	OriginatingIP   string     `json:"originating-ip"`
-	Tags            []string   `json:"tags"`
-	Campaigns       []Campaign `json:"campaigns"`
+	Recipient       string            `json:"recipient"`
+	RecipientDomain string            `json:"recipient-domain"`
+	Method          string            `json:"method"`
+	OriginatingIP   string            `json:"originating-ip"`
+	Tags            []string          `json:"tags"`
+	Campaigns       []Campaign        `json:"campaigns"`
+	UserVariables   map[string]string `json:"user-variables"`
 }
 
 type Rejected struct {
@@ -74,8 +75,9 @@ type Rejected struct {
 	Storage Storage `json:"storage"`
 	Flags   Flags   `json:"flags"`
 
-	Tags      []string   `json:"tags"`
-	Campaigns []Campaign `json:"campaigns"`
+	Tags          []string          `json:"tags"`
+	Campaigns     []Campaign        `json:"campaigns"`
+	UserVariables map[string]string `json:"user-variables"`
 }
 
 type Delivered struct {
@@ -91,7 +93,8 @@ type Delivered struct {
 	Tags            []string   `json:"tags"`
 	Campaigns       []Campaign `json:"campaigns"`
 
-	DeliveryStatus DeliveryStatus `json:"delivery-status"`
+	DeliveryStatus DeliveryStatus    `json:"delivery-status"`
+	UserVariables  map[string]string `json:"user-variables"`
 }
 
 type Failed struct {
@@ -107,9 +110,10 @@ type Failed struct {
 	Tags            []string   `json:"tags"`
 	Campaigns       []Campaign `json:"campaigns"`
 
-	DeliveryStatus DeliveryStatus `json:"delivery-status"`
-	Severity       string         `json:"severity"`
-	Reason         string         `json:"reason"`
+	DeliveryStatus DeliveryStatus    `json:"delivery-status"`
+	Severity       string            `json:"severity"`
+	Reason         string            `json:"reason"`
+	UserVariables  map[string]string `json:"user-variables"`
 }
 
 type Stored struct {
@@ -119,8 +123,9 @@ type Stored struct {
 	Storage Storage `json:"storage"`
 	Flags   Flags   `json:"flags"`
 
-	Tags      []string   `json:"tags"`
-	Campaigns []Campaign `json:"campaigns"`
+	Tags          []string          `json:"tags"`
+	Campaigns     []Campaign        `json:"campaigns"`
+	UserVariables map[string]string `json:"user-variables"`
 }
 
 //
@@ -189,8 +194,9 @@ type Complained struct {
 	Message   Message    `json:"message"`
 	Campaigns []Campaign `json:"campaigns"`
 
-	Recipient string   `json:"recipient"`
-	Tags      []string `json:"tags"`
+	Recipient     string            `json:"recipient"`
+	Tags          []string          `json:"tags"`
+	UserVariables map[string]string `json:"user-variables"`
 }
 
 //

events/objects.go

@@ -70,9 +70,7 @@ type Campaign struct {
 }
 
 type DeliveryStatus struct {
-	// The code is an int or a string from time to time so
-	// we can't uncomment this field until all emitters unified.
-	// Code        string  `json:"code"`
+	Code           int     `json:"code"`
 	Message        string  `json:"message"`
 	SessionSeconds float64 `json:"session-seconds"`
 }

version.go

@@ -1,4 +1,4 @@
 package mailgun
 
 // Version of current release
-const Version = "3.0.0"
+const Version = "3.3.2"