FIX channel history browsing

(see issue #49)
Itiviti · Mar 7, 2016 · 61547ec · 61547ec
1 parent ceee9f6
commit 61547ec
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/sources/src/main/java/com/ullink/slack/simpleslackapi/SlackChannel.java b/sources/src/main/java/com/ullink/slack/simpleslackapi/SlackChannel.java
@@ -4,6 +4,11 @@
 
 public interface SlackChannel
 {
+
+    public enum SlackChannelType {
+        PUBLIC_CHANNEL, PRIVATE_GROUP, INSTANT_MESSAGING
+    }
+
     String getId();
 
     String getName();
@@ -16,4 +21,6 @@ public interface SlackChannel
 
     boolean isDirect();
 
+    SlackChannelType getType();
+
 }
diff --git a/sources/src/main/java/com/ullink/slack/simpleslackapi/impl/ChannelHistoryModuleImpl.java b/sources/src/main/java/com/ullink/slack/simpleslackapi/impl/ChannelHistoryModuleImpl.java
@@ -4,6 +4,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.ullink.slack.simpleslackapi.SlackChannel;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.threeten.bp.LocalDate;
@@ -25,6 +27,8 @@ public class ChannelHistoryModuleImpl implements ChannelHistoryModule {
 
     private final SlackSession session;
     private static final String FETCH_CHANNEL_HISTORY_COMMAND = "channels.history";
+    private static final String FETCH_GROUP_HISTORY_COMMAND = "groups.history";
+    private static final String FETCH_IM_HISTORY_COMMAND = "im.history";
 
     public ChannelHistoryModuleImpl(SlackSession session) {
         this.session = session;
@@ -60,11 +64,19 @@ public List<SlackMessagePosted> fetchHistoryOfChannel(String channelId, LocalDat
         } else {
             params.put("count", String.valueOf(1000));
         }
-        return fetchHistoryOfChannel(params);
+        SlackChannel channel =session.findChannelById(channelId);
+        switch (channel.getType()) {
+            case INSTANT_MESSAGING:
+                return fetchHistoryOfChannel(params,FETCH_IM_HISTORY_COMMAND);
+            case PRIVATE_GROUP:
+                return fetchHistoryOfChannel(params,FETCH_GROUP_HISTORY_COMMAND);
+            default:
+                return fetchHistoryOfChannel(params,FETCH_CHANNEL_HISTORY_COMMAND);
+        }
     }
 
-    private List<SlackMessagePosted> fetchHistoryOfChannel(Map<String, String> params) {
-        SlackMessageHandle<GenericSlackReply> handle = session.postGenericSlackCommand(params, FETCH_CHANNEL_HISTORY_COMMAND);
+    private List<SlackMessagePosted> fetchHistoryOfChannel(Map<String, String> params, String command) {
+        SlackMessageHandle<GenericSlackReply> handle = session.postGenericSlackCommand(params, command);
         GenericSlackReply replyEv = handle.getReply();
         JSONObject answer = replyEv.getPlainAnswer();
         JSONArray events = (JSONArray) answer.get("messages");

diff --git a/sources/src/main/java/com/ullink/slack/simpleslackapi/impl/SlackChannelImpl.java b/sources/src/main/java/com/ullink/slack/simpleslackapi/impl/SlackChannelImpl.java
@@ -79,4 +79,17 @@ public String getPurpose()
     public boolean isDirect() {
         return direct;
     }
+
+    @Override
+    public SlackChannelType getType()
+    {
+        //that's a bit hacky
+        if (isDirect()) {
+            return SlackChannelType.INSTANT_MESSAGING;
+        }
+        if (id.startsWith("G")) {
+            return SlackChannelType.PRIVATE_GROUP;
+        }
+        return SlackChannelType.PUBLIC_CHANNEL;
+    }
 }