Fix flag handling

Author: ArtOfCode-

app/assets/javascripts/application.js

@@ -37,36 +37,6 @@ document.addEventListener('DOMContentLoaded', async () => {
     dialog.classList.toggle('is-active');
   });
 
-  QPixel.DOM.addSelectorListener('click', '.flag-resolve', async (ev) => {
-    ev.preventDefault();
-    const tgt = /** @type {HTMLElement} */(ev.target);
-    const id = tgt.dataset.flagId;
-    const data = {
-      result: tgt.dataset.result,
-      message: tgt.parentNode.parentNode.querySelector('.flag-resolve-comment').value
-    };
-
-    const req = await fetch(`/mod/flags/${id}/resolve`, {
-      method: 'POST',
-      body: JSON.stringify(data),
-      credentials: 'include',
-      headers: { 'X-CSRF-Token': QPixel.csrfToken() }
-    });
-    if (req.status === 200) {
-      const res = await req.json();
-      if (res.status === 'success') {
-        const flagContainer = /** @type {HTMLElement} */(tgt.parentNode.parentNode.parentNode);
-        QPixel.DOM.fadeOut(flagContainer, 200);
-      }
-      else {
-        QPixel.createNotification('danger', `<strong>Failed:</strong> ${res.message}`);
-      }
-    }
-    else {
-      QPixel.createNotification('danger', `<strong>Failed:</strong> Unexpected status (${req.status})`);
-    }
-  });
-
   if (document.cookie.indexOf('dismiss_fvn') === -1) {
     QPixel.DOM.addSelectorListener('click', '#fvn-dismiss', (_ev) => {
       document.cookie = 'dismiss_fvn=true; path=/; expires=Fri, 31 Dec 9999 23:59:59 GMT';

app/assets/javascripts/moderator.js

@@ -9,4 +9,29 @@ $(() => {
       $(this).remove();
     });
   });
+
+  QPixel.DOM.addSelectorListener('click', '.flag-resolve', async (ev) => {
+    ev.preventDefault();
+    const tgt = /** @type {HTMLElement} */(ev.target);
+    const id = tgt.dataset.flagId;
+    const data = {
+      result: tgt.dataset.result,
+      message: tgt.parentNode.parentNode.querySelector('.flag-resolve-comment').value
+    };
+
+    const req = await QPixel.jsonPost(`/mod/flags/${id}/resolve`, data);
+    if (req.status === 200) {
+      const res = await req.json();
+      if (res.status === 'success') {
+        const flagContainer = /** @type {HTMLElement} */(tgt.parentNode.parentNode.parentNode);
+        QPixel.DOM.fadeOut(flagContainer, 200);
+      }
+      else {
+        QPixel.createNotification('danger', `<strong>Failed:</strong> ${res.message}`);
+      }
+    }
+    else {
+      QPixel.createNotification('danger', `<strong>Failed:</strong> Unexpected status (${req.status})`);
+    }
+  });
 });

app/assets/javascripts/qpixel_api.js

@@ -493,5 +493,26 @@ window.QPixel = {
       splatIdx += 1;
     } while (searchIdx < posIdx);
     return [currentSequence, posInSeq];
+  },
+
+  /**
+   * Send a POST request with JSON data, pre-authorized with QPixel credentials for the signed in user.
+   * @param {string} uri The URI to which to send the request. 
+   * @param {any} data An object containing data to send as the request body. Must be acceptable by JSON.stringify.
+   * @param {RequestInit?} options An optional RequestInit object. Options specified here will override the defaults
+   *  provided by this method. 
+   * @returns {Promise<Response>} The Response promise returned from fetch().
+   */
+  jsonPost: async (uri, data, options) => {
+    const defaultOptions = {
+      method: 'POST',
+      headers: {
+        'X-CSRF-Token': QPixel.csrfToken(),
+        'Content-Type': 'application/json'
+      },
+      credentials: 'include',
+      body: JSON.stringify(data)
+    };
+    return fetch(uri, Object.assign(defaultOptions, options));
   }
 };

global.d.ts

@@ -121,6 +121,7 @@ interface QPixel {
   setPreference?: (name: string, value: unknown, community?: boolean) => Promise<void>;
   user?: () => Promise<User>;
   validatePost?: (postText: string) => [boolean, PostValidatorMessage[]];
+  jsonPost?: (uri: string, data: any, options?: RequestInit) => Promise<Response>;
 
   // qpixel_dom
   DOM?: QPixelDOM;