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

Add role placeholder to Discord message format (#4329)

Browse Source 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
pop4959 2021-07-07 08:55:25 -07:00 committed by GitHub
parent ff58d8e443
commit 2858bd3784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java
View File

@ -347,7 +347,7 @@ public class DiscordSettings implements IConf {
"timestamp", "level", "message");
discordToMcFormat = generateMessageFormat(getFormatString("discord-to-mc"), "&6[#{channel}] &3{fullname}&7: &f{message}", true,
"channel", "username", "discriminator", "fullname", "nickname", "color", "message");
"channel", "username", "discriminator", "fullname", "nickname", "color", "message", "role");
unmuteFormat = generateMessageFormat(getFormatString("unmute"), "{displayname} unmuted.", false, "username", "displayname");
tempMuteFormat = generateMessageFormat(getFormatString("temporary-mute"), "{controllerdisplayname} has muted player {displayname} for {time}.", false,
"username", "displayname", "controllername", "controllerdisplayname", "time");

2
EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordListener.java
View File

@ -86,7 +86,7 @@ public class DiscordListener extends ListenerAdapter {
final String formattedMessage = EmojiParser.parseToAliases(MessageUtil.formatMessage(plugin.getPlugin().getSettings().getDiscordToMcFormat(),
event.getChannel().getName(), user.getName(), user.getDiscriminator(), user.getAsTag(),
member.getEffectiveName(), DiscordUtil.getRoleColorFormat(member), finalMessage), EmojiParser.FitzpatrickAction.REMOVE);
member.getEffectiveName(), DiscordUtil.getRoleColorFormat(member), finalMessage, DiscordUtil.getRoleFormat(member)), EmojiParser.FitzpatrickAction.REMOVE);
for (IUser essUser : plugin.getPlugin().getEss().getOnlineUsers()) {
for (String group : keys) {

16
EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java
View File

@ -121,6 +121,22 @@ public final class DiscordUtil {
return future;
}
/**
* Gets the highest role of a given member or an empty string if the member has no roles.
*
* @param member The target member.
* @return The highest role or blank string.
*/
public static String getRoleFormat(Member member) {
final List<Role> roles = member.getRoles();
if (roles.isEmpty()) {
return "";
}
return roles.get(0).getName();
}
/**
* Gets the uppermost bukkit color code of a given member or an empty string if the server version is &lt; 1.16.
*

1
EssentialsDiscord/src/main/resources/config.yml
View File

@ -212,6 +212,7 @@ messages:
# - {discriminator}: The four numbers displayed after the user's name
# - {fullname}: Equivalent to typing "{username}#{discriminator}"
# - {nickname}: The nickname of the user who sent the message. (Will return username if user has no nickname)
# - {role}: The name of the user's topmost role on Discord. If the user doesn't have a role, the placeholder is empty.
# - {color}: The minecraft color representative of the user's topmost role color on discord. If the user doesn't have a role color, the placeholder is empty.
# - {message}: The content of the message being sent
discord-to-mc: "&6[#{channel}] &3{fullname}&7: &f{message}"