This commit is contained in:
Mirco Wittrien 2022-10-24 10:30:39 +02:00
parent 2a20d9b32e
commit fecf45e9f2
2 changed files with 21 additions and 17 deletions

View File

@ -62,7 +62,8 @@
"ReadStateTypes": ["GUILD_EVENT", "NOTIFICATION_CENTER", "CHANNEL"], "ReadStateTypes": ["GUILD_EVENT", "NOTIFICATION_CENTER", "CHANNEL"],
"RelationshipTypes": ["FRIEND", "PENDING_INCOMING", "PENDING_OUTGOING"], "RelationshipTypes": ["FRIEND", "PENDING_INCOMING", "PENDING_OUTGOING"],
"Routes": ["CHANNEL_THREAD_VIEW", "MESSAGE_REQUESTS"], "Routes": ["CHANNEL_THREAD_VIEW", "MESSAGE_REQUESTS"],
"UserFlags": ["HYPESQUAD", "BUG_HUNTER_LEVEL_1", "STAFF"], "UserBadges": ["HYPESQUAD", "BUG_HUNTER_LEVEL_1", "STAFF"],
"UserFlags": ["MFA_SMS", "VERIFIED_BOT"],
"UserNotificationSettings": ["NULL", "NO_MESSAGES", "ALL_MESSAGES"], "UserNotificationSettings": ["NULL", "NO_MESSAGES", "ALL_MESSAGES"],
"UserSettingsActionTypes": ["SLOW_USER_ACTION", "DAILY"], "UserSettingsActionTypes": ["SLOW_USER_ACTION", "DAILY"],
"UserSettingsSections": ["ACCOUNT", "DEVELOPER_OPTIONS", "DISMISSIBLE_CONTENT_OPTIONS"] "UserSettingsSections": ["ACCOUNT", "DEVELOPER_OPTIONS", "DISMISSIBLE_CONTENT_OPTIONS"]
@ -415,6 +416,7 @@
"TransitionGroup": {"protos": ["performAppear", "performEnter", "performLeave"]}, "TransitionGroup": {"protos": ["performAppear", "performEnter", "performLeave"]},
"UnreadDMs": {"strings": ["getMutablePrivateChannels", "selectedVoiceGuildId", ".selectedVoiceChannelId"]}, "UnreadDMs": {"strings": ["getMutablePrivateChannels", "selectedVoiceGuildId", ".selectedVoiceChannelId"]},
"UseCopyIdItem": {"strings": ["\"devmode-copy-id\""]}, "UseCopyIdItem": {"strings": ["\"devmode-copy-id\""]},
"UserBadges": {"strings": [".PROFILE_USER_BADGES", "SIZE_24"]},
"UserBanner": {"strings": [".bannerSrc", ".viewerPremiumOverride", ".SETTINGS"]}, "UserBanner": {"strings": [".bannerSrc", ".viewerPremiumOverride", ".SETTINGS"]},
"UserBioSection": {"strings": [".isUsingGuildBio", "aboutMeGuildIcon", "GUILD_IDENTITY_BIO_TOAST"]}, "UserBioSection": {"strings": [".isUsingGuildBio", "aboutMeGuildIcon", "GUILD_IDENTITY_BIO_TOAST"]},
"UserRolesSection": {"strings": [".rolePillBorder", "numRoles", "roleClassName"]}, "UserRolesSection": {"strings": [".rolePillBorder", "numRoles", "roleClassName"]},

View File

@ -2,7 +2,7 @@
* @name ShowBadgesInChat * @name ShowBadgesInChat
* @author DevilBro * @author DevilBro
* @authorId 278543574059057154 * @authorId 278543574059057154
* @version 1.9.2 * @version 1.9.3
* @description Displays Badges (Nitro, Hypesquad, etc...) in the Chat/MemberList/DMList * @description Displays Badges (Nitro, Hypesquad, etc...) in the Chat/MemberList/DMList
* @invite Jx3TjNS * @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien * @donate https://www.paypal.me/MircoWittrien
@ -73,20 +73,22 @@ module.exports = (_ => {
_this = this; _this = this;
specialFlag = BDFDB.NumberUtils.generateId() + "SPECIALFLAG"; specialFlag = BDFDB.NumberUtils.generateId() + "SPECIALFLAG";
this.patchedModules = { this.modulePatches = {
after: { before: [
MessageUsername: "default", "MessageHeader"
MemberListItem: "render", ],
PrivateChannel: "render", after: [
UserProfileBadgeList: "default" "MemberListItem",
} "PrivateChannel",
"UserBadges"
]
}; };
for (let key of Object.keys(BDFDB.DiscordConstants.UserFlags).filter(n => isNaN(parseInt(n)))) { for (let key of Object.keys(BDFDB.DiscordConstants.UserBadges).filter(n => isNaN(parseInt(n)))) {
let basicKey = key.replace(/_LEVEL_\d+/g, ""); let basicKey = key.replace(/_LEVEL_\d+/g, "");
if (!badges[basicKey]) badges[basicKey] = {value: true, keys: []}; if (!badges[basicKey]) badges[basicKey] = {value: true, keys: []};
badges[basicKey].keys.push(BDFDB.DiscordConstants.UserFlags[key]); badges[basicKey].keys.push(BDFDB.DiscordConstants.UserBadges[key]);
} }
this.css = ` this.css = `
@ -234,7 +236,7 @@ module.exports = (_ => {
})); }));
settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsList, { settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsList, {
settings: places, settings: places,
data: Object.keys(badges).concat(Object.keys(indicators)).map(key => badgeConfigs[key]), data: Object.keys(badges).filter(n => n.indexOf("BOT_") != 0).concat(Object.keys(indicators)).map(key => badgeConfigs[key]),
noRemove: true, noRemove: true,
renderLabel: (cardData, instance) => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex, { renderLabel: (cardData, instance) => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex, {
children: [ children: [
@ -305,9 +307,9 @@ module.exports = (_ => {
BDFDB.MessageUtils.rerenderAll(); BDFDB.MessageUtils.rerenderAll();
} }
processMessageUsername (e) { processMessageHeader (e) {
if (!e.instance.props.message) return; if (!e.instance.props.message) return;
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "Popout"}); let [children, index] = BDFDB.ReactUtils.findParent(e.instance.props.username, {filter: n => n && n.props && typeof n.props.renderPopout == "function"});
if (index == -1) return; if (index == -1) return;
const author = e.instance.props.userOverride || e.instance.props.message.author; const author = e.instance.props.userOverride || e.instance.props.message.author;
this.injectBadges(children, author, (BDFDB.LibraryStores.ChannelStore.getChannel(e.instance.props.message.channel_id) || {}).guild_id, "chat"); this.injectBadges(children, author, (BDFDB.LibraryStores.ChannelStore.getChannel(e.instance.props.message.channel_id) || {}).guild_id, "chat");
@ -339,7 +341,7 @@ module.exports = (_ => {
this.injectBadges(wrapper.props.decorators, instance.props.user, null, "dmsList"); this.injectBadges(wrapper.props.decorators, instance.props.user, null, "dmsList");
} }
processUserProfileBadgeList (e) { processUserBadges (e) {
if (e.instance.props.custom) { if (e.instance.props.custom) {
let filter = e.instance.props.place != "settings"; let filter = e.instance.props.place != "settings";
for (let i in e.returnvalue.props.children) if (e.returnvalue.props.children[i]) { for (let i in e.returnvalue.props.children) if (e.returnvalue.props.children[i]) {
@ -437,7 +439,7 @@ module.exports = (_ => {
} }
else for (let key of badges[flag].keys) { else for (let key of badges[flag].keys) {
let userFlag = flag == "PREMIUM" || flag == "GUILD_BOOSTER" ? 0 : BDFDB.DiscordConstants.UserFlags[flag]; let userFlag = flag == "PREMIUM" || flag == "GUILD_BOOSTER" ? 0 : BDFDB.DiscordConstants.UserFlags[flag];
let keyName = BDFDB.DiscordConstants.UserFlags[key]; let keyName = BDFDB.DiscordConstants.UserBadges[key];
if (userFlag == null && keyName) userFlag = BDFDB.DiscordConstants.UserFlags[keyName] != null ? BDFDB.DiscordConstants.UserFlags[keyName] : BDFDB.DiscordConstants.UserFlags[Object.keys(BDFDB.DiscordConstants.UserFlags).find(f => f.indexOf(keyName) > -1 || keyName.indexOf(f) > -1)]; if (userFlag == null && keyName) userFlag = BDFDB.DiscordConstants.UserFlags[keyName] != null ? BDFDB.DiscordConstants.UserFlags[keyName] : BDFDB.DiscordConstants.UserFlags[Object.keys(BDFDB.DiscordConstants.UserFlags).find(f => f.indexOf(keyName) > -1 || keyName.indexOf(f) > -1)];
if (userFlag != null) { if (userFlag != null) {
let id; let id;