* Adds Conversations email content.

max-inanc · max-inanc · commit cc2499befa45 · 2020-10-02T12:05:31.000+02:00
* Some minor fixes over the last commit.
diff --git a/api/src/main/java/com/messagebird/objects/MessageReference.java b/api/src/main/java/com/messagebird/objects/MessageReference.java
@@ -1,5 +1,7 @@
 package com.messagebird.objects;
 
+import com.sun.istack.internal.Nullable;
+
 public class MessageReference {
 
     private String href;
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationContent.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationContent.java
@@ -11,6 +11,7 @@ public class ConversationContent {
     private ConversationContentHsm hsm;
     private ConversationContentMedia image;
     private ConversationContentLocation location;
+    private ConversationContentEmail email;
     private String text;
     private ConversationContentMedia video;
 
@@ -70,6 +71,14 @@ public void setVideo(ConversationContentMedia video) {
         this.video = video;
     }
 
+    public ConversationContentEmail getEmail() {
+        return email;
+    }
+
+    public void setEmail(ConversationContentEmail email) {
+        this.email = email;
+    }
+
     @Override
     public String toString() {
         return "ConversationContent{" +
@@ -78,6 +87,7 @@ public String toString() {
                 ", hsm=" + hsm +
                 ", image=" + image +
                 ", location=" + location +
+                ", email=" + email +
                 ", text='" + text + '\'' +
                 ", video=" + video +
                 '}';
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationContentEmail.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationContentEmail.java
@@ -0,0 +1,21 @@
+package com.messagebird.objects.conversations;
+
+import com.messagebird.objects.MessageResponse;
+
+import java.util.List;
+import java.util.Map;
+
+public class ConversationContentEmail {
+    private String id;
+    private ConversationEmailRecipient from;
+    private List<ConversationEmailRecipient> to;
+    private String subject;
+    private ConversationEmailContent content;
+    private String replyTo;
+    private String  returnPath;
+    private Map<String, String> headers;
+    private ConversationEmailTracking tracking;
+    private boolean performSubstitutions;
+    private List<ConversationEmailAttachment> attachments;
+    private List<ConversationEmailInlineImage> inlineImages;
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailAttachment.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailAttachment.java
@@ -0,0 +1,60 @@
+package com.messagebird.objects.conversations;
+
+public class ConversationEmailAttachment {
+    private String id;
+    private String name;
+    private String type;
+    private String URL;
+    private String length;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getURL() {
+        return URL;
+    }
+
+    public void setURL(String URL) {
+        this.URL = URL;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationEmailAttachment{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                ", URL='" + URL + '\'' +
+                ", length='" + length + '\'' +
+                '}';
+    }
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailContent.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailContent.java
@@ -0,0 +1,30 @@
+package com.messagebird.objects.conversations;
+
+public class ConversationEmailContent {
+    private String html;
+    private String text;
+
+    public String getHtml() {
+        return html;
+    }
+
+    public void setHtml(String html) {
+        this.html = html;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationEmailContent{" +
+                "html='" + html + '\'' +
+                ", text='" + text + '\'' +
+                '}';
+    }
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailInlineImage.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailInlineImage.java
@@ -0,0 +1,70 @@
+package com.messagebird.objects.conversations;
+
+public class ConversationEmailInlineImage {
+    private String id;
+    private String name;
+    private String type;
+    private String URL;
+    private int length;
+    private String contentId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getURL() {
+        return URL;
+    }
+
+    public void setURL(String URL) {
+        this.URL = URL;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    public String getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(String contentId) {
+        this.contentId = contentId;
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationEmailInlineImage{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                ", URL='" + URL + '\'' +
+                ", length=" + length +
+                ", contentId='" + contentId + '\'' +
+                '}';
+    }
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailRecipient.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailRecipient.java
@@ -0,0 +1,42 @@
+package com.messagebird.objects.conversations;
+
+import java.util.Map;
+
+public class ConversationEmailRecipient {
+    private String email;
+    private String name;
+    private Map<String, String> variables;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map<String, String> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(Map<String, String> variables) {
+        this.variables = variables;
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationEmailRecipient{" +
+                "email='" + email + '\'' +
+                ", name='" + name + '\'' +
+                ", variables=" + variables +
+                '}';
+    }
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailTracking.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationEmailTracking.java
@@ -0,0 +1,30 @@
+package com.messagebird.objects.conversations;
+
+public class ConversationEmailTracking {
+    private boolean open;
+    private boolean click;
+
+    public boolean isOpen() {
+        return open;
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public boolean isClick() {
+        return click;
+    }
+
+    public void setClick(boolean click) {
+        this.click = click;
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationEmailTracking{" +
+                "open=" + open +
+                ", click=" + click +
+                '}';
+    }
+}
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationMessage.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationMessage.java
@@ -20,6 +20,11 @@ public class ConversationMessage {
     private Date createdDatetime;
     private Date updatedDatetime;
     private Map<String, Object> source;
+    private ConversationMessageTag tag;
+    /**
+     * See: {@link ConversationPlatformConstants}
+     */
+    private String platform;
 
     public String getId() {
         return id;
@@ -101,6 +106,22 @@ public void setSource(Map<String, Object> source) {
         this.source = source;
     }
 
+    public ConversationMessageTag getTag() {
+        return tag;
+    }
+
+    public void setTag(ConversationMessageTag tag) {
+        this.tag = tag;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     @Override
     public String toString() {
         return "ConversationMessage{" +
@@ -114,6 +135,8 @@ public String toString() {
                 ", createdDatetime=" + createdDatetime +
                 ", updatedDatetime=" + updatedDatetime +
                 ", source=" + source +
+                ", tag=" + tag +
+                ", platform='" + platform + '\'' +
                 '}';
     }
 }
diff --git a/api/src/main/java/com/messagebird/objects/conversations/ConversationMessageRequest.java b/api/src/main/java/com/messagebird/objects/conversations/ConversationMessageRequest.java
@@ -1,5 +1,7 @@
 package com.messagebird.objects.conversations;
 
+import java.util.Map;
+
 /**
  * Request object that is used to send new messages over a channel.
  */
@@ -9,6 +11,7 @@ public class ConversationMessageRequest {
     private ConversationContent content;
     private String channelId;
     private String reportUrl;
+    private Map<String, Object> source;
 
     public ConversationContentType getType() {
         return type;
@@ -42,13 +45,22 @@ public void setReportUrl(String reportUrl) {
         this.reportUrl = reportUrl;
     }
 
+    public Map<String, Object> getSource() {
+        return source;
+    }
+
+    public void setSource(Map<String, Object> source) {
+        this.source = source;
+    }
+
     @Override
     public String toString() {
         return "ConversationMessageRequest{" +
                 "type=" + type +
                 ", content=" + content +
                 ", channelId='" + channelId + '\'' +
                 ", reportUrl='" + reportUrl + '\'' +
+                ", source=" + source +
                 '}';
     }
 }
