From d2a1a29d6d9773f7f98c620198e3b2544738d8ba Mon Sep 17 00:00:00 2001 From: Zerebos Date: Sun, 6 Nov 2022 14:37:15 -0500 Subject: [PATCH] Remove all references of emotes (#1467) --- CONTRIBUTING.md | 2 +- package.json | 1 - renderer/src/builtins/emotes/category.jsx | 27 --- renderer/src/builtins/emotes/emotemenu.js | 95 -------- renderer/src/builtins/emotes/emotes.js | 260 --------------------- renderer/src/data/data.js | 1 - renderer/src/data/emotesettings.js | 27 --- renderer/src/data/settings.js | 1 - renderer/src/modules/api/legacy.js | 14 +- renderer/src/modules/datastore.js | 10 - renderer/src/styles/builtins/emotemenu.css | 82 ------- renderer/src/styles/builtins/emotes.css | 208 ----------------- renderer/src/ui/emote.js | 82 ------- renderer/src/ui/emoteicon.jsx | 36 --- renderer/src/ui/emotemenucard.jsx | 13 -- scripts/emotes.js | 18 -- 16 files changed, 2 insertions(+), 875 deletions(-) delete mode 100644 renderer/src/builtins/emotes/category.jsx delete mode 100644 renderer/src/builtins/emotes/emotemenu.js delete mode 100644 renderer/src/builtins/emotes/emotes.js delete mode 100644 renderer/src/data/emotesettings.js delete mode 100644 renderer/src/styles/builtins/emotemenu.css delete mode 100644 renderer/src/styles/builtins/emotes.css delete mode 100644 renderer/src/ui/emote.js delete mode 100644 renderer/src/ui/emoteicon.jsx delete mode 100644 renderer/src/ui/emotemenucard.jsx delete mode 100644 scripts/emotes.js diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c04424ef..d4f2873f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ Preload is the preload script for Discord's main `BrowserWindow` object. This se #### Renderer Application -This is the main payload of BetterDiscord. This is what gets executed in the renderer context by the [injector](#injector). This portion is where most of the user interaction and development will be. This module is responsible for loading plugins and themes, as well as handling settings, emotes and more. The renderer and its code live in the `renderer` folder. +This is the main payload of BetterDiscord. This is what gets executed in the renderer context by the [injector](#injector). This portion is where most of the user interaction and development will be. This module is responsible for loading plugins and themes, as well as handling settings, and more. The renderer and its code live in the `renderer` folder. ## How Can I Contribute? diff --git a/package.json b/package.json index e711a7ef..d3ecb55e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "build-injector": "pnpm --filter injector build", "build-renderer": "pnpm --filter renderer build", "build-preload": "pnpm --filter preload build", - "pack-emotes": "node scripts/emotes.js", "inject": "node scripts/inject.js", "lint": "eslint --ext .js common/ && pnpm --filter injector lint && pnpm --filter preload lint && pnpm --filter renderer lint-js", "test": "mocha --require @babel/register --recursive \"./tests/renderer/*.js\"", diff --git a/renderer/src/builtins/emotes/category.jsx b/renderer/src/builtins/emotes/category.jsx deleted file mode 100644 index b127a8c2..00000000 --- a/renderer/src/builtins/emotes/category.jsx +++ /dev/null @@ -1,27 +0,0 @@ -import {React} from "modules"; -import DownArrow from "../../ui/icons/downarrow"; - -export default class Category extends React.Component { - constructor(props) { - super(props); - this.state = { - expanded: true - }; - } - render() { - return
-
-
this.setState({expanded: !this.state.expanded})}> -
- {this.props.icon ? this.props.icon : null} -
-
{this.props.label}
-
- -
-
-
- {this.state.expanded && this.props.children} -
; - } -} \ No newline at end of file diff --git a/renderer/src/builtins/emotes/emotemenu.js b/renderer/src/builtins/emotes/emotemenu.js deleted file mode 100644 index f1c37bfd..00000000 --- a/renderer/src/builtins/emotes/emotemenu.js +++ /dev/null @@ -1,95 +0,0 @@ -import Builtin from "../../structs/builtin"; -import {Utilities, WebpackModules, React} from "modules"; -import EmoteModule from "./emotes"; -import EmoteMenuCard from "../../ui/emotemenucard"; -import EmoteIcon from "../../ui/emoteicon"; -import Category from "./category"; -import Favorite from "../../ui/icons/favorite"; -import Twitch from "../../ui/icons/twitch"; - -const EmojiPicker = WebpackModules.find(m => m.type && m.type.displayName == "ExpressionPicker"); -const {useExpressionPickerStore} = WebpackModules.getByProps("useExpressionPickerStore") ?? {}; - -export default new class EmoteMenu extends Builtin { - get name() {return "EmoteMenu";} - get collection() {return "emotes";} - get category() {return "general";} - get id() {return "emoteMenu";} - get hideEmojisID() {return "hideEmojiMenu";} - get hideEmojis() {return this.get(this.hideEmojisID);} - - enabled() { - this.after(EmojiPicker, "type", (_, __, returnValue) => { - const originalChildren = returnValue?.props?.children?.props?.children; - if (!originalChildren || originalChildren.__patched) return; - - const activePicker = useExpressionPickerStore((state) => state.activeView); - - returnValue.props.children.props.children = (props) => { - const childrenReturn = Reflect.apply(originalChildren, null, [props]); - - // Attach a try {} catch {} because this might crash the user. - try { - const head = Utilities.findInTree(childrenReturn, (e) => e?.role === "tablist", {walkable: ["props", "children", "return", "stateNode"]})?.children; - const body = Utilities.findInTree(childrenReturn, (e) => e?.[0]?.type === "nav", {walkable: ["props", "children", "return", "stateNode"]}); - if (!head || !body) return childrenReturn; - - const isActive = activePicker == "bd-emotes"; - const TabItem = head[0]?.type ?? (() => null); - - if (!isActive && activePicker == "emoji" && this.hideEmojis) { - useExpressionPickerStore.setState({activeView: "bd-emotes"}); - } - - if (this.hideEmojis) { - const emojiTabIndex = head.findIndex((e) => e?.props?.id == "emoji-picker-tab"); - if (emojiTabIndex > -1) head.splice(emojiTabIndex, 1); - } - - head.push( - React.createElement(TabItem, { - "aria-controls": "bd-emotes", - "id": "bd-emotes", - "aria-selected": isActive, - "isActive": isActive, - "viewType": "bd-emotes" - }, "Twitch") - ); - if (isActive) { - body.push( - React.createElement(EmoteMenuCard, { - type: "twitch", - }, [ - React.createElement(Category, { - label: "Favorites", - icon: React.createElement(Favorite, {}), - }, Object.entries(EmoteModule.favorites).map(([emote, url]) => { - return React.createElement(EmoteIcon, {emote, url}); - })), - React.createElement(Category, { - label: "Twitch Emotes", - icon: React.createElement(Twitch, {}) - }, Object.keys(EmoteModule.getCategory("TwitchGlobal")).map((emote) => { - const url = EmoteModule.getUrl("TwitchGlobal", emote); - return React.createElement(EmoteIcon, {emote, url}); - })) - ]) - ); - } - } - catch (error) { - this.error("Error in EmojiPicker patch:\n", error); - } - - return childrenReturn; - }; - - returnValue.props.children.props.children.__patched = true; - }); - } - - disabled() { - this.unpatchAll(); - } - -}; \ No newline at end of file diff --git a/renderer/src/builtins/emotes/emotes.js b/renderer/src/builtins/emotes/emotes.js deleted file mode 100644 index 1afef9f1..00000000 --- a/renderer/src/builtins/emotes/emotes.js +++ /dev/null @@ -1,260 +0,0 @@ -import Builtin from "../../structs/builtin"; - -import {EmoteConfig, Config} from "data"; -import {WebpackModules, DataStore, DiscordModules, Events, Settings, Strings} from "modules"; -import BDEmote from "../../ui/emote"; -import Modals from "../../ui/modals"; -import Toasts from "../../ui/toasts"; -import FormattableString from "../../structs/string"; -const request = require("request"); -const path = require("path"); -const fs = require("fs"); - -const EmoteURLs = { - TwitchGlobal: new FormattableString(`https://static-cdn.jtvnw.net/emoticons/v1/{{id}}/1.0`), - TwitchSubscriber: new FormattableString(`https://static-cdn.jtvnw.net/emoticons/v1/{{id}}/1.0`), - FrankerFaceZ: new FormattableString(`https://cdn.frankerfacez.com/emoticon/{{id}}/1`), - BTTV: new FormattableString(`https://cdn.betterttv.net/emote/{{id}}/1x`), -}; - -const Emotes = { - TwitchGlobal: {}, - TwitchSubscriber: {}, - BTTV: {}, - FrankerFaceZ: {} -}; - -const escape = (s) => { - return s.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"); -}; - -const blocklist = []; -const overrides = ["twitch", "subscriber", "bttv", "ffz"]; -const modifiers = ["flip", "spin", "pulse", "spin2", "spin3", "1spin", "2spin", "3spin", "tr", "bl", "br", "shake", "shake2", "shake3", "flap"]; - - export default new class EmoteModule extends Builtin { - get name() {return "Emotes";} - get collection() {return "settings";} - get category() {return "general";} - get id() {return "emotes";} - get categories() {return Object.keys(Emotes).filter(k => this.isCategoryEnabled(k));} - get shouldDownload() {return Settings.get("emotes", this.category, "download");} - get asarPath() {return path.join(DataStore.baseFolder, "emotes.asar");} - - isCategoryEnabled(id) {return super.get("emotes", "categories", id.toLowerCase());} - - get(id) {return super.get("emotes", "general", id);} - - get MessageComponent() {return WebpackModules.find(m => m.default && m.default.toString().search("childrenRepliedMessage") > -1);} - - get Emotes() {return Emotes;} - get TwitchGlobal() {return Emotes.TwitchGlobal;} - get TwitchSubscriber() {return Emotes.TwitchSubscriber;} - get BTTV() {return Emotes.BTTV;} - get FrankerFaceZ() {return Emotes.FrankerFaceZ;} - get blocklist() {return blocklist;} - get favorites() {return this.favoriteEmotes;} - getUrl(category, name) {return EmoteURLs[category].format({id: Emotes[category][name]});} - - getCategory(category) {return Emotes[category];} - getRemoteFile(category) {return `https://cdn.staticaly.com/gh/BetterDiscord/BetterDiscord/${Config.hash}/assets/emotes/${category.toLowerCase()}.json`;} - - initialize() { - super.initialize(); - const storedFavorites = DataStore.getBDData("favoriteEmotes"); - this.favoriteEmotes = storedFavorites || {}; - this.addFavorite = this.addFavorite.bind(this); - this.removeFavorite = this.removeFavorite.bind(this); - this.onCategoryToggle = this.onCategoryToggle.bind(this); - this.resetEmotes = this.resetEmotes.bind(this); - } - - async enabled() { - Settings.registerCollection("emotes", "Emotes", EmoteConfig, {title: Strings.Emotes.clearEmotes, onClick: this.resetEmotes.bind(this)}); - // await this.getBlocklist(); - await this.loadEmoteData(); - - Events.on("emotes-favorite-added", this.addFavorite); - Events.on("emotes-favorite-removed", this.removeFavorite); - Events.on("setting-updated", this.onCategoryToggle); - this.patchMessageContent(); - } - - disabled() { - Events.off("setting-updated", this.onCategoryToggle); - Events.off("emotes-favorite-added", this.addFavorite); - Events.off("emotes-favorite-removed", this.removeFavorite); - Settings.removeCollection("emotes"); - this.emptyEmotes(); - if (!this.cancelEmoteRender) return; - this.cancelEmoteRender(); - delete this.cancelEmoteRender; - } - - onCategoryToggle(collection, cat, category, enabled) { - if (collection != "emotes" || cat != "categories") return; - if (enabled) return this.loadEmoteData(category); - return this.unloadEmoteData(category); - } - - addFavorite(name, url) { - if (!this.favoriteEmotes.hasOwnProperty(name)) this.favoriteEmotes[name] = url; - this.saveFavorites(); - } - - removeFavorite(name) { - if (!this.favoriteEmotes.hasOwnProperty(name)) return; - delete this.favoriteEmotes[name]; - this.saveFavorites(); - } - - isFavorite(name) { - return this.favoriteEmotes.hasOwnProperty(name); - } - - saveFavorites() { - DataStore.setBDData("favoriteEmotes", this.favoriteEmotes); - } - - emptyEmotes() { - for (const cat in Emotes) Object.assign(Emotes, {[cat]: {}}); - } - - patchMessageContent() { - if (this.cancelEmoteRender) return; - this.cancelEmoteRender = this.before(this.MessageComponent, "default", (thisObj, args) => { - const nodes = args[0].childrenMessageContent.props.content; - if (!nodes || !nodes.length) return; - for (let n = 0; n < nodes.length; n++) { - const node = nodes[n]; - if (typeof(node) !== "string") continue; - const words = node.split(/([^\s]+)([\s]|$)/g); - for (let c = 0, clen = this.categories.length; c < clen; c++) { - for (let w = 0, wlen = words.length; w < wlen; w++) { - const emote = words[w]; - const emoteSplit = emote.split(":"); - const emoteName = emoteSplit[0]; - let emoteModifier = emoteSplit[1] ? emoteSplit[1] : ""; - let emoteOverride = emoteModifier.slice(0); - - if (emoteName.length < 4 || blocklist.includes(emoteName)) continue; - if (!modifiers.includes(emoteModifier) || !Settings.get("emotes", "general", "modifiers")) emoteModifier = ""; - if (!overrides.includes(emoteOverride)) emoteOverride = ""; - else emoteModifier = emoteOverride; - - let current = this.categories[c]; - if (emoteOverride === "twitch") { - if (Emotes.TwitchGlobal[emoteName]) current = "TwitchGlobal"; - else if (Emotes.TwitchSubscriber[emoteName]) current = "TwitchSubscriber"; - } - else if (emoteOverride === "subscriber") { - if (Emotes.TwitchSubscriber[emoteName]) current = "TwitchSubscriber"; - } - else if (emoteOverride === "bttv") { - if (Emotes.BTTV[emoteName]) current = "BTTV"; - } - else if (emoteOverride === "ffz") { - if (Emotes.FrankerFaceZ[emoteName]) current = "FrankerFaceZ"; - } - - if (!Emotes[current][emoteName]) continue; - const results = nodes[n].match(new RegExp(`([\\s]|^)${escape(emoteModifier ? emoteName + ":" + emoteModifier : emoteName)}([\\s]|$)`)); - if (!results) continue; - const pre = nodes[n].substring(0, results.index + results[1].length); - const post = nodes[n].substring(results.index + results[0].length - results[2].length); - nodes[n] = pre; - const emoteComponent = DiscordModules.React.createElement(BDEmote, {name: emoteName, url: EmoteURLs[current].format({id: Emotes[current][emoteName]}), modifier: emoteModifier, isFavorite: this.isFavorite(emoteName)}); - nodes.splice(n + 1, 0, post); - nodes.splice(n + 1, 0, emoteComponent); - } - } - } - const onlyEmotes = nodes.every(r => { - if (typeof(r) == "string" && r.replace(/\s*/, "") == "") return true; - else if (r.type && r.type.name == "BDEmote") return true; - else if (r.props && r.props.children && r.props.children.props && r.props.children.props.emojiName) return true; - return false; - }); - if (!onlyEmotes) return; - - for (const node of nodes) { - if (typeof(node) != "object") continue; - if (node.type.name == "BDEmote") node.props.jumboable = true; - else if (node.props && node.props.children && node.props.children.props && node.props.children.props.emojiName) node.props.children.props.jumboable = true; - } - }); - } - - async loadEmoteData(categories) { - if (!categories) categories = this.categories; - if (!Array.isArray(categories)) categories = [categories]; - const all = Object.keys(Emotes); - categories = categories.map(k => all.find(c => c.toLowerCase() == k.toLowerCase())); - Toasts.show(Strings.Emotes.loading, {type: "info"}); - this.emotesLoaded = false; - const localOutdated = Config.release.tag_name > DataStore.getBDData("emoteVersion"); - - if (!fs.existsSync(this.asarPath) || (localOutdated && this.shouldDownload)) await this.downloadEmotes(); - - try { - for (const category of categories) { - this.log(category); - const EmoteData = __non_webpack_require__(path.join(this.asarPath, category.toLowerCase())); - Object.assign(Emotes[category], EmoteData); - delete __non_webpack_require__.cache[path.join(this.asarPath, category.toLowerCase())]; - await new Promise(r => setTimeout(r, 1000)); - } - - const EmoteData = __non_webpack_require__(path.join(this.asarPath, "blocklist")); - blocklist.push(...EmoteData); - delete __non_webpack_require__.cache[path.join(this.asarPath, "blocklist")]; - } - catch (err) { - this.log("Failed to load emotes."); - } - - this.emotesLoaded = true; - Events.dispatch("emotes-loaded"); - Toasts.show(Strings.Emotes.loaded, {type: "success"}); - } - - unloadEmoteData(categories) { - if (!categories) categories = this.categories; - if (!Array.isArray(categories)) categories = [categories]; - const all = Object.keys(Emotes); - categories = categories.map(k => all.find(c => c.toLowerCase() == k.toLowerCase())); - for (const category of categories) { - delete Emotes[category]; - Emotes[category] = {}; - } - } - - async downloadEmotes() { - try { - const asar = Config.release.assets.find(a => a.name === "emotes.asar"); - this.log(`Downloading emotes from: ${asar.url}`); - const buff = await new Promise((resolve, reject) => - request(asar.url, {encoding: null, headers: {"User-Agent": "BetterDiscord Emotes", "Accept": "application/octet-stream"}}, (err, resp, body) => { - if (err || resp.statusCode != 200) return reject(err || `${resp.statusCode} ${resp.statusMessage}`); - return resolve(body); - })); - - this.log("Successfully downloaded emotes.asar"); - const asarPath = this.asarPath; - const originalFs = require("original-fs"); - originalFs.writeFileSync(asarPath, buff); - this.log(`Saved emotes.asar to ${asarPath}`); - DataStore.setBDData("emoteVersion", Config.release.tag_name); - } - catch (err) { - this.stacktrace("Failed to download emotes.", err); - Modals.showConfirmationModal(Strings.Emotes.downloadFailed, Strings.Emotes.failureMessage, {cancelText: null}); - } - } - - resetEmotes() { - this.unloadEmoteData(); - DataStore.setBDData("emoteVersion", "0"); - this.loadEmoteData(); - } -}; \ No newline at end of file diff --git a/renderer/src/data/data.js b/renderer/src/data/data.js index 9ab88c6c..00775b05 100644 --- a/renderer/src/data/data.js +++ b/renderer/src/data/data.js @@ -1,4 +1,3 @@ export {default as Config} from "./config"; -export {default as EmoteConfig} from "./emotesettings"; export {default as SettingsConfig} from "./settings"; export {default as Changelog} from "./changelog"; \ No newline at end of file diff --git a/renderer/src/data/emotesettings.js b/renderer/src/data/emotesettings.js deleted file mode 100644 index 99569a07..00000000 --- a/renderer/src/data/emotesettings.js +++ /dev/null @@ -1,27 +0,0 @@ -export default [ - { - type: "category", - id: "general", - name: "General", - collapsible: true, - settings: [ - {type: "switch", id: "download", value: true}, - {type: "switch", id: "emoteMenu", value: true}, - {type: "switch", id: "hideEmojiMenu", value: false, enableWith: "emoteMenu"}, - {type: "switch", id: "modifiers", value: true}, - {type: "switch", id: "animateOnHover", value: false} - ] - }, - { - type: "category", - id: "categories", - name: "Categories", - collapsible: true, - settings: [ - {type: "switch", id: "twitchglobal", value: true}, - {type: "switch", id: "twitchsubscriber", value: false}, - {type: "switch", id: "frankerfacez", value: true}, - {type: "switch", id: "bttv", value: true} - ] - } -]; \ No newline at end of file diff --git a/renderer/src/data/settings.js b/renderer/src/data/settings.js index 0209d474..3f58fb7f 100644 --- a/renderer/src/data/settings.js +++ b/renderer/src/data/settings.js @@ -4,7 +4,6 @@ export default [ id: "general", collapsible: true, settings: [ - {type: "switch", id: "emotes", value: true, disabled: true}, {type: "switch", id: "publicServers", value: true}, {type: "switch", id: "voiceDisconnect", value: false}, {type: "switch", id: "showToasts", value: true}, diff --git a/renderer/src/modules/api/legacy.js b/renderer/src/modules/api/legacy.js index a5791d14..556b771a 100644 --- a/renderer/src/modules/api/legacy.js +++ b/renderer/src/modules/api/legacy.js @@ -9,7 +9,6 @@ import Modals from "../../ui/modals"; import Settings from "../settingsmanager"; import Logger from "common/logger"; import Patcher from "../patcher"; -import Emotes from "../../builtins/emotes/emotes"; import ipc from "../ipc"; /** @@ -40,18 +39,7 @@ const settings = Settings.collections; * @deprecated * @memberof BdApi */ -const emotes = new Proxy(Emotes.Emotes, { - get(obj, category) { - if (category === "blocklist") return Emotes.blocklist; - const group = Emotes.Emotes[category]; - if (!group) return undefined; - return new Proxy(group, { - get(cat, emote) {return group[emote];}, - set() {Logger.warn("BdApi.emotes", "Addon policy for plugins #5 https://github.com/BetterDiscord/BetterDiscord/wiki/Addon-Policies#plugins");} - }); - }, - set() {Logger.warn("BdApi.emotes", "Addon policy for plugins #5 https://github.com/BetterDiscord/BetterDiscord/wiki/Addon-Policies#plugins");} -}); +const emotes = {}; /** * A reference string for BD's version. diff --git a/renderer/src/modules/datastore.js b/renderer/src/modules/datastore.js index ba837b27..cc1c654e 100644 --- a/renderer/src/modules/datastore.js +++ b/renderer/src/modules/datastore.js @@ -60,11 +60,8 @@ export default new class DataStore { const setChannelData = (channel, key, value, ext = "json") => fs.writeFileSync(path.resolve(this.baseFolder, channel, `${key}.${ext}`), JSON.stringify(value, null, 4)); const channels = ["stable", "canary", "ptb"]; let customcss = ""; - let favoriteEmotes = {}; try {customcss = oldData.bdcustomcss ? atob(oldData.bdcustomcss) : "";} catch (e) {Logger.stacktrace("DataStore:convertOldData", "Error decoding custom css", e);} - try {favoriteEmotes = oldData.bdfavemotes ? JSON.parse(atob(oldData.bdfavemotes)) : {};} - catch (e) {Logger.stacktrace("DataStore:convertOldData", "Error decoding favorite emotes", e);} for (const channel of channels) { if (!fs.existsSync(path.resolve(this.baseFolder, channel))) fs.mkdirSync(path.resolve(this.baseFolder, channel)); const channelData = oldData.settings[channel]; @@ -77,16 +74,9 @@ export default new class DataStore { developer: {debuggerHotkey: oldSettings["bda-gs-8"], reactDevTools: oldSettings.reactDevTools} }; - const newEmotes = { - general: {download: oldSettings["fork-es-3"], emoteMenu: oldSettings["bda-es-0"], hideEmojiMenu: !oldSettings["bda-es-9"], modifiers: oldSettings["bda-es-8"], animateOnHover: oldSettings["fork-es-2"]}, - categories: {twitchglobal: oldSettings["bda-es-7"], twitchsubscriber: oldSettings["bda-es-7"], frankerfacez: oldSettings["bda-es-1"], bttv: oldSettings["bda-es-2"]} - }; - setChannelData(channel, "settings", newSettings); // settingsCookie - setChannelData(channel, "emotes", newEmotes); // emotes (from settingsCookie) setChannelData(channel, "plugins", channelData.plugins || {}); // pluginCookie setChannelData(channel, "themes", channelData.themes || {}); // themeCookie - setChannelData(channel, "misc", {favoriteEmotes}); // favorite emotes fs.writeFileSync(path.resolve(this.baseFolder, channel, "custom.css"), customcss); // customcss } diff --git a/renderer/src/styles/builtins/emotemenu.css b/renderer/src/styles/builtins/emotemenu.css deleted file mode 100644 index ce446321..00000000 --- a/renderer/src/styles/builtins/emotemenu.css +++ /dev/null @@ -1,82 +0,0 @@ -.bd-emote-menu { - min-height: 0; -} - -.bd-emote-menu-inner { - padding: 8px 0 0 16px; -} - -.bd-emote-scroller { - height: 100%; -} - -.bd-emote-header { - display: flex; - align-items: center; - background: var(--background-secondary); - height: 32px; - padding: 0 4px; - position: sticky; - top: 0; - z-index: 2; -} - -.bd-emote-header-inner { - cursor: pointer; - display: flex; - align-items: center; - color: var(--header-secondary); - font-size: 12px; - font-weight: 600; - transition: color 0.125s; - width: fit-content; -} - -.bd-emote-header-inner:hover { - color: var(--header-primary); -} - -.bd-emote-header-icon { - width: 16px; - height: 16px; -} - -.bd-emote-header-icon svg { - max-height: 100%; - max-width: 100%; -} - -.bd-emote-header-label { - overflow: hidden; - text-overflow: ellipsis; - text-transform: uppercase; - white-space: nowrap; - margin: 0 8px; -} - -.bd-emote-collapse-icon svg { - transition: transform 0.1s; -} - -.bd-emote-collapse-icon.collapsed svg { - transform: rotate(-90deg); -} - -.bd-emote-item { - display: inline-flex; - justify-content: center; - align-items: center; - padding: 2px; - border-radius: 5px; - width: 30px; - height: 30px; - position: relative; -} - -.bd-emote-item:hover { - background: var(--background-accent); -} - -.bd-emote-item img { - max-width: 100%; -} \ No newline at end of file diff --git a/renderer/src/styles/builtins/emotes.css b/renderer/src/styles/builtins/emotes.css deleted file mode 100644 index e1178b48..00000000 --- a/renderer/src/styles/builtins/emotes.css +++ /dev/null @@ -1,208 +0,0 @@ -.emotewrapper { - position: relative; - display: inline-flex; - object-fit: contain; - margin: -0.1em 0.05em -0.2em 0.1em; - vertical-align: top; -} - -.emotewrapper.jumboable { - margin-bottom: 0; - margin-top: 0.2em; - vertical-align: -0.3em; -} - -.emote { - object-fit: contain; - width: 1.375em; - height: 1.375em; - vertical-align: bottom; -} - -.emote.jumboable { - width: 3rem; - height: 3rem; - min-height: 3rem; -} - -.fav { - display: none; - position: absolute; - width: 15px; - height: 15px; - right: -7px; - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAzFBMVEUAAABQUFBMTExLS0tNTU1MTExNTU1NTU1MTExMTExNTU1LS0tEREBEREBEREBEREBJSUhLS0tLS0tEREBNTU1NTU1NTU1EREArKyhNTU1NTU0AAABMTExKSklMTExNTU1NTU1NTU1KSkpMTExKSkhNTU1KSkpISEZNTU1LS0tAQDxOTk5KSkpLS0tNTU1MTExMTEx/f39MTExMTExLS0pLS0tMTExNTU1NTU1LS0pNTU1NTU1NTU1NTU1NTU1NTUxNTU1NTU1NTUxMTEzB8C/5AAAAOnRSTlMAI8X96oWAgYSF68QBAg0PMCb9BIuLgQUD4N0Bh0mKhZSOQ4gcrKscaW8QRE6fmJyjAshASceG7cIpqQOxTQAAALVJREFUGFddx6FOA0EYAOGZvd07Qm6vVCAAgUUgQEDfX/YZMAigqaFN7iC5tsmPqGPUN/AvUVeoEbGOCElJz08Uzeixqu4AqomVVSNngOVjTqDGZSl3UFtPGV2ot2zaq96YM9p5Ddzcf/nTTAlj+/sNtNu8OcwkIsbPBtrUfMQeEhGQmHbmGIFMwLPzu6UMIwBNgToshgq8Nr2ki+Oy7ebDHp70LRPWB6OZgfWLWei7fJonOOsPCGA9kVlssOoAAAAASUVORK5CYII="); - border: none; - background-size: 100% 100%; - background-repeat: no-repeat; - background-color: #303030; - border-radius: 5px; - top: -7px; - cursor: pointer; -} - -.fav.active { - background-color: yellow; -} - -.emotewrapper:hover .fav { - display: block; -} - -.emote.stop-animation { - animation: none; -} - -.emoteflip, -.emotespinflip { - transform: scaleX(-1); -} - -.emotespin { - animation: 1s emote-spin infinite linear; -} - -.emote1spin { - animation: 1s emote-spin-reverse infinite linear; -} - -.emotespin2 { - animation: 0.5s emote-spin infinite linear; -} - -.emote2spin { - animation: 0.5s emote-spin-reverse infinite linear; -} - -.emotespin3 { - animation: 0.2s emote-spin infinite linear; -} - -.emote3spin { - animation: 0.2s emote-spin-reverse infinite linear; -} - -.emotepulse { - animation: 1s emote-pulse infinite linear; -} - -.emotetr { - transform: translateX(-3px); -} - -.emotebl { - transform: translateY(-3px); -} - -.emotebr { - transform: translate(-3px, -3px); -} - -.emoteshake { - animation: 1s emote-shake infinite linear; -} - -.emoteflap { - transform: scaleY(-1); -} - -.emoteshake2 { - animation: emote-shake2 0.3s linear infinite; -} - -.emoteshake3 { - animation: emote-shake3 0.1s linear infinite; -} - -@keyframes emote-shake2 { - 25% { - transform: translate(-1px, -1px); - } - - 50% { - transform: translate(-1px, 1px); - } - - 75% { - transform: translate(1px, 1px); - } - - 75% { - transform: translate(1px, -1px); - } -} - -@keyframes emote-shake3 { - 25% { - transform: translate(-1px, -1px); - } - - 50% { - transform: translate(-1px, 1px); - } - - 75% { - transform: translate(1px, 1px); - } - - 75% { - transform: translate(1px, -1px); - } -} - -@keyframes emote-spin { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(360deg); - } -} - -@keyframes emote-spin-reverse { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(-360deg); - } -} - -@keyframes emote-pulse { - 0% { - -webkit-transform: scale(1, 1); - } - - 50% { - -webkit-transform: scale(1.2, 1.2); - } - - 100% { - -webkit-transform: scale(1, 1); - } -} - -@keyframes emote-shake { - 10%, - 90% { - transform: translate3d(-1px, 0, 0); - } - - 20%, - 80% { - transform: translate3d(2px, 0, 0); - } - - 30%, - 50%, - 70% { - transform: translate3d(-4px, 0, 0); - } - - 40%, - 60% { - transform: translate3d(4px, 0, 0); - } -} diff --git a/renderer/src/ui/emote.js b/renderer/src/ui/emote.js deleted file mode 100644 index 414ad4b0..00000000 --- a/renderer/src/ui/emote.js +++ /dev/null @@ -1,82 +0,0 @@ -import {Settings, React, WebpackModules, Events, Strings} from "modules"; - -const TooltipWrapper = WebpackModules.getByPrototypes("renderTooltip"); - -export default class BDEmote extends React.Component { - constructor(props) { - super(props); - - this.state = { - shouldAnimate: !this.animateOnHover, - isFavorite: this.props.isFavorite - }; - - this.onMouseEnter = this.onMouseEnter.bind(this); - this.onMouseLeave = this.onMouseLeave.bind(this); - this.onClick = this.onClick.bind(this); - this.toggleFavorite = this.toggleFavorite.bind(this); - } - - get animateOnHover() { - return Settings.get("emotes", "general", "animateOnHover"); - } - - get label() { - return this.props.modifier ? `${this.props.name}:${this.props.modifier}` : this.props.name; - } - - get modifierClass() { - return this.props.modifier ? ` emote${this.props.modifier}` : ""; - } - - onMouseEnter() { - if (!this.state.shouldAnimate && this.animateOnHover) this.setState({shouldAnimate: true}); - } - - onMouseLeave() { - if (this.state.shouldAnimate && this.animateOnHover) this.setState({shouldAnimate: false}); - } - - onClick(e) { - if (this.props.onClick) this.props.onClick(e); - } - - toggleFavorite(e) { - e.preventDefault(); - e.stopPropagation(); - if (this.state.isFavorite) Events.emit("emotes-favorite-removed", this.label); - else Events.emit("emotes-favorite-added", this.label, this.props.url); - this.setState({isFavorite: !this.state.isFavorite}); - } - - render() { - return React.createElement(TooltipWrapper, { - color: "primary", - position: "top", - text: this.label, - delay: 750 - }, - (childProps) => { - return React.createElement("div", Object.assign({ - className: "emotewrapper" + (this.props.jumboable ? " jumboable" : ""), - onMouseEnter: this.onMouseEnter, - onMouseLeave: this.onMouseLeave, - onClick: this.onClick - }, childProps), - React.createElement("img", { - draggable: false, - className: "emote" + this.modifierClass + (this.props.jumboable ? " jumboable" : "") + (!this.state.shouldAnimate ? " stop-animation" : ""), - dataModifier: this.props.modifier, - alt: this.label, - src: this.props.url - }), - React.createElement("input", { - className: "fav" + (this.state.isFavorite ? " active" : ""), - title: Strings.Emotes.favoriteAction, - type: "button", - onClick: this.toggleFavorite - }) - ); - }); - } -} \ No newline at end of file diff --git a/renderer/src/ui/emoteicon.jsx b/renderer/src/ui/emoteicon.jsx deleted file mode 100644 index 75c511fc..00000000 --- a/renderer/src/ui/emoteicon.jsx +++ /dev/null @@ -1,36 +0,0 @@ -import {React, WebpackModules} from "modules"; -import EmoteModule from "../builtins/emotes/emotes"; - -const ContextMenuActions = WebpackModules.getByProps("openContextMenu"); -const {MenuItem, MenuGroup} = WebpackModules.find(m => m.MenuRadioItem && !m.default) ?? {MenuItem: () => null, MenuGroup: () => null}; -const ContextMenu = WebpackModules.getByProps("default", "MenuStyle")?.default; -const {ComponentDispatch} = WebpackModules.getByProps("ComponentDispatch") ?? {ComponentDispatch: () => null}; - -export default class EmoteIcon extends React.Component { - render() { - return
- {this.props.emote} -
; - } - - handleOnClick() { - this.insertText(this.props.emote); - } - - handleOnContextMenu(e) { - ContextMenuActions.openContextMenu(e, () => - - - - ); - } - - handlefavorite() { - ContextMenuActions.closeContextMenu(); - EmoteModule.isFavorite(this.props.emote) ? EmoteModule.removeFavorite(this.props.emote) : EmoteModule.addFavorite(this.props.emote, this.props.url); - } - - insertText(emote) { - ComponentDispatch.dispatchToLastSubscribed("INSERT_TEXT", {content: emote}); - } -} \ No newline at end of file diff --git a/renderer/src/ui/emotemenucard.jsx b/renderer/src/ui/emotemenucard.jsx deleted file mode 100644 index 777830c5..00000000 --- a/renderer/src/ui/emotemenucard.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import {React, WebpackModules} from "modules"; -const {ScrollerAuto: Scroller} = WebpackModules.getByProps("ScrollerAuto") ?? {ScrollerAuto: () => null}; -export default class EmoteMenuCard extends React.Component { - render() { - return
- -
- {this.props.children} -
- -
; - } -} \ No newline at end of file diff --git a/scripts/emotes.js b/scripts/emotes.js deleted file mode 100644 index bfb81d70..00000000 --- a/scripts/emotes.js +++ /dev/null @@ -1,18 +0,0 @@ -const path = require("path"); -const asar = require("asar"); - -const emotes = path.resolve(__dirname, "..", "assets", "emotes"); -const dist = path.resolve(__dirname, "..", "dist"); -const bundleFile = path.join(dist, "emotes.asar"); - -const makeBundle = function() { - console.log(""); - console.log("Generating bundle"); - asar.createPackage(emotes, bundleFile).then(() => { - console.log(` ✅ Successfully created bundle ${bundleFile}`); - }).catch(err => { - console.log(` ❌ Could not build bundle: ${err.message}`); - }); -}; - -makeBundle(); \ No newline at end of file