lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

stuff

This commit is contained in:
Mirco Wittrien 2023-06-30 10:55:35 +02:00
parent 410a24b235
commit 6c4ce3cfe6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/CustomQuoter/CustomQuoter.plugin.js
View File

@ -412,7 +412,7 @@ module.exports = (_ => {
.replace("$mention", channel.isDM() ? "" : `<@!${message.author.id}>`)
.replace("$link", `<https://discordapp.com/channels/${guild.id}/${channel.id}/${message.id}>`)
.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 || "")

2
Plugins/EditUsers/EditUsers.plugin.js
View File

@ -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

4
Plugins/FriendNotifications/FriendNotifications.plugin.js
View File

@ -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, `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}`)
.replace(/'{0,1}\$nick'{0,1}/g, nickname ? `<strong>${BDFDB.StringUtils.htmlEscape(nickname)}</strong>${!hasUserPlaceholder && this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : !hasUserPlaceholder ? `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : "")
.replace(/'{0,1}\$user'{0,1}/g, `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${this.settings.general.showDiscriminator && !user.isPomelo() ? ("#" + user.discriminator) : ""}`)
.replace(/'{0,1}\$nick'{0,1}/g, nickname ? `<strong>${BDFDB.StringUtils.htmlEscape(nickname)}</strong>${!hasUserPlaceholder && this.settings.general.showDiscriminator && !user.isPomelo() ? ("#" + user.discriminator) : ""}` : !hasUserPlaceholder ? `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${this.settings.general.showDiscriminator && user.discriminator && user.discriminator != "0" ? ("#" + user.discriminator) : ""}` : "")
.replace(/'{0,1}\$statusOld'{0,1}/g, `<strong>${oldStatusName}</strong>`)
.replace(/'{0,1}\$status'{0,1}/g, `<strong>${statusName}</strong>`);
if (status.activity) {

2
Plugins/ServerDetails/ServerDetails.plugin.js
View File

@ -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,