commit 462280fb9447e52a8019915f09ffed0fcceda7b1
author Adrià Vilanova Martínez <me@avm99963.com> Sat Aug 07 22:59:02 2021 +0200
committer Adrià Vilanova Martínez <me@avm99963.com> Sat Aug 07 23:16:57 2021 +0200
tree 2b35a241b4abc7e50a991242251512b5364ee3a1
parent b8e442b52f302be4633bd10d8b97a5d709b4f3c4

Refactor BatchLock code

This will hopefully make it a little bit clearer.

Change-Id: Ie6b7159c3821adc09cf8e07f1a70f6caf0ff9e27

src/injections/batchLock.js

diff --git a/src/injections/batchLock.js b/src/injections/batchLock.js
index 9a91203..6b45cdd 100644
--- a/src/injections/batchLock.js
+++ b/src/injections/batchLock.js
@@ -1,3 +1,4 @@
+import {CCApi} from '../common/api.js';
 import {parseUrl} from '../common/commonUtils.js';
 import {getAuthUser} from '../common/communityConsoleUtils.js';
 
@@ -106,9 +107,6 @@
   modal.querySelector('main').append(p, log);
 
   var authuser = getAuthUser();
-  var APIRequestUrl =
-      'https://support.google.com/s/community/api/SetThreadAttribute' +
-      (authuser == '0' ? '' : '?authuser=' + encodeURIComponent(authuser));
 
   checkboxes.forEach(checkbox => {
     var url = recursiveParentElement(checkbox, 'A').href;
@@ -117,37 +115,12 @@
       console.error('Fatal error: thread URL ' + url + ' could not be parsed.');
       return;
     }
-    fetch(APIRequestUrl, {
-      'headers': {
-        'content-type': 'text/plain; charset=utf-8',
-      },
-      'body': JSON.stringify({
-        1: thread.forum,
-        2: thread.thread,
-        3: (action == 'lock' ? 1 : 2),
-      }),
-      'method': 'POST',
-      'mode': 'cors',
-      'credentials': 'include',
-    })
-        .then(res => {
-          if (res.status == 200 || res.status == 400) {
-            return res.json().then(data => ({
-                                     status: res.status,
-                                     body: data,
-                                   }));
-          } else {
-            throw new Error('Status code ' + res.status + ' was not expected.');
-          }
-        })
-        .then(res => {
-          if (res.status == 400) {
-            throw new Error(
-                res.body[4] ||
-                ('Response status: 400. Error code: ' + res.body[2]));
-          }
-        })
-        .then(_ => {
+    CCApi('SetThreadAttribute', {
+      1: thread.forum,
+      2: thread.thread,
+      3: (action == 'lock' ? 1 : 2),
+    }, /* authenticated = */ true, authuser)
+        .then(() => {
           addLogEntry(true, action, url, thread.thread);
         })
         .catch(err => {
@@ -155,7 +128,7 @@
               'An error occurred while locking thread ' + url + ': ' + err);
           addLogEntry(false, action, url, thread.thread, err);
         })
-        .then(_ => {
+        .then(() => {
           progress.value = parseInt(progress.value) + 1;
           if (progress.value == progress.getAttribute('max'))
             enableEndButtons();
@@ -169,7 +142,7 @@
     switch (e.data.action) {
       case 'lock':
       case 'unlock':
-        console.info('Performing action ' + e.data.action);
+        console.debug('Performing action ' + e.data.action);
         lockThreads(e.data.action);
         break;