Merge branch 'master' into ping_pong_message_and_event

Author: Gaspard Petit

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

@@ -13,9 +13,27 @@
       "reply_users_count": 12345,
       "latest_reply": "0000000000.000000",
       "reply_users": [
-        "B00000000"
+        "B00000000",
+        "U00000000"
       ],
-      "subscribed": false
+      "subscribed": false,
+      "user": "U00000000",
+      "team": "T00000000",
+      "bot_profile": {
+        "id": "B00000000",
+        "deleted": false,
+        "name": "",
+        "updated": 12345,
+        "app_id": "A00000000",
+        "icons": {
+          "image_36": "https://www.example.com/",
+          "image_48": "https://www.example.com/",
+          "image_72": "https://www.example.com/"
+        },
+        "team_id": "T00000000"
+      },
+      "parent_user_id": "U00000000",
+      "last_read": "0000000000.000000"
     }
   ],
   "has_more": false,

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

@@ -18,7 +18,23 @@
       "ts": "0000000000.000000",
       "username": "",
       "bot_id": "B00000000",
-      "thread_ts": "0000000000.000000"
+      "thread_ts": "0000000000.000000",
+      "user": "U00000000",
+      "team": "T00000000",
+      "bot_profile": {
+        "id": "B00000000",
+        "deleted": false,
+        "name": "",
+        "updated": 12345,
+        "app_id": "A00000000",
+        "icons": {
+          "image_36": "https://www.example.com/",
+          "image_48": "https://www.example.com/",
+          "image_72": "https://www.example.com/"
+        },
+        "team_id": "T00000000"
+      },
+      "parent_user_id": "U00000000"
     },
     "unread_count": 12345,
     "unread_count_display": 12345,

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

@@ -673,13 +673,21 @@
         "root": {
           "text": "",
           "user": "",
+          "parent_user_id": "",
           "username": "",
           "team": "",
           "bot_id": "",
           "mrkdwn": false,
           "type": "",
           "subtype": "",
           "thread_ts": "",
+          "icons": {
+            "emoji": "",
+            "image_36": "",
+            "image_48": "",
+            "image_64": "",
+            "image_72": ""
+          },
           "bot_profile": {
             "id": "",
             "deleted": false,
@@ -812,13 +820,21 @@
                 "root": {
                   "text": "",
                   "user": "",
+                  "parent_user_id": "",
                   "username": "",
                   "team": "",
                   "bot_id": "",
                   "mrkdwn": false,
                   "type": "",
                   "subtype": "",
                   "thread_ts": "",
+                  "icons": {
+                    "emoji": "",
+                    "image_36": "",
+                    "image_48": "",
+                    "image_64": "",
+                    "image_72": ""
+                  },
                   "bot_profile": {
                     "id": "",
                     "deleted": false,

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

@@ -33,13 +33,21 @@
         "root": {
           "text": "",
           "user": "",
+          "parent_user_id": "",
           "username": "",
           "team": "",
           "bot_id": "",
           "mrkdwn": false,
           "type": "",
           "subtype": "",
           "thread_ts": "",
+          "icons": {
+            "emoji": "",
+            "image_36": "",
+            "image_48": "",
+            "image_64": "",
+            "image_72": ""
+          },
           "bot_profile": {
             "id": "",
             "deleted": false,

json-logs/samples/events/MemberJoinedChannelPayload.json

@@ -9,7 +9,8 @@
     "channel": "",
     "channel_type": "",
     "team": "",
-    "event_ts": "0000000000.000000"
+    "event_ts": "0000000000.000000",
+    "inviter": ""
   },
   "type": "event_callback",
   "event_id": "",

scripts/run_no_prep_tests.sh

@@ -5,4 +5,4 @@
   '-Dtest=test_locally.**.*Test' test \
   -DfailIfNoTests=false \
   --no-transfer-progress && \
-  if git status --porcelain | grep .; then git diff --no-pager; exit 1; fi
+  if git status --porcelain | grep .; then git --no-pager diff; exit 1; fi

slack-api-client/src/test/java/test_locally/api/methods/FieldValidation_a_to_c_Test.java

@@ -453,7 +453,9 @@ public void conversations_commands() throws Exception {
                     "getLastRead",
                     "getDateConnected",
                     "getThreadTs",
-                    "getUsername"
+                    "getUsername",
+                    "getParentUserId",
+                    "getBotProfile"
             );
         }
         {

slack-api-model/src/main/java/com/slack/api/model/Latest.java

@@ -15,6 +15,7 @@ public class Latest {
     private String team;
     private String user;
     private String username;
+    private String parentUserId;
     private String text;
     private String topic; // groups
     private List<Attachment> attachments;
@@ -26,6 +27,7 @@ public class Latest {
     private boolean displayAsBot;
     private String botId;
     private String botLink;
+    private BotProfile botProfile;
     private String threadTs;
     private String ts;
     private Message.Icons icons;