From 6c4ce3cfe69b9bdb9e0fe262c257432d8d2af21d Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Fri, 30 Jun 2023 10:55:35 +0200 Subject: [PATCH] stuff --- Plugins/CustomQuoter/CustomQuoter.plugin.js | 2 +- Plugins/EditUsers/EditUsers.plugin.js | 2 +- Plugins/FriendNotifications/FriendNotifications.plugin.js | 4 ++-- Plugins/ServerDetails/ServerDetails.plugin.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/CustomQuoter/CustomQuoter.plugin.js b/Plugins/CustomQuoter/CustomQuoter.plugin.js index 6b62b06632..0d3cefd6f1 100644 --- a/Plugins/CustomQuoter/CustomQuoter.plugin.js +++ b/Plugins/CustomQuoter/CustomQuoter.plugin.js @@ -412,7 +412,7 @@ module.exports = (_ => { .replace("$mention", channel.isDM() ? "" : `<@!${message.author.id}>`) .replace("$link", ``) .replace("$authorName", member && member.nick || message.author.globalName || message.author.username || "") - .replace("$authorAccount", message.author.discriminator && message.author.discriminator != "0" ? `${message.author.username}#${message.author.discriminator}` : message.author.username) + .replace("$authorAccount", message.author.isPomelo() ? message.author.username : `${message.author.username}#${message.author.discriminator}`) .replace("$authorId", message.author.id || "") .replace("$channelName", channel.name || "") .replace("$channelId", channel.id || "") diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js index 00f980de1e..8a4d4d7839 100644 --- a/Plugins/EditUsers/EditUsers.plugin.js +++ b/Plugins/EditUsers/EditUsers.plugin.js @@ -1139,7 +1139,7 @@ module.exports = (_ => { for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.instance.props.query.toLocaleLowerCase()) > -1 && !e.instance.props.results.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) { let user = BDFDB.LibraryStores.UserStore.getUser(id); if (user) e.instance.props.results.splice(1, 0, { - comparator: user.discriminator && user.discriminator != "0" ? `${user.username}#${user.discriminator}` : user.discriminator, + comparator: user.isPomelo() ? user.username : `${user.username}#${user.discriminator}`, record: user, score: 30000, type: BDFDB.DiscordConstants.AutocompleterResultTypes.USER diff --git a/Plugins/FriendNotifications/FriendNotifications.plugin.js b/Plugins/FriendNotifications/FriendNotifications.plugin.js index 6c1480ae61..1c56997046 100644 --- a/Plugins/FriendNotifications/FriendNotifications.plugin.js +++ b/Plugins/FriendNotifications/FriendNotifications.plugin.js @@ -838,8 +838,8 @@ module.exports = (_ => { let string = this.settings.notificationStrings[screensharingNotice ? "screensharing" : customChanged ? "custom" : loginNotice ? "login" : status.name] || "'$user' changed status to '$status'"; let hasUserPlaceholder = string.indexOf("$user") > -1; let toastString = BDFDB.StringUtils.htmlEscape(string) - .replace(/'{0,1}\$user'{0,1}/g, `${BDFDB.StringUtils.htmlEscape(name)}${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}`) - .replace(/'{0,1}\$nick'{0,1}/g, nickname ? `${BDFDB.StringUtils.htmlEscape(nickname)}${!hasUserPlaceholder && this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : !hasUserPlaceholder ? `${BDFDB.StringUtils.htmlEscape(name)}${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : "") + .replace(/'{0,1}\$user'{0,1}/g, `${BDFDB.StringUtils.htmlEscape(name)}${this.settings.general.showDiscriminator && !user.isPomelo() ? ("#" + user.discriminator) : ""}`) + .replace(/'{0,1}\$nick'{0,1}/g, nickname ? `${BDFDB.StringUtils.htmlEscape(nickname)}${!hasUserPlaceholder && this.settings.general.showDiscriminator && !user.isPomelo() ? ("#" + user.discriminator) : ""}` : !hasUserPlaceholder ? `${BDFDB.StringUtils.htmlEscape(name)}${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : "") .replace(/'{0,1}\$statusOld'{0,1}/g, `${oldStatusName}`) .replace(/'{0,1}\$status'{0,1}/g, `${statusName}`); if (status.activity) { diff --git a/Plugins/ServerDetails/ServerDetails.plugin.js b/Plugins/ServerDetails/ServerDetails.plugin.js index e6582a4a7c..147be31816 100644 --- a/Plugins/ServerDetails/ServerDetails.plugin.js +++ b/Plugins/ServerDetails/ServerDetails.plugin.js @@ -128,7 +128,7 @@ module.exports = (_ => { })), _this.settings.items.owner && BDFDB.ReactUtils.createElement(GuildDetailsRowComponent, { prefix: BDFDB.LanguageUtils.LanguageStrings.GUILD_OWNER, - string: !owner ? BDFDB.LanguageUtils.LanguageStrings.UNKNOWN_USER : (owner.discriminator && owner.discriminator != "0" ? `${owner.username}#${owner.discriminator}` : owner.username) + string: !owner ? BDFDB.LanguageUtils.LanguageStrings.UNKNOWN_USER : (owner.isPomelo() ? owner.username : `${owner.username}#${owner.discriminator}`) }), _this.settings.items.creationDate && BDFDB.ReactUtils.createElement(GuildDetailsRowComponent, { prefix: _this.labels.creation_date,