Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 09:08:01 +01:00
Code Issues Projects Releases Wiki Activity

Remove unneeded sanitization in webhook names (#5311)

Browse Source 
Regression from 384f63bf92
This commit is contained in:
Josh Roy 2023-04-13 02:15:48 -04:00 committed by GitHub
parent 384f63bf92
commit 3a737480ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
View File

@ -280,11 +280,11 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
final String avatarUrl = DiscordUtil.getAvatarUrl(this, player); final String avatarUrl = DiscordUtil.getAvatarUrl(this, player);
final String formattedName = MessageUtil.formatMessage(getSettings().getMcToDiscordNameFormat(player), final String formattedName = MessageUtil.formatMessage(getSettings().getMcToDiscordNameFormat(player),
MessageUtil.sanitizeDiscordMarkdown(player.getName()), player.getName(),
MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()), player.getDisplayName(),
MessageUtil.sanitizeDiscordMarkdown(getPlugin().getEss().getSettings().getWorldAlias(player.getWorld().getName())), getPlugin().getEss().getSettings().getWorldAlias(player.getWorld().getName()),
MessageUtil.sanitizeDiscordMarkdown(FormatUtil.stripEssentialsFormat(getPlugin().getEss().getPermissionsHandler().getPrefix(player))), FormatUtil.stripEssentialsFormat(getPlugin().getEss().getPermissionsHandler().getPrefix(player)),
MessageUtil.sanitizeDiscordMarkdown(FormatUtil.stripEssentialsFormat(getPlugin().getEss().getPermissionsHandler().getSuffix(player))), FormatUtil.stripEssentialsFormat(getPlugin().getEss().getPermissionsHandler().getSuffix(player)),
guild.getMember(jda.getSelfUser()).getEffectiveName()); guild.getMember(jda.getSelfUser()).getEffectiveName());
DiscordUtil.dispatchDiscordMessage(this, MessageType.DefaultTypes.CHAT, formattedMessage, user.isAuthorized("essentials.discord.ping"), avatarUrl, formattedName, player.getUniqueId()); DiscordUtil.dispatchDiscordMessage(this, MessageType.DefaultTypes.CHAT, formattedMessage, user.isAuthorized("essentials.discord.ping"), avatarUrl, formattedName, player.getUniqueId());

10
EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
View File

@ -273,11 +273,11 @@ public class BukkitListener implements Listener {
} }
name = MessageUtil.formatMessage(jda.getSettings().getMcToDiscordNameFormat(player), name = MessageUtil.formatMessage(jda.getSettings().getMcToDiscordNameFormat(player),
MessageUtil.sanitizeDiscordMarkdown(player.getName()), player.getName(),
MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()), player.getDisplayName(),
MessageUtil.sanitizeDiscordMarkdown(jda.getPlugin().getEss().getSettings().getWorldAlias(player.getWorld().getName())), jda.getPlugin().getEss().getSettings().getWorldAlias(player.getWorld().getName()),
MessageUtil.sanitizeDiscordMarkdown(FormatUtil.stripEssentialsFormat(jda.getPlugin().getEss().getPermissionsHandler().getPrefix(player))), FormatUtil.stripEssentialsFormat(jda.getPlugin().getEss().getPermissionsHandler().getPrefix(player)),
MessageUtil.sanitizeDiscordMarkdown(FormatUtil.stripEssentialsFormat(jda.getPlugin().getEss().getPermissionsHandler().getSuffix(player))), FormatUtil.stripEssentialsFormat(jda.getPlugin().getEss().getPermissionsHandler().getSuffix(player)),
jda.getGuild().getMember(jda.getJda().getSelfUser()).getEffectiveName()); jda.getGuild().getMember(jda.getJda().getSelfUser()).getEffectiveName());
uuid = player.getUniqueId(); uuid = player.getUniqueId();