WebpackModules

client/src/index.js

@@ -14,6 +14,7 @@ import { Events, CssEditor, Globals, PluginManager } from 'modules';
 
 class BetterDiscord {
     constructor() {
+        window.pm = PluginManager;
         DOM.injectStyle(BdCss, 'bdmain');
         Events.on('global-ready', this.globalReady.bind(this));
     }

client/src/modules/modules.js

@@ -3,3 +3,4 @@ export { default as Settings } from './settings';
 export { default as CssEditor } from './csseditor';
 export { default as PluginManager } from './pluginmanager';
 export { default as Globals } from './globals';
+export { default as Vendor } from './vendor';

client/src/modules/pluginmanager.js

@@ -9,6 +9,7 @@
 */
 
 import Globals from './globals';
+import { FileUtils, ClientLogger as Logger } from 'common';
 
 const localPlugins = [];
 
@@ -19,11 +20,27 @@ export default class {
     }
 
     static get pluginsPath() {
+        Logger.log('PluginManager', 'hi!');
         return Globals.getObject('paths').find(path => path.id === 'plugins').path;
     }
 
     static async loadAllPlugins() {
+        try {
+            const directories = await FileUtils.readDir(this.pluginsPath);
 
+            for (let dir of directories) {
+                try {
+                    await this.loadPlugin(dir);
+                } catch (err) {
+                    //We don't want every plugin to fail loading when one does
+                    Logger.err('PluginManager', err);
+                }
+            }
+
+            return this.plugins;
+        } catch (err) {
+            throw err;
+        }
     }
 
 }

client/src/modules/vendor.js

@@ -0,0 +1,28 @@
+/**
+ * BetterDiscord Vendor Module
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import WebpackModules from './webpackmodules';
+import jQuery from 'jquery';
+
+export default class {
+
+    static get jQuery() {
+        return jQuery;
+    }
+
+    static get $() {
+        return this.jQuery;
+    }
+
+    static get moment() {
+        return WebpackModules.getModuleByName('Moment');
+    }
+
+}

client/src/modules/webpackmodules.js

@@ -0,0 +1,260 @@
+/**
+ * BetterDiscord WebpackModules Module
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+class Filters {
+    static byProperties(props, selector = m => m) {
+        return module => {
+            const component = selector(module);
+            if (!component) return false;
+            return props.every(property => component[property] !== undefined);
+        };
+    }
+
+    static byPrototypeFields(fields, selector = m => m) {
+        return module => {
+            const component = selector(module);
+            if (!component) return false;
+            if (!component.prototype) return false;
+            return fields.every(field => component.prototype[field] !== undefined);
+        };
+    }
+
+    static byCode(search, selector = m => m) {
+        return module => {
+            const method = selector(module);
+            if (!method) return false;
+            return method.toString().search(search) !== -1;
+        };
+    }
+
+    static byDisplayName(name) {
+        return module => {
+            return module && module.displayName === name;
+        };
+    }
+
+    static combine(...filters) {
+        return module => {
+            return filters.every(filter => filter(module));
+        };
+    }
+}
+
+const KnownModules = {
+    React: Filters.byProperties(['createElement', 'cloneElement']),
+    ReactDOM: Filters.byProperties(['render', 'findDOMNode']),
+
+    /* Guild Info, Stores, and Utilities */
+    GuildStore: Filters.byProperties(['getGuild']),
+    SortedGuildStore: Filters.byProperties(['getSortedGuilds']),
+    SelectedGuildStore: Filters.byProperties(['getLastSelectedGuildId']),
+    GuildSync: Filters.byProperties(["getSyncedGuilds"]),
+    GuildInfo: Filters.byProperties(["getAcronym"]),
+    GuildChannelsStore: Filters.byProperties(['getChannels', 'getDefaultChannel']),
+    GuildMemberStore: Filters.byProperties(['getMember']),
+    MemberCountStore: Filters.byProperties(["getMemberCounts"]),
+    GuildEmojiStore: Filters.byProperties(['getEmojis']),
+    GuildActions: Filters.byProperties(['markGuildAsRead']),
+    GuildPermissions: Filters.byProperties(['getGuildPermissions']),
+
+    /* Channel Store & Actions */
+    ChannelStore: Filters.byProperties(['getChannels', 'getDMFromUserId']),
+    SelectedChannelStore: Filters.byProperties(['getLastSelectedChannelId']),
+    ChannelActions: Filters.byProperties(["selectChannel"]),
+
+    /* Current User Info, State and Settings */
+    UserInfoStore: Filters.byProperties(["getToken"]),
+    UserSettingsStore: Filters.byProperties(["guildPositions"]),
+    AccountManager: Filters.byProperties(['register', 'login']),
+    UserSettingsUpdater: Filters.byProperties(['updateRemoteSettings']),
+    OnlineWatcher: Filters.byProperties(['isOnline']),
+    CurrentUserIdle: Filters.byProperties(['getIdleTime']),
+    RelationshipStore: Filters.byProperties(['isBlocked']),
+    MentionStore: Filters.byProperties(["getMentions"]),
+
+    /* User Stores and Utils */
+    UserStore: Filters.byProperties(['getCurrentUser']),
+    UserStatusStore: Filters.byProperties(['getStatuses']),
+    UserTypingStore: Filters.byProperties(['isTyping']),
+    UserActivityStore: Filters.byProperties(['getActivity']),
+    UserNameResolver: Filters.byProperties(['getName']),
+
+
+    /* Emoji Store and Utils */
+    EmojiInfo: Filters.byProperties(['isEmojiDisabled']),
+    EmojiUtils: Filters.byProperties(['diversitySurrogate']),
+    EmojiStore: Filters.byProperties(['getByCategory', 'EMOJI_NAME_RE']),
+
+    /* Invite Store and Utils */
+    InviteStore: Filters.byProperties(["getInvites"]),
+    InviteResolver: Filters.byProperties(['findInvite']),
+    InviteActions: Filters.byProperties(['acceptInvite']),
+
+
+    /* Discord Objects & Utils */
+    DiscordConstants: Filters.byProperties(["Permissions", "ActivityTypes", "StatusTypes"]),
+    Permissions: Filters.byProperties(['getHighestRole']),
+    ColorConverter: Filters.byProperties(['hex2int']),
+    ColorShader: Filters.byProperties(['darken']),
+    ClassResolver: Filters.byProperties(["getClass"]),
+    ButtonData: Filters.byProperties(["ButtonSizes"]),
+    IconNames: Filters.byProperties(["IconNames"]),
+
+    /* Discord Messages */
+    HistoryUtils: Filters.byProperties(['transitionTo', 'replaceWith', 'getHistory']),
+    MessageActions: Filters.byProperties(['jumpToMessage', '_sendMessage']),
+    MessageQueue: Filters.byProperties(['enqueue']),
+    MessageParser: Filters.byProperties(['createMessage', 'parse', 'unparse']),
+
+    /* In-Game Overlay */
+    OverlayUserPopoutSettings: Filters.byProperties(['openUserPopout']),
+    OverlayUserPopoutInfo: Filters.byProperties(['getOpenedUserPopout']),
+
+    /* Experiments */
+    ExperimentStore: Filters.byProperties(['getExperimentOverrides']),
+    ExperimentsManager: Filters.byProperties(['isDeveloper']),
+    CurrentExperiment: Filters.byProperties(['getExperimentId']),
+
+
+    /* Images, Avatars and Utils */
+    ImageResolver: Filters.byProperties(["getUserAvatarURL"]),
+    ImageUtils: Filters.byProperties(['getSizedImageSrc']),
+    AvatarDefaults: Filters.byProperties(["getUserAvatarURL", "DEFAULT_AVATARS"]),
+
+    /* Drag & Drop */
+    DNDActions: Filters.byProperties(["beginDrag"]),
+    DNDSources: Filters.byProperties(["addTarget"]),
+    DNDObjects: Filters.byProperties(["DragSource"]),
+
+    /* Electron & Other Internals with Utils*/
+    ElectronModule: Filters.byProperties(["_getMainWindow"]),
+    Dispatcher: Filters.byProperties(['dirtyDispatch']),
+    PathUtils: Filters.byProperties(["hasBasename"]),
+    NotificationModule: Filters.byProperties(["showNotification"]),
+    RouterModule: Filters.byProperties(["Router"]),
+    APIModule: Filters.byProperties(["getAPIBaseURL"]),
+    AnalyticEvents: Filters.byProperties(["AnalyticEventConfigs"]),
+    KeyGenerator: Filters.byCode(/"binary"/),
+    Buffers: Filters.byProperties(['Buffer', 'kMaxLength']),
+    DeviceStore: Filters.byProperties(['getDevices']),
+    SoftwareInfo: Filters.byProperties(["os"]),
+    CurrentContext: Filters.byProperties(["setTagsContext"]),
+
+    /* Media Stuff (Audio/Video) */
+    MediaDeviceInfo: Filters.byProperties(["Codecs", "SUPPORTED_BROWSERS"]),
+    MediaInfo: Filters.byProperties(["getOutputVolume"]),
+    MediaEngineInfo: Filters.byProperties(['MediaEngineFeatures']),
+    VoiceInfo: Filters.byProperties(["EchoCancellation"]),
+    VideoStream: Filters.byProperties(["getVideoStream"]),
+    SoundModule: Filters.byProperties(["playSound"]),
+
+    /* Window, DOM, HTML */
+    WindowInfo: Filters.byProperties(['isFocused', 'windowSize']),
+    TagInfo: Filters.byProperties(['VALID_TAG_NAMES']),
+    DOMInfo: Filters.byProperties(['canUseDOM']),
+    HTMLUtils: Filters.byProperties(['htmlFor', 'sanitizeUrl']),
+
+    /* Locale/Location and Time */
+    LocaleManager: Filters.byProperties(['setLocale']),
+    Moment: Filters.byProperties(['parseZone']),
+    LocationManager: Filters.byProperties(["createLocation"]),
+    Timestamps: Filters.byProperties(["fromTimestamp"]),
+
+    /* Strings and Utils */
+    Strings: Filters.byProperties(["TEXT", "TEXTAREA_PLACEHOLDER"]),
+    StringFormats: Filters.byProperties(['a', 'z']),
+    StringUtils: Filters.byProperties(["toASCII"]),
+
+    /* URLs and Utils */
+    URLParser: Filters.byProperties(['Url', 'parse']),
+    ExtraURLs: Filters.byProperties(['getArticleURL']),
+
+
+    /* DOM/React Components */
+    /* ==================== */
+    UserSettingsWindow: Filters.byProperties(['open', 'updateAccount']),
+    LayerManager: Filters.byProperties(['popLayer', 'pushLayer']),
+
+    /* Modals */
+    ModalStack: Filters.byProperties(['push', 'update', 'pop', 'popWithKey']),
+    UserProfileModals: Filters.byProperties(['fetchMutualFriends', 'setSection']),
+    ConfirmModal: Filters.byPrototypeFields(['handleCancel', 'handleSubmit', 'handleMinorConfirm']),
+
+    /* Popouts */
+    PopoutStack: Filters.byProperties(['open', 'close', 'closeAll']),
+    PopoutOpener: Filters.byProperties(['openPopout']),
+    EmojiPicker: Filters.byPrototypeFields(['onHoverEmoji', 'selectEmoji']),
+
+    /* Context Menus */
+    ContextMenuActions: Filters.byCode(/CONTEXT_MENU_CLOSE/, c => c.close),
+    ContextMenuItemsGroup: Filters.byCode(/itemGroup/),
+    ContextMenuItem: Filters.byCode(/\.label\b.*\.hint\b.*\.action\b/),
+
+    /* In-Message Links */
+    ExternalLink: Filters.byCode(/\.trusted\b/)
+};
+
+export default class {
+    /* Synchronous */
+    static getModuleByName(name, fallback) {
+        if (Cache.hasOwnProperty(name)) return Cache[name];
+        if (KnownModules.hasOwnProperty(name)) fallback = KnownModules[name];
+        if (!fallback) return null;
+        return Cache[name] = this.getModule(fallback, true);
+    }
+
+    static getModuleByDisplayName(name) {
+        return this.getModule(Filters.byDisplayName(name), true);
+    }
+
+    static getModuleByRegex(regex, first = true) {
+        return this.getModule(Filters.byCode(regex), first);
+    }
+
+    static getModuleByPrototypes(prototypes, first = true) {
+        return this.getModule(Filters.byPrototypeFields(prototypes), first);
+    }
+
+    static getModuleByProps(props, first = true) {
+        return this.getModule(Filters.byProperties(props), first);
+    }
+
+    static getModule(filter, first = true) {
+        const modules = this.getAllModules();
+        const rm = [];
+        for (let index in modules) {
+            if (!modules.hasOwnProperty(index)) continue;
+            const module = modules[index];
+            const { exports } = module;
+            let foundModule = null;
+
+            if (!exports) continue;
+            if (exports.__esModule && exports.default && filter(exports.default)) foundModule = exports.default;
+            if (filter(exports)) foundModule = exports;
+            if (!foundModule) continue;
+            if (first) return foundModule;
+            rm.push(foundModule);
+        }
+        return first || rm.length == 0 ? null : rm;
+    }
+
+    static getAllModules() {
+        const id = 'bd-webpackmodules';
+        const __webpack_require__ = window['webpackJsonp'](
+            [],
+            {
+                [id]: (module, exports, __webpack_require__) => exports.default = __webpack_require__
+            },
+            [id]).default;
+        delete __webpack_require__.m[id];
+        delete __webpack_require__.c[id];
+        return __webpack_require__.c;
+    }
+}

common/modules/utils.js

@@ -12,6 +12,8 @@ const
     path = require('path'),
     fs = require('fs');
 
+import  { Vendor } from 'modules';
+
 export class Utils {
     static overload(fn, cb) {
         const orig = fn;
@@ -133,6 +135,8 @@ export class FileUtils {
     }
 }
 
+const logs = [];
+
 export class ClientLogger {
     static err(module, message) { this.log(module, message, 'err'); }
     static warn(module, message) { this.log(module, message, 'warn'); }
@@ -147,7 +151,7 @@ export class ClientLogger {
         }
         level = this.parseLevel(level);
         console[level]('[%cBetter%cDiscord:%s] %s', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, message);
-        logs.push(`[${Vendor.moment().format('DD/MM/YY hh:mm:ss')}|${module}|${level}] ${message}`);
+        logs.push(`${level.toUpperCase()} : [${Vendor.moment().format('DD/MM/YY hh:mm:ss')}|${module}] ${message}`);
         window.bdlogs = logs;
     }