chore: cleanup

Author: feildmaster

src/base/plugin/enabled.local.js

@@ -2,37 +2,34 @@ import wrap from '../../utils/2.pokemon.js';
 import { registerModule } from '../../utils/plugin.js';
 import * as settings from '../../utils/settings/index.js';
 
-const enable = ['Enable with toast', 'Enable silently'];
+const enable = ['Enabled with toast', 'Enabled silently'];
 
 const setting = settings.register({
   name: 'New plugin behavior',
   key: 'enable.plugins',
   category: 'Plugins',
-  data: [...enable, 'Disable with toast', 'Disable silently'],
+  data: [...enable, 'Disabled with toast', 'Disabled silently'],
   type: 'select',
 });
 
 wrap(() => {
   const name = 'enabled';
 
   function mod(plugin) {
-    // if (!plugin.version) return;
+    // if (plugin.version === undefined) return;
     const enabled = plugin.settings().add({ key: 'Enabled', default: enable.includes(setting.value()) });
 
     Object.defineProperty(plugin, name, {
-      get: () => !!enabled.value(), // TODO: Why does it not default to false?
+      get: () => enabled.value(),
     });
 
     const registered = plugin.settings().add({ key: 'registered', hidden: true });
     if (!registered.value()) {
-      const val = enable.includes(setting.value());
       if (setting.value().includes('toast')) {
         // TODO: Show toast to toggle setting from default
       } else {
         registered.set(true);
       }
-      // Set initial value
-      enabled.set(val);
     }
   }
 

src/hooks/chat.js

@@ -53,7 +53,7 @@ function bind(socketChat) {
 }
 
 function reconnect() {
-  if (!isActive() || guestMode.isSet() || reconnectAttempts > 3 || global('socketChat').readyState !== WebSocket.CLOSED) return;
+  if (!isActive() || guestMode.isSet() || reconnectAttempts > 3 || global('socketChat', { throws: false })?.readyState !== WebSocket.CLOSED) return;
   reconnectAttempts += 1;
   const socket = new WebSocket(`wss://${location.hostname}/chat`);
   globalSet('socketChat', socket);
@@ -109,11 +109,6 @@ function sendMessageWrapper(...args) {
   }
 }
 
-document.addEventListener('visibilitychange', () => {
-  if (global('socketChat', { throws: false })?.readyState !== WebSocket.CLOSED) return;
-  reconnect();
-});
-
 eventManager.on(':loaded', () => {
   if (typeof socketChat !== 'undefined') {
     debug('Chat detected');
@@ -124,6 +119,8 @@ eventManager.on(':loaded', () => {
     // Attempt to reconnect when sending messages
     globalSet('sendMessage', sendMessageWrapper);
     globalSet('sendPrivateMessage', sendMessageWrapper);
+    // Attempt to reconnect when coming back to this window
+    document.addEventListener('visibilitychange', () => reconnect());
 
     // Simulate old getHistory
     globalSet('appendChat', function appendChat(idRoom = '', chatMessages = [], isPrivate = true) {
@@ -145,28 +142,29 @@ eventManager.on(':loaded', () => {
     }, {
       throws: false,
     });
-    eventManager.on('Chat:getHistory', ({ room, roomName: name }) => {
-      // Send text hook
-      const messages = $(`#${room} .chat-messages`);
-      $(`#${room} input[type="text"]`).keydown(function sending(e) {
-        if (e.which !== 13) return;
-
-        const data = {
-          room,
-          name,
-          messages,
-          input: this,
-        };
-        if (eventManager.cancelable.emit('Chat:send', data).canceled) {
-          debug('Canceled send');
-          $(this).val('');
-          e.preventDefault();
-          e.stopPropagation();
-        }
-      });
-    });
   }
 
+  eventManager.on('Chat:getHistory', ({ room, roomName: name }) => {
+    // Send text hook
+    const messages = $(`#${room} .chat-messages`);
+    $(`#${room} input[type="text"]`).keydown(function sending(e) {
+      if (e.which !== 13) return;
+
+      const data = {
+        room,
+        name,
+        messages,
+        input: this,
+      };
+      if (eventManager.cancelable.emit('Chat:send', data).canceled) {
+        debug('Canceled send');
+        $(this).val('');
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    });
+  });
+
   eventManager.on('GuestMode', () => {
     console.debug('Guest Mode');
     guestMode.set(true);

src/structures/chat.local/index.js

@@ -10,9 +10,10 @@ export default class Chat {
   update(data) {
     switch (data.action) {
       case 'getMessage':
-      case 'getPrivateMessage':
+      case 'getPrivateMessage': {
         // TODO: Add new message
         break;
+      }
       default: break;
     }
   }

src/structures/chat.local/message.js

@@ -2,42 +2,52 @@ import Base from '../base.js';
 import User from './user.js';
 
 export default class Message extends Base {
-  constructor(data, channel) {
+  #user;
+  #room;
+  #message;
+  #deleted = false;
+  #action;
+  #rainbow;
+
+  constructor(data, channel = data.channel) {
     super(data);
-    this.user = new User(data.user);
-    this.room = channel;
-    this.deleted = false;
-    this.isAction = data.me === true;
-    this.isRainbow = data.rainbow === true;
-    this.message = data.message;
+    this.#user = new User(data.user || data.author);
+    this.#room = channel;
+    this.#message = data.chatMessage || data.message;
+    this.#action = (data.action || data.me) === true;
+    this.#rainbow = data.rainbow === true;
     this.update(data);
   }
 
   update(data) {
-    if (data.deleted !== undefined) this.deleted = data.deleted === true;
+    if (data.deleted !== undefined) this.#deleted = data.deleted === true;
   }
 
   get channel() {
-    return this.room;
+    return this.#room;
   }
 
-  get text() {
-    return this.message;
+  get message() {
+    return this.#message;
   }
 
   get action() {
-    return this.isAction;
+    return this.#action;
   }
 
-  get sender() {
-    return this.user;
+  get author() {
+    return this.#user;
   }
 
   get deleted() {
-    return this.isDeleted;
+    return this.#deleted;
   }
 
   get rainbow() {
-    return this.isRainbow;
+    return this.#rainbow;
+  }
+
+  get element() {
+    return document.querySelector(`#${this.channel} #message-${this.id}`);
   }
 }

src/structures/chat.local/user.js

@@ -1,4 +1,5 @@
 import Base from '../base.js';
+import { DESIGNER, SUPPORTER } from '../constants/user.js';
 
 export default class User extends Base {
   constructor(data) {
@@ -9,4 +10,14 @@ export default class User extends Base {
 
   update(data) {
   }
+
+  get isMod() {
+    const { priority } = this;
+    return priority && priority <= SUPPORTER;
+  }
+
+  get isStaff() {
+    const { priority } = this;
+    return priority && priority <= DESIGNER; // Why did I pick designer?
+  }
 }

src/utils/1.variables.js

@@ -4,4 +4,6 @@ export const footer2 = '<div style="width:100%;text-align:center;font-size:12px;
 export const hotkeys = [];
 export const scriptVersion = GM_info.script.version;
 
+export const SOCKET_SCRIPT_CLOSED = 3500;
+
 export function noop() {}

src/utils/plugin.js

@@ -7,11 +7,28 @@ const nameRegex = /^[a-z0-9 ]+$/i;
 const registry = new Map();
 const modules = [];
 
+function load({ name, mod, dependencies = [], runs = 0 }, methods, local) {
+  if (methods[name] !== undefined) {
+    console.error(`Skipping "${name}": Already exists`);
+    return;
+  }
+  const required = dependencies.filter((module) => methods[module] === undefined);
+  if (required.length) {
+    if (runs < 5) local.push({ name, mod, dependencies: required, runs: runs + 1 });
+    return;
+  }
+  try {
+    const val = mod(methods);
+    if (val !== undefined) {
+      methods[name] = val;
+    }
+  } catch (e) {
+    console.error(`Error loading "${name}":`, e);
+  }
+}
+
 // TODO: RegisteredPlugin
 export default function Plugin(name = '') {
-  // eslint-disable-next-line no-param-reassign
-  name = name.trim();
-  if (name === '') throw new Error('Plugin must have a name');
   if (name.length > 20) throw new Error(`Plugin name too long (${name.length}/20)`);
   if (!nameRegex.test(name)) throw new Error('Name contains illegal characters');
   if (registry.has(name)) throw new Error('Name already registered');
@@ -21,28 +38,8 @@ export default function Plugin(name = '') {
   };
 
   const local = [...modules];
-  function load({ name: prop, mod, dependencies = [], runs = 0 }) {
-    if (methods[prop] !== undefined) {
-      console.error(`Skipping "${prop}": Already exists`);
-      return;
-    }
-    const required = dependencies.filter((module) => methods[module] === undefined);
-    if (required.length) {
-      // eslint-disable-next-line no-param-reassign, no-plusplus
-      if (runs++ < 5) local.push({ name: prop, mod, dependencies: required, runs });
-      return;
-    }
-    try {
-      const val = mod(methods);
-      if (val !== undefined) {
-        methods[prop] = val;
-      }
-    } catch (e) {
-      console.error(`Error loading "${prop}":`, e);
-    }
-  }
   for (let i = 0; i < local.length; i++) {
-    load(local[i]);
+    load(local[i], methods, local);
   }
   local.filter(({ runs = 0, dependencies = [] }) => runs === 5 && dependencies.length)
     .forEach(({ name: prop, dependencies }) => console.log(`Failed to load module: ${prop} [${dependencies.join(', ')}]`));
@@ -52,7 +49,10 @@ export default function Plugin(name = '') {
   return plugin;
 }
 
-api.register('plugin', Plugin);
+api.register('plugin', (name) => {
+  if (typeof name !== 'string' || !name.trim()) throw new Error('Plugin must have a name');
+  return Plugin(name.trim());
+});
 
 export function registerModule(name, mod, dependencies) {
   if (!name) throw new Error('Module has no name');

src/utils/user.js

@@ -29,7 +29,7 @@ export function isStaff(user) {
 }
 
 function isPriority(user, priority) {
-  if (!user || !user.mainGroup || typeof user.mainGroup.priority !== 'number') throw new Error('Invalid user');
+  if (typeof user?.mainGroup?.priority !== 'number') throw new Error('Invalid user');
   return user.mainGroup.priority <= priority;
 }
 
@@ -50,7 +50,7 @@ export function getArtifacts() {
 }
 
 export function getAllArtifacts() { // TODO: This isn't really a "user" function
-  return getDeckConfig().then(({ allArtifacts: data }) => parse(data));
+  return getDeckConfig().then(({ allArtifacts: data = [] }) => parse(data));
 }
 
 function getDeckConfig() {