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

Improve emotes menu. (#879)

This commit is contained in:
Strencher 2021-07-08 23:52:38 +02:00 committed by GitHub
parent f3ff288e37
commit 65dc310e03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
renderer/src/builtins/emotes/emotemenu.js
View File

@ -6,7 +6,9 @@ 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";}
@ -16,60 +18,69 @@ export default new class EmoteMenu extends Builtin {
get hideEmojisID() {return "hideEmojiMenu";}
get hideEmojis() {return this.get(this.hideEmojisID);}
getSelected(body) {
if (body[1]) return {id: "stickers", index: 1};
else if (body[2]) return {id: "gif", index: 2};
else if (body[3]) return {id: "emoji", index: 3};
return {id: "bd-emotes", index: 3};
}
enabled() {
this.after(EmojiPicker, "type", (_, __, returnValue) => {
const originalChildren = Utilities.getNestedProp(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]);
const head = Utilities.getNestedProp(childrenReturn, "props.children.props.children.1.props.children.0.props.children.props.children");
const body = Utilities.getNestedProp(childrenReturn, "props.children.props.children.1.props.children");
if (!head || !body) return childrenReturn;
let activePicker = this.getSelected(body);
let isActive = activePicker.id == "bd-emotes";
const tabProps = head[0].props;
if (!isActive && activePicker.id == "emoji" && this.hideEmojis) {
activePicker = {id: "bd-emotes", index: 3};
isActive = true;
// Attach a try {} catch {} because this might crash the user.
try {
const head = Utilities.findInReactTree(childrenReturn, (e) => e?.role === "tablist")?.children;
const body = Utilities.findInReactTree(childrenReturn, (e) => e?.[0]?.type === "nav");
if (!head || !body) return childrenReturn;
const isActive = activePicker == "bd-emotes";
const tabProps = head[0].props;
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("div", {
"id": "bd-emotes-tab",
"role": "tab",
"aria-selected": isActive,
"className": tabProps.className,
}, React.createElement(tabProps.children.type, {
viewType: "bd-emotes",
isActive: isActive,
}, "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});
}))
])
);
}
}
if (this.hideEmojis) head.splice(head.findIndex(e => e && e.props && e.props.id == "emoji-picker-tab"), 1);
head.push(
React.createElement("div", {
"id": "bd-emotes-tab",
"role": "tab",
"aria-selected": isActive,
"className": tabProps.className,
}, React.createElement(tabProps.children.type, {
viewType: "bd-emotes",
isActive: isActive,
}, "Twitch")
));
if (isActive) {
body[activePicker.index] = 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;