lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Improve styleloader, fix clearing emotes. (#506) 

* improve styleloader for local development.

* fix clearing emotes
This commit is contained in:
Strencher 2020-12-09 22:44:11 +01:00 committed by GitHub
parent db84e73f50
commit 3ab655594b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtins/emotes/emotes.js
View File

@ -62,7 +62,7 @@ export default new class EmoteModule extends Builtin {
} }
async enabled() { async enabled() {
Settings.registerCollection("emotes", "Emotes", EmoteConfig, {title: Strings.Emotes.clearEmotes, onClick: this.resetEmotes}); Settings.registerCollection("emotes", "Emotes", EmoteConfig, {title: Strings.Emotes.clearEmotes, onClick: this.resetEmotes.bind(this)});
await this.getBlocklist(); await this.getBlocklist();
await this.loadEmoteData(); await this.loadEmoteData();

11
src/modules/core.js
View File

@ -124,12 +124,17 @@ export default new class Core {
async loadDependencies() { async loadDependencies() {
for (const data of this.dependencies) { for (const data of this.dependencies) {
if (Config.local && Config.localPath && data.localPath) { if (Config.local && Config.localPath && data.localPath && data.type == "style") {
if (fs.existsSync(path.resolve(Config.localPath, data.localPath))) { const stylepath = path.resolve(Config.localPath, data.localPath);
const css = fs.readFileSync(path.resolve(Config.localPath, data.localPath)).toString(); if (fs.existsSync(stylepath)) {
Logger.log("Startup", `Loading local stylesheet from (${stylepath})`);
const css = fs.readFileSync(stylepath).toString();
DOMManager.injectStyle(data.name, css); DOMManager.injectStyle(data.name, css);
continue; continue;
} }
else {
Logger.warn("Startup", "Local stylesheet was not found, loading remote...");
}
} }
const url = Utilities.formatString(data.url, {hash: Config.hash}); const url = Utilities.formatString(data.url, {hash: Config.hash});
Logger.log(`Startup`, `Loading Resource (${url})`); Logger.log(`Startup`, `Loading Resource (${url})`);