MultiWebSocket

Change: objects class move to the Models folder, List will all the slackChannel(Group, DM, Channels). Father class SlackChannel from all channels(Group, DM, Channels). Fix bug when the socket receive a message with type null. Fix the error when the slackSocketClient try open socket with LoginReponse is not Ok, Add more events, and now the event pass back the slackclient/slacksocketclient
Inumedia · Jun 27, 2016 · 2389db1 · 2389db1 · Inumedia · Jun 27, 2016
1 parent ea9f946
commit 2389db1
Show file tree

Hide file tree

Showing 96 changed files with 754 additions and 681 deletions.
diff --git a/Attachment.cs b/Attachment.cs
diff --git a/Channel.cs b/Channel.cs
diff --git a/DirectMessageConversation.cs b/DirectMessageConversation.cs
diff --git a/IntegrationTest/Connect.cs b/IntegrationTest/Connect.cs
@@ -6,6 +6,7 @@
 using IntegrationTest.Helpers;
 using Polly;
 using SlackAPI.WebSocketMessages;
+using SlackAPI.Models;
 
 namespace IntegrationTest
 {
@@ -85,7 +86,7 @@ public void TestConnectPostAndDelete()
 
             // then
             Assert.IsNotNull(deletedResponse, "No response was found");
-            Assert.IsTrue(deletedResponse.ok, "Message not deleted!");
+            Assert.IsTrue(deletedResponse.Ok, "Message not deleted!");
             Assert.AreEqual(channel, deletedResponse.channel, "Got invalid channel? Something's not right here...");
             Assert.AreEqual(messageTimestamp, deletedResponse.ts, "Got invalid time stamp? Something's not right here...");
         }

diff --git a/IntegrationTest/Helpers/ClientHelper.cs b/IntegrationTest/Helpers/ClientHelper.cs
@@ -13,7 +13,7 @@ public static SlackSocketClient GetClient(string authToken)
             var wait = new EventWaitHandle(false, EventResetMode.ManualReset);
 
             var client = new SlackSocketClient(authToken);
-            client.Connect(x =>
+            client.Connect((x,sc) =>
             {
                 Console.WriteLine("RTM Start");
             }, () =>

diff --git a/IntegrationTest/Helpers/SlackMother.cs b/IntegrationTest/Helpers/SlackMother.cs
@@ -1,27 +1,28 @@
-namespace IntegrationTest.Helpers
-{
-    using SlackAPI;
+using SlackAPI;
+using SlackAPI.Models;
 
+namespace IntegrationTest.Helpers
+{
     public class SlackMother
     {
         public static Attachment[] SomeAttachments => new[]
         {
             new Attachment()
             {
-                fallback = "Required plain-text summary of the attachment.",
-                color = "#36a64f",
-                pretext = "Optional text that appears above the attachment block",
-                author_name = "Bobby Tables",
-                author_link = "http://flickr.com/bobby/",
-                author_icon = "http://flickr.com/icons/bobby.jpg",
-                title = "Slack API Documentation",
-                title_link = "https://api.slack.com/",
-                text = "Optional text that appears within the attachment",
-                fields = new[]
+                Fallback = "Required plain-text summary of the attachment.",
+                Color = "#36a64f",
+                Pretext = "Optional text that appears above the attachment block",
+                AuthorName = "Bobby Tables",
+                AuthorLink = "http://flickr.com/bobby/",
+                AuthorIcon = "http://flickr.com/icons/bobby.jpg",
+                Title = "Slack API Documentation",
+                TitleLink = "https://api.slack.com/",
+                Text = "Optional text that appears within the attachment",
+                Fields = new[]
                 {
-                    new Field() { title = "Priority", value = "High", @short = false },
-                    new Field() { title = "Priority", value = "High", @short = true },
-                    new Field() { title = "Priority", value = "High", @short = true }
+                    new Field() { Title = "Priority", Value = "High", IsShort = false },
+                    new Field() { Title = "Priority", Value = "High", IsShort = true },
+                    new Field() { Title = "Priority", Value = "High", IsShort = true }
                 }
             }
         };

diff --git a/IntegrationTest/JoinDirectMessageChannel.cs b/IntegrationTest/JoinDirectMessageChannel.cs
@@ -31,8 +31,8 @@ public void ShouldJoinDirectMessageChannel()
             EventWaitHandle wait = new EventWaitHandle(false, EventResetMode.ManualReset);
             client.JoinDirectMessageChannel(response =>
             {
-                Assert.IsTrue(response.ok, "Error while joining user channel");
-                Assert.IsTrue(!string.IsNullOrEmpty(response.channel.id), "We expected a channel id to be returned");
+                Assert.IsTrue(response.Ok, "Error while joining user channel");
+                Assert.IsTrue(!string.IsNullOrEmpty(response.channel.Id), "We expected a channel id to be returned");
                 wait.Set();
             }, user);
 

diff --git a/IntegrationTest/PostMessage.cs b/IntegrationTest/PostMessage.cs
@@ -9,7 +9,7 @@
 namespace IntegrationTest
 {
     using SlackAPI;
-
+    using SlackAPI.Models;
     [TestClass]
     public class PostMessage
     {
@@ -41,7 +41,7 @@ public void SimpleMessageDelivery()
             }
 
             // then
-            Assert.IsTrue(actual.ok, "Error while posting message to channel. ");
+            Assert.IsTrue(actual.Ok, "Error while posting message to channel. ");
             Assert.AreEqual(actual.message.text, "Hi there!");
             Assert.AreEqual(actual.message.type, "message");
         }
@@ -68,7 +68,7 @@ public void Attachments()
             }
 
             // then
-            Assert.IsTrue(actual.ok, "Error while posting message to channel. ");
+            Assert.IsTrue(actual.Ok, "Error while posting message to channel. ");
         }
     }
 }
diff --git a/IntegrationTest/Update.cs b/IntegrationTest/Update.cs
@@ -6,7 +6,7 @@
 namespace IntegrationTest
 {
     using SlackAPI;
-
+    using SlackAPI.Models;
     [TestClass]
     public class Update 
     {
@@ -42,7 +42,7 @@ public void SimpleUpdate()
             }
 
             // then
-            Assert.IsTrue(actual.ok, "Error while posting message to channel. ");
+            Assert.IsTrue(actual.Ok, "Error while posting message to channel. ");
             Assert.AreEqual(actual.message.text, "[changed]");
             Assert.AreEqual(actual.message.type, "message");
         }
@@ -56,7 +56,7 @@ private string PostedMessage(SlackSocketClient client)
                     response =>
                     {
                         messageId = response.ts;
-                        Assert.IsTrue(response.ok, "Error while posting message to channel. ");
+                        Assert.IsTrue(response.Ok, "Error while posting message to channel. ");
                         sync.Proceed();
                     },
                     _config.Slack.TestChannel,

diff --git a/JavascriptBotsToArray.cs b/JavascriptBotsToArray.cs
@@ -1,4 +1,5 @@
-using System;
+using SlackAPI.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/Models/Attachment.cs b/Models/Attachment.cs
@@ -0,0 +1,59 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace SlackAPI.Models
+{
+    //See: https://api.slack.com/docs/attachments
+    public class Attachment
+    {
+        [JsonProperty(PropertyName = "fallback")]
+        public string Fallback { get; set; }
+
+        [JsonProperty(PropertyName = "color")]
+        public string Color { get; set; }
+
+        [JsonProperty(PropertyName = "pretext")]
+        public string Pretext { get; set; }
+
+        [JsonProperty(PropertyName = "author_name")]
+        public string AuthorName { get; set; }
+
+        [JsonProperty(PropertyName = "author_link")]
+        public string AuthorLink { get; set; }
+
+        [JsonProperty(PropertyName = "author_icon")]
+        public string AuthorIcon { get; set; }
+
+        [JsonProperty(PropertyName = "title")]
+        public string Title { get; set; }
+
+        [JsonProperty(PropertyName = "title_link")]
+        public string TitleLink { get; set; }
+
+        [JsonProperty(PropertyName = "text")]
+        public string Text { get; set; }
+
+        [JsonProperty(PropertyName = "fields")]
+        public Field[] Fields { get; set; }
+
+        [JsonProperty(PropertyName = "image_url")]
+        public string ImageUrl { get; set; }
+
+        [JsonProperty(PropertyName = "thumb_url")]
+        public string ThumbUrl { get; set; }
+
+        [JsonProperty(PropertyName = "mrkdwn_in")]
+        public string[] MrkdwnIn { get; set; }
+    }
+
+    public class Field{
+        [JsonProperty(PropertyName = "title")]
+        public string Title { get; set; }
+
+        [JsonProperty(PropertyName = "value")]
+        public string Value { get; set; }
+
+        [JsonProperty(PropertyName = "short")]
+        public bool IsShort { get; set; }
+    }
+}
diff --git a/Bot.cs → Models/Bot.cs b/Bot.cs → Models/Bot.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SlackAPI
+namespace SlackAPI.Models
 {
     public class Bot
     {

diff --git a/Models/Channel.cs b/Models/Channel.cs
@@ -0,0 +1,70 @@
+using Newtonsoft.Json;
+using System;
+
+namespace SlackAPI.Models
+{
+    /// <summary>
+    /// https://api.slack.com/types/channel
+    /// </summary>
+    public class Channel : SlackChannel
+    {
+        [JsonProperty(PropertyName = "is_channel")]
+        public bool IsChannel { get; set; }
+
+        /// <summary>
+        /// Is the user ID of the member that created this private channel.
+        /// </summary>
+        [JsonProperty(PropertyName = "creator")]
+        public string CreatorUserId { get; set; }
+
+        /// <summary>
+        /// Will be true if the channel is archived.
+        /// </summary>
+        [JsonProperty(PropertyName = "is_archived")]
+        public bool IsArchived { get; set; }
+
+        [JsonProperty(PropertyName = "is_mpim")]
+        public bool IsMpim { get; set; }
+
+        /// <summary>
+        /// Is a list of user ids for all users in this channel. 
+        /// This includes any disabled accounts that were in this channel when they were disabled.
+        /// </summary>
+        [JsonProperty(PropertyName = "members")]
+        public string[] Members { get; set; }
+
+        /// <summary>
+        /// Will be true if the calling member is part of the channel.
+        /// </summary>
+        [JsonProperty(PropertyName = "is_member")]
+        public bool IsMember { get; set; }
+
+        /// <summary>
+        /// Will be true if this channel is the "general" channel that includes all regular team members. 
+        /// In most teams this is called #general but some teams have renamed it.
+        /// </summary>
+        [JsonProperty(PropertyName = "is_general")]
+        public bool IsGeneral { get; set; }
+
+        [JsonProperty(PropertyName = "is_group")]
+        public bool IsGroup { get; set; }
+
+        [Obsolete]
+        [JsonProperty(PropertyName = "num_members")]
+        public int NumMembers { get; set; }
+
+        /// <summary>
+        /// Provide information about the channel topic
+        /// </summary>
+        [JsonProperty(PropertyName = "topic")]
+        public OwnedStampedMessage Topic { get; set; }
+
+        /// <summary>
+        /// Provide information about the channel purpose
+        /// </summary>
+        [JsonProperty(PropertyName = "purpose")]
+        public OwnedStampedMessage Purpose { get; set; }
+
+        public override SlackChannelType Type { get { return IsChannel ? SlackChannelType.Channel : SlackChannelType.Group; } }
+    }
+}
diff --git a/ContextMessage.cs → Models/ContextMessage.cs b/ContextMessage.cs → Models/ContextMessage.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SlackAPI
+namespace SlackAPI.Models
 {
     public class ContextMessage : Message
     {