Add setup for error handling and work on switching over to @utilities

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
+about: Create a bug report to help us improve
 title: 'Short description of the bug'
 labels: 'bug', 'pending review'
 assignees: ''

addons/plugins/vz-badges/Badge.jsx

@@ -1,6 +1,6 @@
 const { React, getModule, i18n: { Messages } } = require('webpack');
 const { Clickable, Tooltip, Badge } = require('@components');
-const { joinClassNames } = require('@util');
+const { joinClassNames } = require('@utilities');
 
 module.exports = ({ badge, onClick, location }) => {
   this.badgeWrapperClass = {};

addons/plugins/vz-badges/Badges.jsx

@@ -49,8 +49,8 @@ class Badges extends React.PureComponent {
       const { badges } = await get(`${WEBSITE}/api/badges/users/${this.props.id}.json`).then(res => res.body);
       this.setState(badges);
       badgesStore[this.props.id] = badges;
-    } catch (e) {
-      // Let it fail silently, probably just 404
+    } catch (err) {
+      // Let it fail silently.
     }
   }
 

addons/plugins/vz-core-discord-enhancements/modules/serverInviteIcons.js

@@ -1,6 +1,6 @@
 const { React, getModule } = require('@webpack');
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 
 /*
  * Adds server icons to the 'Invite to Server' context submenu.

addons/plugins/vz-custom-css/components/SnippetButton.jsx

@@ -1,6 +1,6 @@
 const { React, getModule, i18n: { Messages } } = require('@webpack');
 const { Icon, Tooltip } = require('@components');
-const { joinClassNames} = require('@util');
+const { joinClassNames } = require('@utilities');
 
 // @todo: Figure out a way to re-enable the button if the snippet gets removed. Requires reload for now.
 class SnippetButton extends React.Component {

addons/plugins/vz-demo-settings/components/Settings.jsx

@@ -1,6 +1,6 @@
 const { settings: { TextInput, SwitchItem, Category, RadioGroup, SelectInput, ColorPickerInput, CopyInput, TextArea, RegionSelector, SliderInput, PermissionOverrideItem } } = require('@components');
 const { React, getModule, getModuleByDisplayName } = require('@webpack');
-const { sleep } = require('@util');
+const { sleep } = require('@utilities');
 
 const { clipboard } = require('electron');
 

addons/plugins/vz-docs/components/DocsLayer.jsx

@@ -1,4 +1,4 @@
-const { sleep, string: { toPascalCase, toCamelCase } } = require('@util');
+const { sleep, string: { toPascalCase, toCamelCase } } = require('@utilities');
 const { PopoutWindow, Spinner } = require('@components');
 const { React, Flux, getModule } = require('@webpack');
 const { WEBSITE } = require('@constants');

addons/plugins/vz-docs/components/SettingsView.jsx

@@ -1,6 +1,6 @@
 const { AsyncComponent, Clickable, Tooltip, Icons: { ExternalLink, Pin, Unpin, Close } } = require('@components');
 const { React, getModule, getModuleByDisplayName, i18n: { Messages } } = require('@webpack');
-const { joinClassNames } = require('@util');
+const { joinClassNames } = require('@utilities');
 
 module.exports = AsyncComponent.from((async () => {
   const StandardSidebarView = getModuleByDisplayName('StandardSidebarView');

addons/plugins/vz-notices/components/Toast.jsx

@@ -1,6 +1,6 @@
 const { AsyncComponent, Button, Tooltip, Icon } = require('@components');
 const { React, getModuleByDisplayName } = require('@webpack');
-const { joinClassNames } = require('@util');
+const { joinClassNames } = require('@utilities');
 
 const Progress = AsyncComponent.from(getModuleByDisplayName('Progress'));
 

addons/plugins/vz-sdk/components/SdkWindow.jsx

@@ -1,6 +1,6 @@
 const { Flux, React, getModule, getModuleByDisplayName, i18n: { Messages } } = require('@webpack');
 const { AsyncComponent, Tooltip, HeaderBar, Clickable, Icons } = require('@components');
-const { joinClassNames } = require('@util');
+const { joinClassNames } = require('@utilities');
 
 const SplashScreen = require('./SplashScreen');
 const Settings = require('./Settings');

addons/plugins/vz-settings/components/ErrorBoundary.jsx

@@ -1,8 +1,8 @@
 const { React, getModule } = require('@webpack');
 const { get } = require('@http');
 
-const { format } = require('util');
 const { resolve } = require('path');
+const { format } = require('util');
 const { parse } = require('url');
 
 const RE_INVARIANT_URL = /https?:\/\/reactjs\.org\/docs\/error-decoder\.html\?invariant=([0-9]+)(?:[^ ])+/;

addons/plugins/vz-settings/components/GeneralSettings/index.jsx

@@ -3,7 +3,7 @@ const { React, getModule, i18n: { Messages } } = require('@webpack');
 const { open: openModal, close: closeModal } = require('vizality/modal');
 const { WEBSITE, CACHE_FOLDER } = require('@constants');
 const { Confirm } = require('@components/modal');
-const { file: { rmdirRf } } = require('@util');
+const { file: { rmdirRf } } = require('@utilities');
 
 class GeneralSettings extends React.Component {
   constructor (props) {

addons/plugins/vz-utility-classes/modules/avatars.js

@@ -1,4 +1,4 @@
-const { react: { forceUpdateElement } } = require('@util');
+const { react: { forceUpdateElement } } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 const { React, getModule } = require('@webpack');
 

addons/plugins/vz-utility-classes/modules/channelHeaderButtons.js

@@ -1,4 +1,4 @@
-const { joinClassNames, dom: { waitForElement }, react: { forceUpdateElement, getOwnerInstance }, string: { toCamelCase } } = require('@util');
+const { joinClassNames, dom: { waitForElement }, react: { forceUpdateElement, getOwnerInstance }, string: { toCamelCase } } = require('@utilities');
 const { getModule, i18n: { Messages } } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

addons/plugins/vz-utility-classes/modules/channelMembers.js

@@ -1,4 +1,4 @@
-const { react: { forceUpdateElement }, joinClassNames } = require('@util');
+const { react: { forceUpdateElement }, joinClassNames } = require('@utilities');
 const { getModuleByDisplayName, getModule } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

addons/plugins/vz-utility-classes/modules/chat.js

@@ -1,4 +1,4 @@
-const { joinClassNames, dom: { waitForElement }, react: { getOwnerInstance } } = require('@util');
+const { joinClassNames, dom: { waitForElement }, react: { getOwnerInstance } } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 const { getModule } = require('@webpack');
 

addons/plugins/vz-utility-classes/modules/contextMenuItems.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 const { React, getModule } = require('@webpack');
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 
 /*
  * This module does nothing currently. It is just here for future reference in the event context

addons/plugins/vz-utility-classes/modules/dmChannels.js

@@ -1,6 +1,6 @@
 const { getModuleByDisplayName } = require('@webpack');
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 
 module.exports = async () => {
   const PrivateChannel = await getModuleByDisplayName('PrivateChannel', true);

addons/plugins/vz-utility-classes/modules/folders.js

@@ -1,5 +1,5 @@
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 const { getModule } = require('@webpack');
 
 module.exports = () => {

addons/plugins/vz-utility-classes/modules/gameIcon.js

@@ -1,5 +1,5 @@
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 const { getModule } = require('@webpack');
 
 module.exports = () => {

addons/plugins/vz-utility-classes/modules/guildHeader.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-unreachable */
-
 const { getModule, getModuleByDisplayName } = require('@webpack');
-const { react: { forceUpdateElement } } = require('@util');
+const { react: { forceUpdateElement } } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 
 /*

addons/plugins/vz-utility-classes/modules/guilds.js

@@ -1,4 +1,4 @@
-const { joinClassNames, dom: { waitForElement }, react: { forceUpdateElement, getOwnerInstance } } = require('@util');
+const { joinClassNames, dom: { waitForElement }, react: { forceUpdateElement, getOwnerInstance } } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 const { getModule } = require('@webpack');
 

addons/plugins/vz-utility-classes/modules/list.js

@@ -1,4 +1,5 @@
-const { joinClassNames, react : { findInReactTree, forceUpdateElement } } = require('@util');
+/* eslint-disable no-unreachable */
+const { joinClassNames, react : { findInReactTree, forceUpdateElement } } = require('@utilities');
 const { getModule, getModuleByDisplayName } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

addons/plugins/vz-utility-classes/modules/messages.js

@@ -1,4 +1,4 @@
-const { react : { findInReactTree }, joinClassNames } = require('@util');
+const { react : { findInReactTree }, joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 const { getModule } = require('@webpack');
 

addons/plugins/vz-utility-classes/modules/popout.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unreachable */
 const { getModuleByDisplayName } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

addons/plugins/vz-utility-classes/modules/privateCall.js

@@ -1,5 +1,5 @@
+const { joinClassNames } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
-const { joinClassNames } = require('@util');
 const { getModule } = require('@webpack');
 
 module.exports = () => {

addons/plugins/vz-utility-classes/modules/role.js

@@ -1,4 +1,4 @@
-const { joinClassNames, dom: { waitForElement }, react: { getOwnerInstance } } = require('@util');
+const { joinClassNames, dom: { waitForElement }, react: { getOwnerInstance } } = require('@utilities');
 const { patch, unpatch } = require('@patcher');
 const { getModule } = require('@webpack');
 

addons/plugins/vz-utility-classes/modules/tabBar.js

@@ -1,4 +1,4 @@
-const { joinClassNames, string: { toCamelCase } } = require('@util');
+const { joinClassNames, string: { toCamelCase } } = require('@utilities');
 const { getModuleByDisplayName } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

addons/plugins/vz-utility-classes/modules/transitionGroup.js

@@ -1,4 +1,4 @@
-const { joinClassNames, react: { findInReactTree }, string: { toCamelCase } } = require('@util');
+const { joinClassNames, react: { findInReactTree }, string: { toCamelCase } } = require('@utilities');
 const { getModuleByDisplayName, getModule } = require('@webpack');
 const { patch, unpatch } = require('@patcher');
 

src/.vizality/api/keybinds.js

@@ -74,8 +74,8 @@ class KeybindsAPI extends API {
       } else {
         localShortcut.register(keybind.keybind, keybind.executor);
       }
-    } catch (e) {
-      this.error('Failed to register keybind!', e);
+    } catch (err) {
+      this.error('Failed to register keybind!', err);
     }
   }
 
@@ -87,8 +87,8 @@ class KeybindsAPI extends API {
       } else {
         localShortcut.unregister(keybind.keybind);
       }
-    } catch (e) {
-      // let it fail silently, probably just invalid/unset keybind
+    } catch (err) {
+      // Let it fail silently; probably just an invalid/unset keybind.
     }
   }
 }

src/.vizality/api/settingsStore/store.js

@@ -19,8 +19,8 @@ function loadSettings (file) {
         readFileSync(join(SETTINGS_FOLDER, file), 'utf8')
       )
     ];
-  } catch (e) {
-    // Maybe corrupted settings; Let's consider them empty
+  } catch (err) {
+    // Possibly corrupted settings; let's consider them empty
     return [ categoryId, {} ];
   }
 }

src/.vizality/modules/classes/_checkForUndefined.js

@@ -1,4 +1,4 @@
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 
 const classes = require('../classes');
 

src/.vizality/modules/classes/_generateSassClasses.js

@@ -1,4 +1,4 @@
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 const { LIBRARIES_FOLDER } = require('@constants');
 
 const { join } = require('path');

src/.vizality/modules/classes/findClass.js

@@ -1,4 +1,4 @@
-const { object: { findEntriesByValue } } = require('@util');
+const { object: { findEntriesByValue } } = require('@utilities');
 
 const classes = require('../classes');
 

src/.vizality/modules/classes/index.js

@@ -6,8 +6,8 @@ require('fs')
     exports[moduleName] = require(`${__dirname}/${filename}`);
   });
 
-const { logger: { log } } = require('@util');
 const { LIBRARIES_FOLDER } = require('@constants');
+const { logger: { log } } = require('@utilities');
 
 const { join } = require('path');
 const { existsSync } = require('fs');
@@ -40,5 +40,5 @@ const SassClassFolder = join(LIBRARIES_FOLDER, 'sass', 'classes');
 if (!existsSync(SassClassFolder)) {
   _generateSassClasses();
 } else {
-  log(_module, _submodule, null, `Directory 'src\\.vizality\\libraries\\sass\\classes' already exists. Skipping Sass class file generation...`);
+  log(_module, _submodule, null, `Directory 'src\\.vizality\\libraries\\sass\\classes' already exists. Skipping file generation...`);
 }

src/.vizality/modules/classes/layout/chat/index.js

@@ -1,5 +1,5 @@
+const { object: { removeProperties } } = require('@utilities');
 const { getModule } = require('@webpack');
-const { object: { removeProperties } } = require('@util');
 
 const attachments = require('./attachments');
 

src/.vizality/modules/components/Badge.jsx

@@ -1,5 +1,5 @@
+const { joinClassNames } = require('@utilities');
 const { React } = require('@webpack');
-const { joinClassNames } = require('@util');
 
 const Badge = React.memo(({ type, className, ...props }) =>
   <div className={joinClassNames('vizality-badge', type, className)} {...props}></div>

src/.vizality/modules/components/ContextMenu.jsx

@@ -1,5 +1,5 @@
+const { dom: { waitForElement }, react: { getOwnerInstance } } = require('@utilities');
 const { React, getModule, contextMenu: { closeContextMenu } } = require('@webpack');
-const { dom: { waitForElement }, react: { getOwnerInstance } } = require('@util');
 
 class ContextMenu extends React.PureComponent {
   constructor (props) {

src/.vizality/modules/components/Icon.jsx

@@ -1,5 +1,5 @@
+const { joinClassNames } = require('@utilities');
 const { React } = require('@webpack');
-const { joinClassNames } = require('@util');
 
 const Icon = React.memo(({ type, wrapperClassName, className, ...props }) =>
   <div className={joinClassNames('vizality-icon-wrapper', wrapperClassName)}>

src/.vizality/modules/discord/routes/getCurrentRoute.js

@@ -1,4 +1,4 @@
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 /* const currentWebContents = require('electron').remote.getCurrentWebContents(); */
 
 const _getRoutes = require('./_getRoutes');
@@ -23,8 +23,6 @@ const getCurrentRoute = () => {
     }
   }
 
-  warn(module, submodule, null, `The current route is unknown.`);
-
   return 'unknown';
 };
 

src/.vizality/modules/discord/routes/getRoutes.js

@@ -1,4 +1,4 @@
-const { logger: { log } } = require('@util');
+const { logger: { log } } = require('@utilities');
 
 const _getRoutes = require('./_getRoutes');
 

src/.vizality/modules/discord/routes/goTo.js

@@ -1,5 +1,5 @@
 const { constants: { Routes }, getModule } = require('@webpack');
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 
 const _getRoutes = require('./_getRoutes');
 

src/.vizality/modules/discord/settings/getSetting.js

@@ -1,4 +1,4 @@
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 const { getModule } = require('@webpack');
 
 const getSettingInfo = require('./getSettingInfo');

src/.vizality/modules/discord/settings/getSettingInfo.js

@@ -1,4 +1,4 @@
-const { logger: { log, warn } } = require('@util');
+const { logger: { log, warn } } = require('@utilities');
 
 const getSettingInfo = (setting) => {
   const module = 'Module';

src/.vizality/modules/discord/settings/open.js

@@ -1,5 +1,5 @@
+const { logger: { warn } } = require('@utilities');
 const { getModule } = require('@webpack');
-const { logger: { warn } } = require('@util');
 
 const getSections = require('./getSections');
 

src/.vizality/modules/discord/settings/setSetting.js

@@ -1,5 +1,5 @@
+const { logger: { warn } } = require('@utilities');
 const { getModule } = require('@webpack');
-const { logger: { warn } } = require('@util');
 
 const setSetting = async (setting, value, sync = true) => {
   const module = 'Module';

src/.vizality/modules/entities/Updatable.js

@@ -1,8 +1,8 @@
-const Events = require('events');
-const { join } = require('path');
-const { existsSync } = require('fs');
 const { promisify } = require('util');
+const { existsSync } = require('fs');
 const cp = require('child_process');
+const Events = require('events');
+const { join } = require('path');
 const exec = promisify(cp.exec);
 
 /**

src/.vizality/modules/http/GenericRequest.js

@@ -2,7 +2,7 @@
  * Forked from DevYukine's http module and Snekfetch
  */
 
-const { logger : { log } } = require('@util');
+const { logger : { log } } = require('@utilities');
 const { REPO } = require('@constants');
 
 const querystring = require('querystring');

src/.vizality/modules/patcher/_runPatches.js

@@ -1,4 +1,4 @@
-const { logger : { error } } = require('@util');
+const { logger : { error } } = require('@utilities');
 
 const Patcher = require('../patcher');
 

src/.vizality/modules/patcher/_runPrePatchesRecursive.js

@@ -1,4 +1,4 @@
-const { logger : { error } } = require('@util');
+const { logger : { error } } = require('@utilities');
 
 const Patcher = require('../patcher');
 

src/.vizality/modules/patcher/patch.js

@@ -1,4 +1,4 @@
-const { logger : { error } } = require('@util');
+const { logger : { error } } = require('@utilities');
 
 const { randomBytes } = require('crypto');
 

src/.vizality/modules/webpack/_getMdl.js

@@ -1,4 +1,4 @@
-const { sleep, logger: { warn } } = require('@util');
+const { sleep, logger: { warn } } = require('@utilities');
 
 const _getModules = require('./_getModules');
 

src/.vizality/modules/webpack/_init.js

@@ -1,8 +1,8 @@
-const { sleep } = require('@util');
+const { sleep } = require('@utilities');
 
+const moduleFilters = require('./modules');
 const Webpack = require('../webpack');
 const _getMdl = require('./_getMdl');
-const moduleFilters = require('./modules');
 
 /**
  * Initializes the injection into Webpack

src/.vizality/modules/webpack/getAllModules.js

@@ -1,4 +1,4 @@
-const { logger: { warn } } = require('@util');
+const { logger: { warn } } = require('@utilities');
 
 const _getModules = require('./_getModules');
 

src/.vizality/modules/webpack/getModule.js

@@ -1,4 +1,4 @@
-const { array: { getLastElement } } = require('@util');
+const { array: { getLastElement } } = require('@utilities');
 
 const _getMdl = require('./_getMdl');