Merge branch 'master' into issue-477

Author: seratch

json-logs/raw/status/api/v1.0.0/current.json

@@ -233,6 +233,10 @@
     {
       "date_created": "2020-05-26T11:19:03-07:00",
       "body": "Our team is investigating an issue that is causing custom emoji to go missing from some workspaces. We\u0027ll keep you updated as soon as we have more information."
+    },
+    {
+      "date_created": "2020-06-01T11:23:40-07:00",
+      "body": "Some Android users may notice that new messages are not showing up in channels and DMs immediately. We\u0027re actively investigating this issue and will keep you posted as more information becomes available. For now, quitting and reopening the Slack app should allow new messages to load. We\u0027re sorry for any disruption this brings to your day."
     }
   ]
 }

json-logs/raw/status/api/v2.0.0/current.json

@@ -293,6 +293,24 @@
           "body": "Our team is investigating an issue that is causing custom emoji to go missing from some workspaces. We\u0027ll keep you updated as soon as we have more information."
         }
       ]
+    },
+    {
+      "id": 857,
+      "date_created": "2020-06-01T11:23:40-07:00",
+      "date_updated": "2020-06-01T11:23:40-07:00",
+      "title": "Some new messages are not appearing on Android",
+      "type": "incident",
+      "status": "active",
+      "url": "https://status.slack.com/2020-06/9cd5efa0af2dbfad",
+      "services": [
+        "Messaging"
+      ],
+      "notes": [
+        {
+          "date_created": "2020-06-01T11:23:40-07:00",
+          "body": "Some Android users may notice that new messages are not showing up in channels and DMs immediately. We\u0027re actively investigating this issue and will keep you posted as more information becomes available. For now, quitting and reopening the Slack app should allow new messages to load. We\u0027re sorry for any disruption this brings to your day."
+        }
+      ]
     }
   ]
 }

json-logs/samples/api/channels.history.json

@@ -667,7 +667,8 @@
           ],
           "count": 12345
         }
-      ]
+      ],
+      "client_msg_id": ""
     }
   ],
   "has_more": false,

json-logs/samples/api/conversations.history.json

@@ -657,7 +657,8 @@
       "display_as_bot": false,
       "x_files": [
         "F00000000"
-      ]
+      ],
+      "client_msg_id": ""
     }
   ],
   "has_more": false,

json-logs/samples/api/mpim.replies.json

@@ -31,7 +31,8 @@
         },
         "team_id": "T00000000"
       },
-      "parent_user_id": "U00000000"
+      "parent_user_id": "U00000000",
+      "last_read": "0000000000.000000"
     }
   ],
   "has_more": false,

json-logs/samples/api/rtm.start.json

@@ -331,7 +331,8 @@
         "pt-BR": "",
         "ja-JP": ""
       },
-      "channel_sidebar_hide_browse_dms_link": false
+      "channel_sidebar_hide_browse_dms_link": false,
+      "enable_all_dms_view": false
     },
     "created": 12345,
     "first_login": 12345,
@@ -558,7 +559,8 @@
           ""
         ]
       },
-      "invites_limit": false
+      "invites_limit": false,
+      "ntlm_credential_domains": ""
     },
     "icon": {
       "image_34": "https://www.example.com/",

json-logs/samples/scim/v1/Users.json

@@ -110,5 +110,22 @@
   "Errors": {
     "description": "",
     "code": 12345
+  },
+  "addresses": [
+    {}
+  ],
+  "phoneNumbers": [
+    {
+      "type": "",
+      "primary": false
+    }
+  ],
+  "roles": [
+    {
+      "primary": false
+    }
+  ],
+  "urn:scim:schemas:extension:enterprise:1.0": {
+    "manager": {}
   }
 }

slack-api-client/src/main/java/com/slack/api/rtm/RTMEventsDispatcherImpl.java

@@ -1,5 +1,8 @@
 package com.slack.api.rtm;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.slack.api.model.event.Event;
 import com.slack.api.util.json.GsonFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -40,8 +43,12 @@ public void deregister(RTMEventHandler<? extends Event> handler) {
 
     @Override
     public void dispatch(String json) {
-        String eventType = detectEventType(json);
-        String eventSubType = detectEventSubType(json);
+        JsonElement jsonMessage = JsonParser.parseString(json);
+        if (jsonMessage.isJsonObject() == false)
+            return;
+
+        String eventType = detectEventType(jsonMessage.getAsJsonObject());
+        String eventSubType = detectEventSubType(jsonMessage.getAsJsonObject());
 
         if (eventType == null) {
             log.debug("Failed to detect event type from the given JSON data: {}", json);
@@ -59,7 +66,7 @@ public void dispatch(String json) {
             if (rtmEventHandlers.isEmpty() == false) {
                 Class<?> clazz = rtmEventHandlers.get(0).getEventClass();
                 for (RTMEventHandler<?> handler : rtmEventHandlers) {
-                    Event event = (Event) GsonFactory.createSnakeCase().fromJson(json, clazz);
+                    Event event = (Event) GsonFactory.createSnakeCase().fromJson(jsonMessage, clazz);
                     handler.acceptUntypedObject(event);
                 }
             }
@@ -78,72 +85,20 @@ public void handle(String message) {
         return messageHandler;
     }
 
-    public static String detectEventType(String json) {
-        StringBuilder sb = new StringBuilder();
-        char[] chars = json.toCharArray();
-        for (int idx = 0; idx < (chars.length - 6); idx++) {
-            if (chars[idx] == '"'
-                    && chars[idx + 1] == 't'
-                    && chars[idx + 2] == 'y'
-                    && chars[idx + 3] == 'p'
-                    && chars[idx + 4] == 'e'
-                    && chars[idx + 5] == '"'
-                    && chars[idx + 6] == ':') {
-                idx = idx + 7;
-                int doubleQuoteCount = 0;
-                boolean isPreviousCharEscape = false;
-                while (doubleQuoteCount < 2 && idx < chars.length) {
-                    char c = chars[idx];
-                    if (c == '"' && !isPreviousCharEscape) {
-                        doubleQuoteCount++;
-                    } else {
-                        if (doubleQuoteCount == 1) {
-                            sb.append(c);
-                        }
-                    }
-                    isPreviousCharEscape = c == '\\';
-                    idx++;
-                }
-                break;
-            }
-        }
-        return sb.toString();
+    public static String detectEventType(JsonObject json) {
+        JsonElement type = json.get("type");
+        if (type == null || type.isJsonPrimitive() == false)
+            return "";
+        return type.getAsString();
     }
 
 
-    public static String detectEventSubType(String json) {
-        StringBuilder sb = new StringBuilder();
-        char[] chars = json.toCharArray();
-        for (int idx = 0; idx < (chars.length - 9); idx++) {
-            if (chars[idx] == '"'
-                    && chars[idx + 1] == 's'
-                    && chars[idx + 2] == 'u'
-                    && chars[idx + 3] == 'b'
-                    && chars[idx + 4] == 't'
-                    && chars[idx + 5] == 'y'
-                    && chars[idx + 6] == 'p'
-                    && chars[idx + 7] == 'e'
-                    && chars[idx + 8] == '"'
-                    && chars[idx + 9] == ':') {
-                idx = idx + 10;
-                int doubleQuoteCount = 0;
-                boolean isPreviousCharEscape = false;
-                while (doubleQuoteCount < 2 && idx < chars.length) {
-                    char c = chars[idx];
-                    if (c == '"' && !isPreviousCharEscape) {
-                        doubleQuoteCount++;
-                    } else {
-                        if (doubleQuoteCount == 1) {
-                            sb.append(c);
-                        }
-                    }
-                    isPreviousCharEscape = c == '\\';
-                    idx++;
-                }
-                break;
-            }
-        }
-        return sb.toString();
+    public static String detectEventSubType(JsonObject json) {
+
+        JsonElement type = json.get("subtype");
+        if (type == null || type.isJsonPrimitive() == false)
+            return "";
+        return type.getAsString();
     }
 
 }

slack-api-client/src/test/java/test_locally/api/rtm/RTMEventsDispatcherImplTest.java

@@ -1,5 +1,7 @@
 package test_locally.api.rtm;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.slack.api.model.event.Event;
 import com.slack.api.model.event.MessageEvent;
 import com.slack.api.rtm.RTMEventHandler;
@@ -15,10 +17,25 @@ public class RTMEventsDispatcherImplTest {
 
     @Test
     public void eventDetection() {
-        String type = RTMEventsDispatcherImpl.detectEventType("{\"type\": \"hello\"}");
+        JsonObject jsonMessage = JsonParser.parseString("{\"type\": \"hello\"}").getAsJsonObject();
+        String type = RTMEventsDispatcherImpl.detectEventType(jsonMessage);
         assertThat(type, is("hello"));
     }
 
+    @Test
+    public void eventSubtypeDetection() {
+        JsonObject jsonMessage = JsonParser.parseString("{ \"type\": \"message\", \"subtype\": \"bot_message\" }").getAsJsonObject();
+        String subtype = RTMEventsDispatcherImpl.detectEventSubType(jsonMessage);
+        assertThat(subtype, is("bot_message"));
+    }
+
+    @Test
+    public void eventInnerSubtypeDetection() {
+        JsonObject jsonMessage = JsonParser.parseString("{\"type\": \"pin_added\", \"item\": { \"type\": \"message\", \"subtype\": \"bot_message\" } }").getAsJsonObject();
+        String subtype = RTMEventsDispatcherImpl.detectEventSubType(jsonMessage);
+        assertThat(subtype, is(""));
+    }
+
     @Test
     public void factory() {
         RTMEventsDispatcher dispatcher = RTMEventsDispatcherFactory.getInstance();