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

Changes BandagedBD to BetterDiscord

This commit is contained in:
Zack Rauen 2020-07-26 18:47:04 -04:00
parent 68f73ebd3c
commit 0f45dc6e22
11 changed files with 135 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/locales/de.json
View File

@ -223,11 +223,7 @@
"missingNameData": "META missing name data.",
"metaNotFound": "META nicht gefunden.",
"compileError": "Konnte nicht kompiliert werden.",
"wasUnloaded": "{{name}} was unloaded.",
"alreadyWatching": "Already watching {{prefix}} addons.",
"startingWatch": "Starting to watch {{prefix}} addons.",
"wasNotWatching": "Was not watching {{prefix}} addons.",
"noLongerWatching": "No longer watching {{prefix}} addons."
"wasUnloaded": "{{name}} was unloaded."
},
"CustomCSS": {
"confirmationText": "Du hast ungespeicherte Änderungen im Custom-CSS. Durch das Schließen dieses Fensters verlierst du alle Änderungen.",
@ -289,12 +285,12 @@
},
"Startup": {
"notSupported": "Nicht unterstützt",
"versionMismatch": "BandagedBD Injector v{{injector}} wird nicht von der letzten Onlineversion (v{{remote}}) unterstützt.\n\nBitte lade den neusten Installer von [GitHub](https://github.com/rauenzi/BetterDiscordApp/releases/latest) herunter.",
"incompatibleApp": "BandagedBD ist nicht mit {{app}} kompatiblem. Bitte entferne entweder BetterDiscord oder {{app}}.",
"versionMismatch": "BetterDiscord Injector v{{injector}} wird nicht von der letzten Onlineversion (v{{remote}}) unterstützt.\n\nBitte lade den neusten Installer von [GitHub](https://github.com/rauenzi/BetterDiscordApp/releases/latest) herunter.",
"incompatibleApp": "BetterDiscord ist nicht mit {{app}} kompatiblem. Bitte entferne entweder BetterDiscord oder {{app}}.",
"updateNow": "Jetzt aktualisieren",
"maybeLater": "Später",
"updateAvailable": "Update verfügbar",
"updateInfo": "Ein Update für BandagedBDs Injector ({{version}}) ist verfügbar.\n\nDu kannst entweder jetzt oder später aktualisieren und neustarten",
"updateInfo": "Ein Update für BetterDiscords Injector ({{version}}) ist verfügbar.\n\nDu kannst entweder jetzt oder später aktualisieren und neustarten",
"updateFailed": "Konnte nicht aktualisiert werden",
"manualUpdate": "Die automatische Aktualisierung schlug fehl. Bitte lade den Installer herunter und installiere BetterDiscord erneut.\n\n[Installer herunterladen](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
"jqueryFailed": "jQuery konnte nicht geladen werden",

121
assets/locales/en.json
View File

@ -70,6 +70,14 @@
"autoReload": {
"name": "Automatic Loading",
"note": "Automatically loads, reloads, and unloads plugins and themes"
},
"editAction": {
"name": "Edit Action",
"note": "Where plugins & themes appear when editing",
"options": {
"detached": "Detached Window",
"system": "System Editor"
}
}
},
"customcss": {
@ -89,17 +97,30 @@
"nativeOpen": {
"name": "Open in Native Editor",
"note": "Clicking the Custom CSS tab opens your custom css in your native editor"
},
"openAction": {
"name": "Editor Location",
"note": "Where Custom CSS should open by default",
"options": {
"settings": "Settings Menu",
"detached": "Detached Window",
"system": "System Editor"
}
}
},
"developer": {
"name": "Developer Settings",
"developerMode": {
"name": "Developer Mode",
"debuggerHotkey": {
"name": "Debugger Hotkey",
"note": "Allows activating debugger when pressing F8"
},
"copySelector": {
"name": "Copy Selector",
"note": "Adds a \"Copy Selector\" option to context menus when developer mode is active"
},
"reactDevTools": {
"name": "React Developer Tools",
"note": "Injects your local installation of React Developer Tools into Discord"
}
},
"window": {
@ -120,7 +141,7 @@
"name": "General",
"download": {
"name": "Download Emotes",
"note": "Download emotes once a week to stay up to date"
"note": "Download emotes whenever they are out of date"
},
"emoteMenu": {
"name": "Emote Menu",
@ -149,11 +170,15 @@
},
"categories": {
"name": "Categories",
"twitch": {
"name": "Twitch",
"note": "Show Twitch global & subscriber emotes"
"twitchglobal": {
"name": "Twitch Globals",
"note": "Show Twitch global emotes"
},
"ffz": {
"twitchsubscriber": {
"name": "Twitch Subscribers",
"note": "Show Twitch subscriber emotes"
},
"frankerfacez": {
"name": "FrankerFaceZ",
"note": "Show emotes from FFZ"
},
@ -171,14 +196,35 @@
"addonSettings": "Settings",
"website": "Website",
"source": "Source",
"server": "Support Server",
"donate": "Donate"
},
"Emotes": {
"downloading": "Downloading emotes in the background do not reload.",
"downloaded": "All emotes successfully downloaded.",
"clearEmotes": "Clear Emote Data",
"favoriteAction": "Favorite!"
"invite": "Support Server",
"donate": "Donate",
"patreon": "Patreon",
"name": "Name",
"author": "Author",
"version": "Version",
"added": "Date Added",
"modified": "Date Modified",
"search": "Search {{type}}",
"editAddon": "Edit",
"deleteAddon": "Delete",
"confirmDelete": "Are you sure you want to delete {{name}}?",
"confirmationText": "You have unsaved changes to {{name}}. Closing this window will lose all those changes.",
"enabled": "{{name}} has been enabled.",
"disabled": "{{name}} has been disabled.",
"couldNotEnable": "{{name}} could not be enabled.",
"couldNotDisable": "{{name}} could not be disabled.",
"couldNotStart": "{{name}} could not be started.",
"couldNotStop": "{{name}} could not be stopped.",
"methodError": "{{method}} could not be fired.",
"unknownAuthor": "Unknown Author",
"noDescription": "Description not provided.",
"alreadyExists": "There is already a {{type}} with name {{name}}",
"alreadWatching": "Already watching addons.",
"metaError": "META could not be parsed.",
"missingNameData": "META missing name data.",
"metaNotFound": "META was not found.",
"compileError": "Could not be compiled.",
"wasUnloaded": "{{name}} was unloaded."
},
"CustomCSS": {
"confirmationText": "You have unsaved changes to your Custom CSS. Closing this window will lose all those changes.",
@ -189,6 +235,15 @@
"settings": "Editor Settings",
"editorTitle": "Custom CSS Editor"
},
"Developer": {
"copySelector": "Copy Selector"
},
"Emotes": {
"loading": "Loading emotes in the background do not reload.",
"loaded": "All emotes successfully loaded.",
"clearEmotes": "Clear Emote Data",
"favoriteAction": "Favorite!"
},
"PublicServers": {
"button": "public",
"join": "Join",
@ -206,12 +261,44 @@
"query": "for {{query}}"
},
"Modals": {
"confirmClose": "Are You Sure?",
"confirmAction": "Are You Sure?",
"okay": "Okay",
"cancel": "Cancel",
"close": "Close",
"name": "Name",
"message": "Message",
"error": "Error",
"addonErrors": "Addon Errors"
"addonErrors": "Addon Errors",
"restartRequired": "Restart Required",
"restartNow": "Restart Now",
"restartLater": "Restart Later",
"additionalInfo": "Additional Info"
},
"ReactDevTools": {
"notFound": "Extension Not Found",
"notFoundDetails": "Unable to find the React Developer Tools extension on your PC. Please install the extension on your local Chrome installation."
},
"Sorting": {
"sortBy": "Sort By",
"order": "Order",
"ascending": "Ascending",
"descending": "Descending"
},
"Startup": {
"notSupported": "Not Supported",
"versionMismatch": "BetterDiscord Injector v{{injector}} is not supported by the latest remote (v{{remote}}).\n\nPlease download the latest version from [GitHub](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
"incompatibleApp": "BetterDiscord does not work with {{app}}. Please uninstall one of them.",
"updateNow": "Update Now",
"maybeLater": "Maybe Later",
"updateAvailable": "Update Available",
"updateInfo": "There is an update available for BetterDiscord's Injector ({{version}}).\n\nYou can either update and restart now, or later.",
"updateFailed": "Could Not Update",
"manualUpdate": "Unable to update automatically, please download the installer and reinstall normally.\n\n[Download Installer](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
"jqueryFailed": "jQuery Failed To Load",
"jqueryFailedDetails": "jQuery could not be loaded, and some plugins may not work properly. Proceed at your own risk."
},
"WindowPrefs": {
"enabledInfo": "This option requires a transparent theme in order to work properly. On Windows this may break your aero snapping and maximizing.\n\nIn order to take effect, Discord needs to be restarted. Do you want to restart now?",
"disabledInfo": "In order to take effect, Discord needs to be restarted. Do you want to restart now?"
}
}

6
src/data/config.js
View File

@ -3,9 +3,9 @@ export default {
localPath: "",
localServer: "//localhost:8080",
minified: true,
version: "0.3.0",
branch: "master",
version: "0.6.0",
branch: "stable",
repo: "rauenzi",
minSupportedVersion: "0.3.0",
bbdVersion: "1.0.0"
bdVersion: "1.0.0"
};

12
src/data/strings.js
View File

@ -224,11 +224,7 @@ export default {
missingNameData: "META missing name data.",
metaNotFound: "META was not found.",
compileError: "Could not be compiled.",
wasUnloaded: "{{name}} was unloaded.",
alreadyWatching: "Already watching {{prefix}} addons.",
startingWatch: "Starting to watch {{prefix}} addons.",
wasNotWatching: "Was not watching {{prefix}} addons.",
noLongerWatching: "No longer watching {{prefix}} addons."
wasUnloaded: "{{name}} was unloaded."
},
CustomCSS: {
confirmationText: "You have unsaved changes to your Custom CSS. Closing this window will lose all those changes.",
@ -290,12 +286,12 @@ export default {
},
Startup: {
notSupported: "Not Supported",
versionMismatch: "BandagedBD Injector v{{injector}} is not supported by the latest remote (v{{remote}}).\n\nPlease download the latest version from [GitHub](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
incompatibleApp: "BandagedBD does not work with {{app}}. Please uninstall one of them.",
versionMismatch: "BetterDiscord Injector v{{injector}} is not supported by the latest remote (v{{remote}}).\n\nPlease download the latest version from [GitHub](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
incompatibleApp: "BetterDiscord does not work with {{app}}. Please uninstall one of them.",
updateNow: "Update Now",
maybeLater: "Maybe Later",
updateAvailable: "Update Available",
updateInfo: "There is an update available for BandagedBD's Injector ({{version}}).\n\nYou can either update and restart now, or later.",
updateInfo: "There is an update available for BetterDiscord's Injector ({{version}}).\n\nYou can either update and restart now, or later.",
updateFailed: "Could Not Update",
manualUpdate: "Unable to update automatically, please download the installer and reinstall normally.\n\n[Download Installer](https://github.com/rauenzi/BetterDiscordApp/releases/latest)",
jqueryFailed: "jQuery Failed To Load",

2
src/loadingicon.js
View File

@ -30,7 +30,7 @@ iconStyle.textContent = css;
const loadingIcon = document.createElement("div");
loadingIcon.id = "bd-loading-icon";
loadingIcon.className = "bd-loaderv2";
loadingIcon.title = "BandagedBD is loading...";
loadingIcon.title = "BetterDiscord is loading...";
export default class {
static show() {

12
src/modules/componentpatcher.js
View File

@ -34,7 +34,7 @@ export default new class ComponentPatcher {
const newOne = function() {
const returnVal = original(...arguments);
returnVal.props.children.push(
DiscordModules.React.createElement(Anchor, {className: "bd-social-link", href: "https://twitter.com/BandagedBD", title: "BandagedBD", target: "_blank"},
DiscordModules.React.createElement(Anchor, {className: "bd-social-link", href: "https://twitter.com/BandagedBD", title: "BetterDiscord", target: "_blank"},
DiscordModules.React.createElement(BDLogo, {size: "16px", className: "bd-social-logo"})
)
);
@ -45,7 +45,7 @@ export default new class ComponentPatcher {
const injector = DiscordModules.React.createElement("div", {className: "colorMuted-HdFt4q size12-3cLvbJ"}, `Injector ${Config.version}`);
const versionHash = `(${Config.hash ? Config.hash.substring(0, 7) : Config.branch})`;
const additional = DiscordModules.React.createElement("div", {className: "colorMuted-HdFt4q size12-3cLvbJ"}, `BBD ${Config.bbdVersion} `, DiscordModules.React.createElement("span", {className: "versionHash-2gXjIB da-versionHash"}, versionHash));
const additional = DiscordModules.React.createElement("div", {className: "colorMuted-HdFt4q size12-3cLvbJ"}, `BD ${Config.bdVersion} `, DiscordModules.React.createElement("span", {className: "versionHash-2gXjIB da-versionHash"}, versionHash));
const originalVersions = children[children.length - 1].type;
@ -120,8 +120,8 @@ export default new class ComponentPatcher {
if (!children || !author || !author.id || author.id !== "249746236008169473") return;
if (!Array.isArray(children)) return;
children.push(
React.createElement(Tooltip, {color: "black", position: "top", text: "BandagedBD Developer"},
props => React.createElement(Anchor, Object.assign({className: "bd-chat-badge", href: "https://github.com/rauenzi/BetterDiscordApp", title: "BandagedBD", target: "_blank"}, props),
React.createElement(Tooltip, {color: "black", position: "top", text: "BetterDiscord Developer"},
props => React.createElement(Anchor, Object.assign({className: "bd-chat-badge", href: "https://github.com/rauenzi/BetterDiscordApp", title: "BetterDiscord", target: "_blank"}, props),
React.createElement(BDLogo, {size: "16px", className: "bd-logo"})
)
)
@ -140,8 +140,8 @@ export default new class ComponentPatcher {
if (!children || !user || !user.id || user.id !== "249746236008169473") return;
if (!Array.isArray(children)) return;
children.push(
React.createElement(Tooltip, {color: "black", position: "top", text: "BandagedBD Developer"},
props => React.createElement(Anchor, Object.assign({className: "bd-member-badge", href: "https://github.com/rauenzi/BetterDiscordApp", title: "BandagedBD", target: "_blank"}, props),
React.createElement(Tooltip, {color: "black", position: "top", text: "BetterDiscord Developer"},
props => React.createElement(Anchor, Object.assign({className: "bd-member-badge", href: "https://github.com/rauenzi/BetterDiscordApp", title: "BetterDiscord", target: "_blank"}, props),
React.createElement(BDLogo, {size: "16px", className: "bd-logo"})
)
)

12
src/modules/core.js
View File

@ -37,15 +37,13 @@ export default class Core {
name: "jquery",
type: "script",
url: "//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js",
backup: "//cdn.jsdelivr.net/gh/jquery/jquery@2.0.0/jquery.min.js",
local: null
backup: "//cdn.jsdelivr.net/gh/jquery/jquery@2.0.0/jquery.min.js"
},
{
name: "bd-stylesheet",
type: "style",
url: "//betterdiscord.zerebos.com/dist/style.css",
backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.css",
local: "{{localServer}}/BetterDiscordApp/dist/style.css",
localPath: "style.css"
}
];
@ -67,7 +65,7 @@ export default class Core {
DataStore.initialize();
await LocaleManager.initialize();
if (Config.version < Config.minSupportedVersion) return Modals.alert(Strings.Startup.notSupported, Strings.Startup.versionMismatch.format({injector: Config.version, remote: Config.bbdVersion}));
if (Config.version < Config.minSupportedVersion) return Modals.alert(Strings.Startup.notSupported, Strings.Startup.versionMismatch.format({injector: Config.version, remote: Config.bdVersion}));
if (window.ED) return Modals.alert(Strings.Startup.notSupported, Strings.Startup.incompatibleApp.format({app: "EnhancedDiscord"}));
if (window.WebSocket && window.WebSocket.name && window.WebSocket.name.includes("Patched")) return Modals.alert(Strings.Startup.notSupported, Strings.Startup.incompatibleApp.format({app: "Powercord"}));
@ -117,9 +115,9 @@ export default class Core {
Modals.showAddonErrors({plugins: pluginErrors, themes: themeErrors});
const previousVersion = DataStore.getBDData("version");
if (Config.bbdVersion > previousVersion) {
if (Config.bdVersion > previousVersion) {
Modals.showChangelogModal(Changelog);
DataStore.setBDData("version", Config.bbdVersion);
DataStore.setBDData("version", Config.bdVersion);
}
}
@ -150,7 +148,7 @@ export default class Core {
continue;
}
}
const url = Utilities.formatString((Config.local && data.local != null) ? data.local : data.url, {repo: Config.repo, hash: Config.hash, localServer: Config.localServer});
const url = Utilities.formatString(data.url, {repo: Config.repo, hash: Config.hash});
Logger.log(`Startup`, `Loading Resource (${url})`);
const injector = (data.type == "script" ? DOMManager.injectScript : DOMManager.linkStyle).bind(DOMManager);
try {

2
src/modules/logger.js
View File

@ -85,7 +85,7 @@ export default class Logger {
static _log(module, message, type = "log") {
type = Logger.parseType(type);
if (!Array.isArray(message)) message = [message];
console[type](`%c[BandagedBD]%c [${module}]%c`, "color: #3E82E5; font-weight: 700;", "color: #3a71c1;", "", ...message);
console[type](`%c[BetterDiscord]%c [${module}]%c`, "color: #3E82E5; font-weight: 700;", "color: #3a71c1;", "", ...message);
}
static parseType(type) {

2
src/ui/modals.js
View File

@ -174,7 +174,7 @@ export default class Modals {
const MarkdownParser = WebpackModules.getByProps("defaultRules", "parse");
if (!Changelog || !ModalStack || !ChangelogClasses || !TextElement || !FlexChild || !Titles || !MarkdownParser) return Logger.warn("Modals", "showChangelogModal missing modules");
const {image = "https://repository-images.githubusercontent.com/105473537/957b5480-7c26-11e9-8401-50fa820cbae5", description = "", changes = [], title = "BandagedBD", subtitle = `v${Config.bbdVersion}`, footer} = options;
const {image = "https://repository-images.githubusercontent.com/105473537/957b5480-7c26-11e9-8401-50fa820cbae5", description = "", changes = [], title = "BetterDiscord", subtitle = `v${Config.bdVersion}`, footer} = options;
const ce = React.createElement;
const changelogItems = [options.video ? ce("video", {src: options.video, poster: options.poster, controls: true, className: ChangelogClasses.video}) : ce("img", {src: image})];
if (description) changelogItems.push(ce("p", null, MarkdownParser.parse(description)));

2
src/ui/settings/sidebarheader.jsx
View File

@ -9,7 +9,7 @@ const Tooltip = WebpackModules.getByDisplayName("Tooltip");
export default class SettingsTitle extends React.Component {
render() {
return <div className="bd-sidebar-header">
<SidebarComponents.Header>BandagedBD</SidebarComponents.Header>
<SidebarComponents.Header>BetterDiscord</SidebarComponents.Header>
<Tooltip color="black" position="top" text="Changelog">
{props =>
<div {...props} className="bd-changelog-button" onClick={() => Modals.showChangelogModal(Changelog)}>

10
src/ui/toasts.js
View File

@ -1,10 +1,10 @@
import {WebpackModules, Settings, DOMManager} from "modules";
const channelsClass = WebpackModules.getByProps("sidebar", "hasNotice").sidebar.split(" ")[0];
const membersWrapClass = WebpackModules.getByProps("membersWrap").membersWrap.split(" ")[0];
export default class Toasts {
static get ChannelsClass() {return WebpackModules.getByProps("sidebar", "hasNotice").sidebar.split(" ")[0];}
static get MembersWrapClass() {return WebpackModules.getByProps("membersWrap").membersWrap.split(" ")[0];}
static get shouldShowToasts() {return Settings.get("settings", "general", "showToasts");}
/** Shorthand for `type = "success"` for {@link module:Toasts.show} */
@ -53,8 +53,8 @@ export default class Toasts {
static ensureContainer() {
if (document.querySelector(".bd-toasts")) return;
const container = document.querySelector(`.${channelsClass} + div`);
const memberlist = container.querySelector(`.${membersWrapClass}`);
const container = document.querySelector(`.${this.ChannelsClass} + div`);
const memberlist = container.querySelector(`.${this.MembersWrapClass}`);
const form = container ? container.querySelector("form") : null;
const left = container ? container.getBoundingClientRect().left : 310;
const right = memberlist ? memberlist.getBoundingClientRect().left : 0;