diff --git a/Plugins/PluginRepo/PluginRepo.plugin.js b/Plugins/PluginRepo/PluginRepo.plugin.js index aeba985ae6..0298fd4bb6 100644 --- a/Plugins/PluginRepo/PluginRepo.plugin.js +++ b/Plugins/PluginRepo/PluginRepo.plugin.js @@ -608,8 +608,8 @@ class PluginRepo { var frame, framerunning = false, framequeue = [], outdated = 0, newentries = 0, i = 0; var tags = ["getName", "getVersion", "getAuthor", "getDescription"]; var seps = ["\"", "\'", "\`"]; - var newentriesdata = BDFDB.loadAllData(this, "newentriesdata"); - this.cachedPlugins = newentriesdata.urlbase64 ? atob(newentriesdata.urlbase64).split("\n") : []; + var newentriesdata = BDFDB.loadAllData(this, "newentriesdata"), ownlist = BDFDB.loadData("ownlist", this, "ownlist") || []; + this.cachedPlugins = (newentriesdata.urlbase64 ? atob(newentriesdata.urlbase64).split("\n") : []).concat(ownlist); let request = require("request"); request("https://mwittrien.github.io/BetterDiscordAddons/Plugins/PluginRepo/res/PluginList.txt", (error, response, result) => { if (!error && result) { @@ -617,7 +617,7 @@ class PluginRepo { BDFDB.saveData("urlbase64", btoa(result), this, "newentriesdata"); this.loadedPlugins = {}; this.grabbedPlugins = result.split("\n"); - this.foundPlugins = this.grabbedPlugins.concat(BDFDB.loadData("ownlist", this, "ownlist") || []); + this.foundPlugins = this.grabbedPlugins.concat(ownlist); this.loading = {is:true, timeout:setTimeout(() => { clearTimeout(this.loading.timeout); if (this.started) { diff --git a/Plugins/ThemeRepo/ThemeRepo.plugin.js b/Plugins/ThemeRepo/ThemeRepo.plugin.js index 9dc1b33d8b..2be32c5e04 100644 --- a/Plugins/ThemeRepo/ThemeRepo.plugin.js +++ b/Plugins/ThemeRepo/ThemeRepo.plugin.js @@ -732,7 +732,8 @@ class ThemeRepo { var getThemeInfo, outdated = 0, newentries = 0, i = 0; var tags = ["name","description","author","version"]; var newentriesdata = BDFDB.loadAllData(this, "newentriesdata"); - this.cachedThemes = newentriesdata.urlbase64 ? atob(newentriesdata.urlbase64).split("\n") : []; + var newentriesdata = BDFDB.loadAllData(this, "newentriesdata"), ownlist = BDFDB.loadData("ownlist", this, "ownlist") || []; + this.cachedThemes = (newentriesdata.urlbase64 ? atob(newentriesdata.urlbase64).split("\n") : []).concat(ownlist); let request = require("request"); request("https://mwittrien.github.io/BetterDiscordAddons/Plugins/ThemeRepo/res/ThemeList.txt", (error, response, result) => { if (!error && result) { @@ -740,7 +741,7 @@ class ThemeRepo { BDFDB.saveData("urlbase64", btoa(result), this, "newentriesdata"); this.loadedThemes = {}; this.grabbedThemes = result.split("\n"); - this.foundThemes = this.grabbedThemes.concat(BDFDB.loadData("ownlist", this, "ownlist") || []); + this.foundThemes = this.grabbedThemes.concat(ownlist); this.loading = {is:true, timeout:setTimeout(() => { clearTimeout(this.loading.timeout); if (this.started) { diff --git a/Plugins/ThemeRepo/res/ThemeList.txt b/Plugins/ThemeRepo/res/ThemeList.txt index 1604b0974e..10467144e2 100644 --- a/Plugins/ThemeRepo/res/ThemeList.txt +++ b/Plugins/ThemeRepo/res/ThemeList.txt @@ -199,6 +199,7 @@ https://raw.githubusercontent.com/TheBaconSpace/TMEMETheme/master/tmeme.theme.cs https://raw.githubusercontent.com/TheWrestlingDiscordia/MiniTheme/master/MiniTheme.theme.css https://raw.githubusercontent.com/Tropix126/BetterDiscordStuff/master/aurora/Aurora.theme.css https://raw.githubusercontent.com/Tropix126/BetterDiscordStuff/master/materialcons/MaterialCons.theme.css +https://raw.githubusercontent.com/Tropix126/BetterDiscordStuff/master/midnight/Midnight.theme.css https://raw.githubusercontent.com/trueprominency/Shades-of-Red-Theme/master/shades-of-red.theme.css https://raw.githubusercontent.com/Twiistrz/TransparencyTheme/master/TransparencyConfig.theme.css https://raw.githubusercontent.com/VaporousCreeper/BetterDiscord-ThemesAndPlugins/master/Themes/GGO_Kirito/GGO_Kirito.theme.css