Add support for mor New Gmail events

Improve tests to do end-to-end testing and event-parsing on real XHR-data.

Author: hankypanky666

src/gmail.js

@@ -993,13 +993,26 @@ var Gmail = function(localJQuery) {
     };
 
     api.check.data.is_action = function(obj) {
+        return api.check.data.is_first_type_action(obj)
+            || api.check.data.is_second_type_action(obj);
+    };
+
+    api.check.data.is_first_type_action = function(obj) {
         return obj
             && obj["1"]
             && Array.isArray(obj["1"])
             && obj["1"].length === 1
             && typeof obj["1"]["0"] === 'string';
     };
 
+    api.check.data.is_second_type_action = function(obj) {
+        return obj
+            && obj["2"]
+            && Array.isArray(obj["2"])
+            && obj["2"].length
+            && typeof obj["2"]["0"] === 'string';
+    };
+
     api.check.data.is_smartlabels_array = function(obj) {
         const isNotArray = !obj || !Array.isArray(obj) ||obj.length === 0;
         if (isNotArray) {
@@ -1046,8 +1059,21 @@ var Gmail = function(localJQuery) {
             && obj["2"]["7"];
     };
 
-    api.tools.get_action_type = function(obj) {
-        return obj[1][0];
+    api.tools.get_action = function(obj) {
+        return api.tools.get_first_type_action(obj)
+            || api.tools.get_second_type_action(obj);
+    };
+
+    api.tools.get_first_type_action = function(obj) {
+        return obj
+            && obj[1]
+            && obj[1].join('');
+    };
+
+    api.tools.get_second_type_action = function(obj) {
+        return obj
+            && obj[2]
+            && obj[2].join('');
     };
 
     api.tools.get_message_ids = function(obj) {
@@ -1103,42 +1129,42 @@ var Gmail = function(localJQuery) {
     api.tools.check_event_type = function(threadObj) {
         const action_map = {
             // ""            : "add_to_tasks",
-            "^a"          : "archive",
-            "^k"          : "delete",
+            "^a": "archive",
+            "^k": "delete",
             // ""            : "delete_message_in_thread",
             // ""            : "delete_forever",
             // ""            : "delete_label",
             // ""            : "discard_draft",
             // ""            : "expand_categories",
             // ""            : "filter_messages_like_these",
             // ""            : "label",
-            // ""            : "mark_as_important",
-            // ""            : "mark_as_not_important",
+            // "^io_im^imi": "mark_as_important",
+            // "^imn": "mark_as_not_important",
             // ""            : "mark_as_not_spam",
             // ""            : "mark_as_spam",
             // ""            : "move_label",
             // ""            : "move_to_inbox",
             // ""            : "mute",
-            // ""            : "read",
+            "^u^us": "read",
             // ""            : "save_draft",
             // ""            : "send_message",
             // ""            : "show_newly_arrived_message",
-            // ""            : "star",
+            // "^t^ss_sy": "star",
             // ""            : "undo_send",
             // ""            : "unmute",
             "^u"            : "unread",
-            // ""            : "unstar",
+            // "^t^ss_sy^ss_so^ss_sr^ss_sp^ss_sb^ss_sg^ss_cr^ss_co^ss_cy^ss_cg^ss_cb^ss_cp": "unstar",
             // ""            : "new_email",
             // ""            : "poll",
             // ""            : "refresh",
             // ""            : "restore_message_in_thread",
-            "^o"            : "open_email",
+            "^o": "open_email",
             // ""            : "toggle_threads"
         };
         const threadData = api.tools.get_thread_data(threadObj);
 
         if (threadData && api.check.data.is_action(threadData)) {
-            const action = api.tools.get_action_type(threadData);
+            const action = api.tools.get_action(threadData);
 
             return action_map[action];
         } else {

test/test.tools.js

@@ -5,6 +5,16 @@ let gmail = new Gmail();
 
 const testData = require("./testdata-parser.js");
 
+function testXhrEventParsing(jsonXhrData, eventName) {
+    const api = new Gmail();
+    const xhrData = JSON.parse(jsonXhrData);
+
+    const threads = api.tools.extract_from_graph(xhrData, api.check.data.is_thread);
+    const actionType = api.tools.check_event_type(threads[0]);
+
+    assert.equal(eventName, actionType);
+};
+
 describe("Monkeypatching", () => {
     it("patching functions works", () => {
         var ns = {};
@@ -51,36 +61,53 @@ describe("Monkeypatching", () => {
 describe("Test tools for parsing new gmail body_params", () => {
     const gmail = new Gmail();
     const data =  JSON.parse(testData.new_gmail_archive_action_body_params);
+    const threads = gmail.tools.extract_from_graph(data, gmail.check.data.is_thread);
+    const threadData = threads.map(thread => gmail.tools.get_thread_data(thread))[0];
 
     it("get thread id", () => {
-        const thread = gmail.tools.get_thread_id(data);
+        const thread = gmail.tools.get_thread_id(threads[0]);
 
-        assert.equal(thread, 'thread-f:1600724307680265309');
+        assert.equal(thread, 'thread-f:1603171109786600032');
     });
+
     it("get thread data", () => {
-        const mockThreadData = data[2][7];
-        const threadData = gmail.tools.get_thread_data(data);
+        const mockThreadData = threads[0][2][7];
+        const threadData = gmail.tools.get_thread_data(threads[0]);
+        console.log(threadData);
 
         assert.deepEqual(threadData, mockThreadData);
     });
+
     it("get messages ids", () => {
-        const mockMessageIds = ['msg-f:1600724307680265309', 'msg-f:1600724938213937205', 'msg-f:1600725174437456906', 'msg-f:1600725319255992336', 'msg-f:1600725448529658711'];
-        const threadData = gmail.tools.get_thread_data(data);
+        const mockMessageIds = ['msg-f:1603171109786600032', 'msg-f:1603245801543734539', 'msg-f:1603245862071354412', 'msg-f:1603246018478443087', 'msg-f:1603256094012730022', 'msg-f:1603256564311088576', 'msg-f:1603256665279246114', 'msg-f:1603256682384715664', 'msg-f:1603376719891477511', 'msg-f:1603376909485932601', 'msg-f:1603376994923202634', 'msg-f:1603380395240179639'];
         const messagesIds = gmail.tools.get_message_ids(threadData);
 
-        assert.equal(messagesIds.length, 5);
+        assert.equal(messagesIds.length, 12);
         assert.deepEqual(messagesIds, mockMessageIds);
     });
-    it("get action type", () => {
-        const threadData = gmail.tools.get_thread_data(data);
-        const action = gmail.tools.get_action_type(threadData);
 
-        assert.equal(action, "^a");
+    it("parses archived messages", () => {
+        const xhrData = testData.new_gmail_archive_action_body_params;
+        testXhrEventParsing(xhrData, "archive");
+    });
+
+    it("parses deleted messages", () => {
+        const xhrData = testData.new_gmail_delete_action_body_params;
+        testXhrEventParsing(xhrData, "delete");
+    });
+
+    it("parses read messages", () => {
+        const xhrData = testData.new_gmail_read_action_body_params;
+        testXhrEventParsing(xhrData, "read");
+    });
+
+    it("parses unread messages", () => {
+        const xhrData = testData.new_gmail_unread_action_body_params;
+        testXhrEventParsing(xhrData, "unread");
     });
-    it("is action type isset in thread object", () => {
-        const threadData = gmail.tools.get_thread_data(data);
-        const issetAction = gmail.check.data.is_action(threadData);
 
-        assert.equal(issetAction, true);
+    it("parses open_email messages", () => {
+        const xhrData = testData.new_gmail_open_email_action_body_params;
+        testXhrEventParsing(xhrData, "open_email");
     });
 });