Added FILE_SHARE subtype for incoming message, new event added

jbot-example/src/test/java/example/jbot/slack/SlackBotTest.java

@@ -133,6 +133,18 @@ public void When_DirectMessage_Then_InvokeOnFileShared() {
         assertThat(capture.toString(), containsString("File shared"));
     }
 
+    @Test
+    public void When_DirectMessage_Then_InvokeOnFileSharedMessageSubtype() {
+        TextMessage textMessage = new TextMessage("{\"type\":\"message\"," +
+                "\"subtype\":\"file_share\"," +
+                "\"file_id\":\"F219AF6VD\"," +
+                "\"user_id\":\"U0MCAEX8A\"," +
+                "\"file\":{\"id\":\"F219AF6VD\"}," +
+                "\"event_ts\":\"1471213812.962298\"}");
+        bot.handleTextMessage(session, textMessage);
+        assertThat(capture.toString(), containsString("File shared message subtype"));
+    }
+
     @Test
     public void When_ConversationPattern_Then_StartConversation() {
         TextMessage textMessage = new TextMessage("{\"type\": \"message\"," +
@@ -239,6 +251,11 @@ public void onFileShared(WebSocketSession session, Event event) {
             System.out.println("File shared.");
         }
 
+        @Controller(events = EventType.FILE_SHARE_MESSAGE)
+        public void onFileSharedMessage(WebSocketSession session, Event event) {
+            System.out.println("File shared message subtype.");
+        }
+
         /**
          * Conversation feature of JBot.
          */

jbot/src/main/java/me/ramswaroop/jbot/core/common/EventType.java

@@ -13,7 +13,7 @@ public enum EventType {
     CHANNEL_LEFT, CHANNEL_DELETED, CHANNEL_RENAME, CHANNEL_ARCHIVE, CHANNEL_UNARCHIVE, CHANNEL_HISTORY_CHANGED,
     DND_UPDATED, DND_UPDATED_USER, IM_CREATED, IM_OPEN, IM_CLOSE, IM_MARKED, IM_HISTORY_CHANGED, GROUP_JOINED,
     GROUP_LEFT, GROUP_OPEN, GROUP_CLOSE, GROUP_ARCHIVE, GROUP_UNARCHIVE, GROUP_RENAME, GROUP_MARKED,
-    GROUP_HISTORY_CHANGED, FILE_CREATED, FILE_SHARED,
+    GROUP_HISTORY_CHANGED, FILE_CREATED, FILE_SHARE_MESSAGE, FILE_SHARED,
     FILE_UNSHARED, FILE_PUBLIC, FILE_PRIVATE, FILE_CHANGE, FILE_DELETED, FILE_COMMENT_ADDED, FILE_COMMENT_EDITED,
     FILE_COMMENT_DELETED, PIN_ADDED, PIN_REMOVED, PRESENCE_CHANGE, MANUAL_PRESENCE_CHANGE, PREF_CHANGE, USER_CHANGE,
     TEAM_JOIN, STAR_ADDED, STAR_REMOVED, REACTION_ADDED, REACTION_REMOVED, EMOJI_CHANGED, COMMANDS_CHANGED,

jbot/src/main/java/me/ramswaroop/jbot/core/slack/Bot.java

@@ -37,6 +37,7 @@
 public abstract class Bot extends BaseBot {
 
     private static final Logger logger = LoggerFactory.getLogger(Bot.class);
+    private static final String SUBTYPE_FILE_SHARE = "file_share";
 
     /**
      * Service to access Slack APIs.
@@ -118,6 +119,8 @@ public final void handleTextMessage(WebSocketSession session, TextMessage textMe
                         event.setType(EventType.DIRECT_MENTION.name());
                     } else if (slackService.getDmChannels().contains(event.getChannelId())) { // direct message
                         event.setType(EventType.DIRECT_MESSAGE.name());
+                    } else if (event.getSubtype() != null && event.getSubtype().equals(SUBTYPE_FILE_SHARE)) {
+                            event.setType(EventType.FILE_SHARE_MESSAGE.name());
                     }
                 }
             } else { // slack does not send any TYPE for acknowledgement messages
@@ -159,7 +162,7 @@ public final void reply(WebSocketSession session, Event event, Message reply) {
             logger.error("Error sending event: {}. Exception: {}", event.getText(), e.getMessage());
         }
     }
-    
+
     public final void reply(WebSocketSession session, Event event, String text) {
         reply(session, event, new Message(text));
     }

jbot/src/test/java/me/ramswaroop/jbot/core/slack/EventTypeTest.java

@@ -13,13 +13,13 @@ public class EventTypeTest {
     /**
      * Number of events in {@link EventType} should be
      * equal to the number of events supported by slack
-     * (including 3 added by JBot) plus number of events
+     * (including 4 added by JBot) plus number of events
      * supported in fb bot.
      */
     @Test
     public void numberOfEventsType() {
         EventType[] events = EventType.values();
-        assertEquals(83, events.length);
+        assertEquals(84, events.length);
     }
 
 }