Remove unused imports

client/src/builtin/EmoteModule.js

@@ -8,8 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, Settings, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
-import { DOM, VueInjector, Reflection } from 'ui';
+import { Settings, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
+import { VueInjector, Reflection } from 'ui';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
 import path from 'path';
 import EmoteComponent from './EmoteComponent.vue';

client/src/modules/content.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, FileUtils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
+import { Utils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { Modals } from 'ui';
 import Database from './database';
 

client/src/modules/contentmanager.js

@@ -12,7 +12,6 @@ import Content from './content';
 import Globals from './globals';
 import Database from './database';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
-import { Events } from 'modules';
 import { SettingsSet, ErrorEvent } from 'structs';
 import { Modals } from 'ui';
 import path from 'path';

client/src/modules/discordapi.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { List, InsufficientPermissions } from 'structs';
+import { List } from 'structs';
 import { User, Channel, Guild, Message } from 'discordstructs';
 import { WebpackModules } from './webpackmodules';
 

client/src/modules/eventhook.js

@@ -8,7 +8,6 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, ClientLogger as Logger } from 'common';
 import { WebpackModules } from './webpackmodules';
 import Events from './events';
 import EventListener from './eventlistener';

client/src/modules/extmodulemanager.js

@@ -10,8 +10,6 @@
 
 import ContentManager from './contentmanager';
 import ExtModule from './extmodule';
-import { ClientLogger as Logger } from 'common';
-import { Events } from 'modules';
 
 export default class extends ContentManager {
 

client/src/modules/modulemanager.js

@@ -9,7 +9,7 @@
 */
 
 import { ClientLogger as Logger } from 'common';
-import { Events, SocketProxy, EventHook, CssEditor } from 'modules';
+import { SocketProxy, EventHook, CssEditor } from 'modules';
 import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
 

client/src/modules/patcher.js

@@ -9,7 +9,7 @@
 */
 
 import { WebpackModules } from './webpackmodules';
-import { ClientLogger as Logger, Utils } from 'common';
+import { ClientLogger as Logger } from 'common';
 
 export class Patcher {
 

client/src/modules/pluginapi.js

@@ -231,7 +231,7 @@ export default class PluginApi {
         this.injectedStyles.splice(this.injectedStyles.indexOf(styleid), 1);
         DOM.deleteStyle(styleid);
     }
-    deleteAllStyles(id, css) {
+    deleteAllStyles(id) {
         for (let id of this.injectedStyles) {
             this.deleteStyle(id);
         }

client/src/modules/pluginmanager.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, Permissions } from 'modules';
+import { Permissions } from 'modules';
 import { Modals } from 'ui';
 import { ErrorEvent } from 'structs';
 import { ClientLogger as Logger } from 'common';

client/src/modules/reactcomponents.js

@@ -12,7 +12,7 @@
 
 import { Reflection } from 'ui';
 import { Filters, ClientLogger as Logger } from 'common';
-import { MonkeyPatch, Patcher } from './patcher';
+import { MonkeyPatch } from './patcher';
 import { WebpackModules } from './webpackmodules';
 import DiscordApi from './discordapi';
 
@@ -242,7 +242,7 @@ export class ReactComponents {
         });
     }
 
-    static setName(name, filter, callback) {
+    static setName(name, filter) {
         const have = this.components.find(c => c.id === name);
         if (have) return have;
 
@@ -260,7 +260,7 @@ export class ReactComponents {
         const have = this.unknownComponents.find(c => c.component === component);
         for (const [fi, filter] of this.nameSetters.entries()) {
             if (filter.filter.filter(component)) {
-                console.log('filter match!');
+                Logger.log('ReactComponents', 'Filter match!');
                 component.displayName = filter.name;
                 this.nameSetters.splice(fi, 1);
                 return this.push(component, retVal);

client/src/modules/settings.js

@@ -9,8 +9,8 @@
 */
 
 import { EmoteModule } from 'builtin';
-import { SettingsSet, SettingUpdatedEvent } from 'structs';
-import { Utils, FileUtils, ClientLogger as Logger } from 'common';
+import { SettingsSet } from 'structs';
+import { FileUtils, ClientLogger as Logger } from 'common';
 import path from 'path';
 import Globals from './globals';
 import CssEditor from './csseditor';

client/src/modules/thememanager.js

@@ -10,8 +10,6 @@
 
 import ContentManager from './contentmanager';
 import Theme from './theme';
-import { FileUtils } from 'common';
-import path from 'path';
 
 export default class ThemeManager extends ContentManager {
 
@@ -116,8 +114,7 @@ export default class ThemeManager extends ContentManager {
      * @return {Promise}
      */
     static async parseSetting(setting) {
-        const { type, id, value } = setting;
-        const name = id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
+        const name = setting.id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
         const scss = await setting.toSCSS();
 
         if (scss) return [name, scss];

client/src/structs/settings/multiplechoiceoption.js

@@ -8,8 +8,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Utils } from 'common';
-
 export default class MultipleChoiceOption {
 
     constructor(args) {

client/src/structs/settings/setting.js

@@ -8,8 +8,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Utils } from 'common';
-
 import BoolSetting from './types/bool';
 import StringSetting from './types/text';
 import NumberSetting from './types/number';

client/src/structs/settings/settingsproxy.js

@@ -10,7 +10,6 @@
 
 import SettingsSet from './settingsset';
 import SettingsCategory from './settingscategory';
-import Setting from './types/basesetting';
 
 const setHandler = {
     get({ set }, category_id) {

client/src/structs/settings/settingsset.js

@@ -365,7 +365,7 @@ export default class SettingsSet extends AsyncEventEmitter {
      * Merges a set into this set without emitting events (and therefore synchronously).
      * This only exists for use by the constructor.
      */
-    _merge(newSet, emit_multi = true) {
+    _merge(newSet) {
         let updatedSettings = [];
         // const categories = newSet instanceof Array ? newSet : newSet.settings;
         const categories = newSet && newSet.args ? newSet.args.settings : newSet ? newSet.settings : newSet;

client/src/structs/settings/types/custom.js

@@ -11,8 +11,6 @@
 import { Globals } from 'modules';
 import path from 'path';
 import Setting from './basesetting';
-import SettingsCategory from '../settingscategory';
-import SettingsScheme from '../settingsscheme';
 
 export default class CustomSetting extends Setting {
 

client/src/ui/bdui.js

@@ -8,8 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, WebpackModules, DiscordApi, MonkeyPatch } from 'modules';
-import { Utils } from 'common';
+import { Events, DiscordApi } from 'modules';
 import { remote } from 'electron';
 import DOM from './dom';
 import Vue from './vue';

client/src/ui/modals.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, FileUtils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
+import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { Settings, Events, PluginManager, ThemeManager } from 'modules';
 import BaseModal from './components/common/Modal.vue';
 import BasicModal from './components/bd/modals/BasicModal.vue';

client/src/ui/profilebadges.js

@@ -10,8 +10,7 @@
 
 import { Module, ReactComponents, ReactHelpers, MonkeyPatch, WebpackModules } from 'modules';
 import { Reflection } from 'ui';
-import { Utils, ClientLogger as Logger } from 'common';
-import DOM from './dom';
+import { ClientLogger as Logger } from 'common';
 import { BdBadge } from './components/bd';
 import VueInjector from './vueinjector';
 import contributors from '../data/contributors';
@@ -95,7 +94,6 @@ export default class extends Module {
     async patchNameTag() {
         if (this.PatchedNameTag) return this.PatchedNameTag;
 
-        const ProfileBadges = this;
         const selector = '.' + WebpackModules.getClassName('nameTag', 'username', 'discriminator', 'ownerIcon');
         const NameTag = await ReactComponents.getComponent('NameTag', { selector });
 

common/modules/async-eventemitter.js

@@ -11,7 +11,7 @@
 import EventEmitter from 'events';
 
 /**
- * Extends Node.js' EventEmitter to trigger event listeners asyncronously.
+ * Extends Node.js' EventEmitter to call event listeners asyncronously.
  */
 export default class AsyncEventEmitter extends EventEmitter {
 
@@ -42,7 +42,7 @@ export default class AsyncEventEmitter extends EventEmitter {
 
     /**
      * Adds an event listener that will be removed when it is called and therefore only be called once.
-     * If a callback is not specified a promise that is resolved once the event is triggered is returned.
+     * If a callback is not specified a promise that is resolved once the event is emitted is returned.
      */
     once(event, callback) {
         if (callback) {
@@ -50,7 +50,7 @@ export default class AsyncEventEmitter extends EventEmitter {
             return EventEmitter.prototype.once.apply(this, arguments);
         }
 
-        // Otherwise return a promise that is resolved once this event is triggered
+        // Otherwise return a promise that is resolved once this event is emitted
         return new Promise((resolve, reject) => {
             EventEmitter.prototype.once.call(this, event, data => {
                 return resolve(data);

common/modules/utils.js

@@ -8,7 +8,6 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import path from 'path';
 import fs from 'fs';
 import _ from 'lodash';
 import filetype from 'file-type';
@@ -91,11 +90,7 @@ export class Utils {
      * @return {Any} The cloned value
      */
     static deepclone(value, exclude) {
-        try {
-            if (exclude && exclude(value)) return value;
-        } catch (err) {
-            console.error(arguments, err);
-        }
+        if (exclude && exclude(value)) return value;
 
         if (typeof value === 'object') {
             if (value instanceof Array) return value.map(i => this.deepclone(i, exclude));

core/src/main.js

@@ -183,7 +183,6 @@ export class BetterDiscord {
     }
 
     async waitForWindow() {
-        const self = this;
         return new Promise(resolve => {
             const defer = setInterval(() => {
                 const windows = BrowserWindow.getAllWindows();

core/src/modules/utils.js

@@ -10,7 +10,6 @@
 
 // TODO Use common
 
-import path from 'path';
 import fs from 'fs';
 
 import Module from './modulebase';