Corrected Tests, new RPC Messages, new Events, RTM Changes for new PresenceSub

.gitignore

@@ -17,6 +17,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+.vs/
 
 # External tool builders
 .externalToolBuilders/

README.md

@@ -4,7 +4,7 @@
 
 # SlackAPI
 
-This is a third party implementation of Slack's API written in C#. This supports their WebAPI aswell as their Real Time Messaging API.
+This is a third party implementation of Slack's API written in C#. This supports their WebAPI as well as their Real Time Messaging API.
 
 # Examples
 
@@ -24,7 +24,7 @@ Want committer access? Feel like I'm too lazy to keep up with Slack's ever chang
 
 Create some pull requests, give me a reason to give you access.
 
-# Howto build the solution
+# How to build the solution
 ###### (aka where is the config.json file?)
 The project **SlackAPI.Tests** requires a valid `config.json` file for tests. You have two options to build the solution:
 - Unload SlackAPI.Tests project and you're able to build SlackAPI solution.

SlackAPI.Console/Program.cs

@@ -1,10 +1,5 @@
-using SlackAPI;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 
 namespace SlackAPI
@@ -31,7 +26,7 @@ static void Main(string[] args)
 
                 // start...
                 var state = Guid.NewGuid().ToString();
-                var uri = SlackClient.GetAuthorizeUri(clientId, SlackScope.Identify | SlackScope.Read | SlackScope.Post, redirectUri, state, "socialsaleslounge");
+                var uri = SlackClient.GetAuthorizeUri(clientId, SlackScope.Identify | SlackScope.Read | SlackScope.Post | SlackScope.Client, redirectUri, state, "socialsaleslounge");
                 Console.WriteLine("Directing to: " + uri);
                 Process.Start(uri.ToString());
 

SlackAPI.Tests/Configuration/IntegrationCollection.cs

@@ -2,8 +2,8 @@
 
 namespace SlackAPI.Tests.Configuration
 {
-  [CollectionDefinition("Integration tests")]
-  public class IntegrationCollection : ICollectionFixture<IntegrationFixture>
-  {
-  }
+    [CollectionDefinition("Integration tests")]
+    public class IntegrationCollection : ICollectionFixture<IntegrationFixture>
+    {
+    }
 }

SlackAPI.Tests/Configuration/IntegrationFixture.cs

@@ -1,8 +1,8 @@
-using System;
+using Newtonsoft.Json;
+using SlackAPI.Tests.Helpers;
+using System;
 using System.IO;
 using System.Reflection;
-using Newtonsoft.Json;
-using SlackAPI.Tests.Helpers;
 using Xunit;
 
 namespace SlackAPI.Tests.Configuration
@@ -13,18 +13,22 @@ public IntegrationFixture()
         {
             this.Config = this.GetConfig();
             this.UserClient = this.GetClient(this.Config.UserAuthToken);
+            this.UserClientWithPresence = this.GetClient(this.Config.UserAuthToken, new[] { new Tuple<string, string>("batch_presence_aware", "true") });
             this.BotClient = this.GetClient(this.Config.BotAuthToken);
         }
 
         public SlackConfig Config { get; }
 
         public SlackSocketClient UserClient { get; }
 
+        public SlackSocketClient UserClientWithPresence { get; }
+
         public SlackSocketClient BotClient { get; }
 
         public void Dispose()
         {
             this.UserClient.CloseSocket();
+            this.UserClientWithPresence.CloseSocket();
             this.BotClient.CloseSocket();
         }
 
@@ -35,18 +39,18 @@ private SlackConfig GetConfig()
             string fileName = Path.Combine(assemblyDirectory, @"configuration\config.json");
             string json = System.IO.File.ReadAllText(fileName);
 
-            var jsonObject = new {slack = (SlackConfig)null };
+            var jsonObject = new { slack = (SlackConfig)null };
             return JsonConvert.DeserializeAnonymousType(json, jsonObject).slack;
         }
 
-        private SlackSocketClient GetClient(string authToken)
+        private SlackSocketClient GetClient(string authToken, Tuple<string, string>[] loginParameters = null)
         {
             SlackSocketClient client;
 
             using (var syncClient = new InSync($"{nameof(SlackClient.Connect)} - Connected callback"))
             using (var syncClientSocket = new InSync($"{nameof(SlackClient.Connect)} - SocketConnected callback"))
             {
-                client = new SlackSocketClient(authToken);
+                client = new SlackSocketClient(authToken, loginParameters);
                 client.Connect(x =>
                 {
                     Console.WriteLine("Connected");

SlackAPI.Tests/Configuration/SlackConfig.cs

@@ -4,7 +4,7 @@ public class SlackConfig
     {
         public string UserAuthToken { get; set; }
         public string BotAuthToken { get; set; }
-        public string TestChannel { get; set; }
+        public string TestChannelId { get; set; }
         public string DirectMessageUser { get; set; }
         public string AuthCode { get; set; }
         public string ClientId { get; set; }

SlackAPI.Tests/Configuration/config.default.json

@@ -2,10 +2,10 @@
   "slack": {
     "userAuthToken": "token-tokentoken-tokentoken-tokentoken-token",
     "botAuthToken": "bottoken-bottoken-bottoken-bottoken",
-    "testChannel": "SuperSecretChannel",
-    "directMessageUser":  "someUserId",
-	"authCode": "some-super-secret-code-from-Slack-specially-created-for-you-=)",
-	"clientId": "your-special-id",
-	"clientSecret": "such-special-secret-key"
+    "testChannelId": "someChannelId",
+    "directMessageUser": "someUserId",
+    "authCode": "some-super-secret-code-from-Slack-specially-created-for-you-=)",
+    "clientId": "your-special-id",
+    "clientSecret": "such-special-secret-key"
   }
 }

SlackAPI.Tests/Connect.cs

@@ -24,6 +24,13 @@ public void TestConnectAsUser()
             Assert.True(client.IsConnected, "Invalid, doesn't think it's connected.");
         }
 
+        [Fact]
+        public void TestConnectAsUserWithPresence()
+        {
+            var client = this.fixture.UserClientWithPresence;
+            Assert.True(client.IsConnected, "Invalid, doesn't think it's connected.");
+        }
+
         [Fact(Skip = "Unable to get a working test with data we have in config.json")]
         public void TestGetAccessToken()
         {
@@ -34,7 +41,7 @@ public void TestGetAccessToken()
 
             // act
             var accessTokenResponse = GetAccessToken(clientId, clientSecret, "", authCode);
-            
+
             // assert
             Assert.NotNull(accessTokenResponse);
             Assert.NotNull(accessTokenResponse.bot);
@@ -71,7 +78,7 @@ public void TestConnectPostAndDelete()
         {
             // given
             SlackSocketClient client = this.fixture.UserClient;
-            string channel = this.fixture.Config.TestChannel;
+            string channel = this.fixture.Config.TestChannelId;
 
             // when
             DateTime messageTimestamp = PostMessage(client, channel);

SlackAPI.Tests/Helpers/InSync.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Threading;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using Xunit;
 
 namespace SlackAPI.Tests.Helpers

SlackAPI.Tests/JoinDirectMessageChannel.cs

@@ -32,7 +32,7 @@ public void ShouldJoinDirectMessageChannel()
                 client.JoinDirectMessageChannel(response =>
                 {
                     actual = response;
-                    sync.Proceed();;
+                    sync.Proceed(); ;
                 }, user);
             }
 

SlackAPI.Tests/PostMessage.cs

@@ -30,7 +30,7 @@ public void SimpleMessageDelivery()
                         actual = response;
                         sync.Proceed();
                     },
-                    this.fixture.Config.TestChannel,
+                    this.fixture.Config.TestChannelId,
                     "Hi there!");
             }
 
@@ -56,7 +56,7 @@ public void Attachments()
                         actual = response;
                         sync.Proceed();
                     },
-                    this.fixture.Config.TestChannel,
+                    this.fixture.Config.TestChannelId,
                     string.Empty,
                     attachments: SlackMother.SomeAttachments);
             }
@@ -81,7 +81,7 @@ public void AttachmentsWithActions()
                         actual = response;
                         sync.Proceed();
                     },
-                    this.fixture.Config.TestChannel,
+                    this.fixture.Config.TestChannelId,
                     string.Empty,
                     attachments: SlackMother.SomeAttachmentsWithActions);
             }

SlackAPI.Tests/PresenceSub.cs

@@ -0,0 +1,41 @@
+using SlackAPI.Tests.Configuration;
+using SlackAPI.Tests.Helpers;
+using System.Linq;
+using Xunit;
+
+namespace SlackAPI.Tests
+{
+    [Collection("Integration tests")]
+    public class PresenceSub
+    {
+        private readonly IntegrationFixture fixture;
+
+        public PresenceSub(IntegrationFixture fixture)
+        {
+            this.fixture = fixture;
+        }
+
+        [Fact]
+        public void PresenceSubscribe()
+        {
+            var client = this.fixture.UserClientWithPresence;
+            var directMessageUser = client.Users.FirstOrDefault(x => x.name == this.fixture.Config.DirectMessageUser);
+            Assert.NotNull(directMessageUser);
+
+            //UserListResponse actual = null;
+            using (var sync = new InSync(nameof(SlackClient.UserLookup)))
+            {
+                client.OnPresenceChangeReceived += (user) =>
+                {
+
+                };
+                client.OnUserChangeReceived += (user) =>
+                {
+
+                };
+                client.SendPresenceSub(new[] { directMessageUser.id });
+                sync.Proceed();
+            }
+        }
+    }
+}

SlackAPI.Tests/SlackAPI.Tests.csproj

@@ -73,6 +73,7 @@
     <Compile Include="PostMessage.cs" />
     <Compile Include="JoinDirectMessageChannel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PresenceSub.cs" />
     <Compile Include="Users.cs" />
   </ItemGroup>
   <ItemGroup>

SlackAPI.Tests/Update.cs

@@ -1,11 +1,12 @@
 using SlackAPI.Tests.Configuration;
 using SlackAPI.Tests.Helpers;
+using System;
 using Xunit;
 
 namespace SlackAPI.Tests
 {
     [Collection("Integration tests")]
-    public class Update 
+    public class Update
     {
         private readonly IntegrationFixture fixture;
 
@@ -32,7 +33,7 @@ public void SimpleUpdate()
                         sync.Proceed();
                     },
                     messageId,
-                    this.fixture.Config.TestChannel,
+                    this.fixture.Config.TestChannelId,
                     "[changed]",
                     attachments: SlackMother.SomeAttachments,
                     as_user: true);
@@ -56,7 +57,7 @@ private string PostedMessage(SlackSocketClient client)
                         Assert.True(response.ok, "Error while posting message to channel. ");
                         sync.Proceed();
                     },
-                    this.fixture.Config.TestChannel,
+                    this.fixture.Config.TestChannelId,
                     "Hi there!",
                     as_user: true);
             }

SlackAPI.Tests/Users.cs

@@ -1,6 +1,6 @@
-using System.Linq;
-using SlackAPI.Tests.Configuration;
+using SlackAPI.Tests.Configuration;
 using SlackAPI.Tests.Helpers;
+using System.Linq;
 using Xunit;
 
 namespace SlackAPI.Tests
@@ -14,6 +14,7 @@ public Users(IntegrationFixture fixture)
         {
             this.fixture = fixture;
         }
+
         [Fact]
         public void UserList()
         {

SlackAPI/Attachment.cs

@@ -14,7 +14,7 @@ public class Attachment
         public string title_link;
         public string text;
         public Field[] fields;
-        
+
         public string image_url;
         public string thumb_url;
         public string[] mrkdwn_in;
@@ -24,7 +24,8 @@ public class Attachment
         public string footer_icon;
     }
 
-    public class Field{
+    public class Field
+    {
         public string title;
         public string value;
         public bool @short;

SlackAPI/Bot.cs

@@ -1,10 +1,8 @@
-using System;
-
-namespace SlackAPI
+namespace SlackAPI
 {
     public class Bot
     {
-        public string emoji; 
+        public string emoji;
         public string image_24;
         public string image_32;
         public string image_48;

SlackAPI/Channel.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
 {
     public class Channel : Conversation
     {

SlackAPI/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
 {
     public class ContextMessage : Message
     {

SlackAPI/Conversation.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SlackAPI
 {

SlackAPI/DirectMessageConversation.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
 {
     public class DirectMessageConversation : Conversation
     {