From 68d8b0dc0e3277257da19c3d082eb5bddbdd25fe Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Tue, 16 Aug 2022 20:33:44 -0400 Subject: [PATCH] Remove UserSettingsStore --- renderer/src/modules/discordmodules.js | 3 ++- renderer/src/modules/localemanager.js | 4 ++-- renderer/src/ui/customcss/editor.jsx | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/renderer/src/modules/discordmodules.js b/renderer/src/modules/discordmodules.js index 8a36c9eb..49dd8e0a 100644 --- a/renderer/src/modules/discordmodules.js +++ b/renderer/src/modules/discordmodules.js @@ -36,7 +36,8 @@ export default Utilities.memoizeObject({ /* Current User Info, State and Settings */ get UserInfoStore() {return WebpackModules.getByProps("getToken");}, - get UserSettingsStore() {return WebpackModules.getByProps("getAllSettings", "theme");}, + get LocaleStore() {return WebpackModules.getByProps("locale", "initialize");}, + get ThemeStore() {return WebpackModules.getByProps("theme", "initialize");}, get AccountManager() {return WebpackModules.getByProps("register", "login");}, get UserSettingsUpdater() {return WebpackModules.getByProps("updateRemoteSettings");}, get OnlineWatcher() {return WebpackModules.getByProps("isOnline");}, diff --git a/renderer/src/modules/localemanager.js b/renderer/src/modules/localemanager.js index 4c101795..b52c25e8 100644 --- a/renderer/src/modules/localemanager.js +++ b/renderer/src/modules/localemanager.js @@ -3,10 +3,10 @@ import DiscordModules from "./discordmodules"; import Utilities from "./utilities"; import Events from "./emitter"; -const {Dispatcher, UserSettingsStore} = DiscordModules; +const {Dispatcher, LocaleStore} = DiscordModules; export default new class LocaleManager { - get discordLocale() {return UserSettingsStore?.locale ?? this.defaultLocale;} + get discordLocale() {return LocaleStore?.locale ?? this.defaultLocale;} get defaultLocale() {return "en-US";} constructor() { diff --git a/renderer/src/ui/customcss/editor.jsx b/renderer/src/ui/customcss/editor.jsx index 14828043..b2a026b8 100644 --- a/renderer/src/ui/customcss/editor.jsx +++ b/renderer/src/ui/customcss/editor.jsx @@ -3,6 +3,7 @@ import {React, WebpackModules, DiscordModules, Settings} from "modules"; import Checkbox from "./checkbox"; const Tooltip = WebpackModules.getByDisplayName("Tooltip"); +const ThemeStore = DiscordModules.ThemeStore; const languages = ["abap", "abc", "actionscript", "ada", "apache_conf", "asciidoc", "assembly_x86", "autohotkey", "batchfile", "bro", "c_cpp", "c9search", "cirru", "clojure", "cobol", "coffee", "coldfusion", "csharp", "csound_document", "csound_orchestra", "csound_score", "css", "curly", "d", "dart", "diff", "dockerfile", "dot", "drools", "dummy", "dummysyntax", "eiffel", "ejs", "elixir", "elm", "erlang", "forth", "fortran", "ftl", "gcode", "gherkin", "gitignore", "glsl", "gobstones", "golang", "graphqlschema", "groovy", "haml", "handlebars", "haskell", "haskell_cabal", "haxe", "hjson", "html", "html_elixir", "html_ruby", "ini", "io", "jack", "jade", "java", "javascript", "json", "jsoniq", "jsp", "jssm", "jsx", "julia", "kotlin", "latex", "less", "liquid", "lisp", "livescript", "logiql", "lsl", "lua", "luapage", "lucene", "makefile", "markdown", "mask", "matlab", "maze", "mel", "mushcode", "mysql", "nix", "nsis", "objectivec", "ocaml", "pascal", "perl", "pgsql", "php", "pig", "powershell", "praat", "prolog", "properties", "protobuf", "python", "r", "razor", "rdoc", "red", "rhtml", "rst", "ruby", "rust", "sass", "scad", "scala", "scheme", "scss", "sh", "sjs", "smarty", "snippets", "soy_template", "space", "sql", "sqlserver", "stylus", "svg", "swift", "tcl", "tex", "text", "textile", "toml", "tsx", "twig", "typescript", "vala", "vbscript", "velocity", "verilog", "vhdl", "wollok", "xml", "xquery", "yaml", "django"]; @@ -12,7 +13,7 @@ export default class CodeEditor extends React.Component { constructor(props) { super(props); - this.props.theme = DiscordModules.UserSettingsStore && DiscordModules.UserSettingsStore.theme === "light" ? "vs" : "vs-dark"; + this.props.theme = ThemeStore?.theme === "light" ? "vs" : "vs-dark"; this.props.language = this.props.language.toLowerCase().replace(/ /g, "_"); if (!languages.includes(this.props.language)) this.props.language = CodeEditor.defaultProps.language; @@ -36,7 +37,7 @@ export default class CodeEditor extends React.Component { this.editor = window.monaco.editor.create(document.getElementById(this.props.id), { value: this.props.value, language: this.props.language, - theme: DiscordModules.UserSettingsStore.theme == "light" ? "vs" : "vs-dark", + theme: ThemeStore?.theme == "light" ? "vs" : "vs-dark", fontSize: Settings.get("settings", "editor", "fontSize"), lineNumbers: Settings.get("settings", "editor", "lineNumbers"), minimap: {enabled: Settings.get("settings", "editor", "minimap")}, @@ -69,19 +70,19 @@ export default class CodeEditor extends React.Component { document.getElementById(this.props.id).appendChild(textarea); } - if (DiscordModules.UserSettingsStore) DiscordModules.UserSettingsStore.addChangeListener(this.onThemeChange); + ThemeStore?.addChangeListener?.(this.onThemeChange); window.addEventListener("resize", this.resize); } componentWillUnmount() { window.removeEventListener("resize", this.resize); - if (DiscordModules.UserSettingsStore) DiscordModules.UserSettingsStore.removeChangeListener(this.onThemeChange); + ThemeStore?.removeChangeListener?.(this.onThemeChange); for (const binding of this.bindings) binding.dispose(); this.editor.dispose(); } onThemeChange() { - const newTheme = DiscordModules.UserSettingsStore.theme === "light" ? "vs" : "vs-dark"; + const newTheme = ThemeStore?.theme === "light" ? "vs" : "vs-dark"; if (newTheme === this.props.theme) return; this.props.theme = newTheme; if (window.monaco?.editor) window.monaco.editor.setTheme(this.props.theme);