Expand use of Conversations to user-friendly enum and

Expands the use of conversations to use an enum when specifying request instead of pure string. Expands on Inumedia#250
alexherreid · Sep 11, 2020 · b5546bf · b5546bf
1 parent 06f2689
commit b5546bf
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 15 deletions.
diff --git a/SlackAPI/Conversation.cs b/SlackAPI/Conversation.cs
@@ -6,14 +6,46 @@
 
 namespace SlackAPI
 {
-    public class Conversation
-    {
-        public string id;
-        public DateTime created;
-        public DateTime last_read;
-        public bool is_open;
-        public bool is_starred;
-        public int unread_count;
-        public Message latest;
-    }
+	public class Conversation
+	{
+		public string id;
+		public DateTime created;
+		public DateTime last_read;
+		public bool is_open;
+		public bool is_starred;
+		public int unread_count;
+		public Message latest;
+
+		public static string ConversationTypesToQueryParam(ConversationTypes[] types)
+		{
+			//Translate the enum user-friendly names to API used names
+			List<string> typesAsString = new List<string>();
+			if (types.Contains(ConversationTypes.PublicChannel))
+			{
+				typesAsString.Add("public_channel");
+			}
+			if (types.Contains(ConversationTypes.PrivateChannel))
+			{
+				typesAsString.Add("private_channel");
+			}
+			if (types.Contains(ConversationTypes.GroupMessage))
+			{
+				typesAsString.Add("mpim");
+			}
+			if (types.Contains(ConversationTypes.DirectMessage))
+			{
+				typesAsString.Add("im");
+			}
+
+			return string.Join(",", types);
+		}
+	}
+
+	public enum ConversationTypes
+	{
+		PublicChannel, //public_channel
+		PrivateChannel, //private_channel
+		GroupMessage, //mpim
+		DirectMessage //im
+	}
 }
diff --git a/SlackAPI/SlackClient.cs b/SlackAPI/SlackClient.cs
@@ -147,16 +147,16 @@ public void ChannelsInvite(Action<ChannelInviteResponse> callback, string userId
             APIRequestWithToken(callback, parameters.ToArray());
         }
 
-        public void GetConversationsList(Action<ConversationsListResponse> callback, string cursor = "", bool ExcludeArchived = true, int limit = 100, string[] types = null)
+        public void GetConversationsList(Action<ConversationsListResponse> callback, string cursor = "", bool ExcludeArchived = true, int limit = 100, ConversationTypes[] types = null)
         {
 	        List<Tuple<string, string>> parameters = new List<Tuple<string, string>>()
 	        {
 		        Tuple.Create("exclude_archived", ExcludeArchived ? "1" : "0")
 	        };
 	        if (limit > 0)
 		        Tuple.Create("limit", limit.ToString());
-            if (types.Any())
-		        Tuple.Create("types", string.Join(",", types));
+            if (types != null && types.Any())
+		        Tuple.Create("types", Conversation.ConversationTypesToQueryParam(types));
 	        if (!string.IsNullOrEmpty(cursor))
 		        parameters.Add(new Tuple<string, string>("cursor", cursor));
 

diff --git a/SlackAPI/SlackTaskClient.cs b/SlackAPI/SlackTaskClient.cs
@@ -127,7 +127,7 @@ public Task<ChannelInviteResponse> ChannelsInviteAsync(string userId, string cha
             return APIRequestWithTokenAsync<ChannelInviteResponse>(parameters.ToArray());
         }
 
-        public Task<ConversationsListResponse> GetConversationsListAsync(string cursor = "", bool ExcludeArchived = true, int limit = 100, string[] types = null)
+        public Task<ConversationsListResponse> GetConversationsListAsync(string cursor = "", bool ExcludeArchived = true, int limit = 100, ConversationTypes[] types = null)
         {
 	        List<Tuple<string, string>> parameters = new List<Tuple<string, string>>()
 	        {
@@ -136,7 +136,7 @@ public Task<ConversationsListResponse> GetConversationsListAsync(string cursor =
 	        if (limit > 0)
 		        parameters.Add(Tuple.Create("limit", limit.ToString()));
 	        if (types != null && types.Any())
-		        parameters.Add(Tuple.Create("types", string.Join(",", types)));
+		        parameters.Add(Tuple.Create("types", Conversation.ConversationTypesToQueryParam(types)));
 	        if (!string.IsNullOrEmpty(cursor))
 		        parameters.Add(new Tuple<string, string>("cursor", cursor));