Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-28 15:47:26 +02:00
Code Issues Projects Releases Wiki Activity

Add online/unique placeholders to join/leave formats for discord (#4427)

Browse Source
This commit is contained in:
Josh Roy 2021-08-09 13:23:49 -07:00 committed by GitHub
parent 42293596f3
commit 871e718f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ public class DiscordSettings implements IConf {
filled = format; filled = format;
} }
return generateMessageFormat(filled, ":arrow_right: {displayname} has joined!", false, return generateMessageFormat(filled, ":arrow_right: {displayname} has joined!", false,
"username", "displayname", "joinmessage"); "username", "displayname", "joinmessage", "online", "unique");
} }
public MessageFormat getQuitFormat(Player player) { public MessageFormat getQuitFormat(Player player) {
@ -250,7 +250,7 @@ public class DiscordSettings implements IConf {
filled = format; filled = format;
} }
return generateMessageFormat(filled, ":arrow_left: {displayname} has left!", false, return generateMessageFormat(filled, ":arrow_left: {displayname} has left!", false,
"username", "displayname", "quitmessage"); "username", "displayname", "quitmessage", "online", "unique");
} }
public MessageFormat getDeathFormat(Player player) { public MessageFormat getDeathFormat(Player player) {

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

@ -134,7 +134,9 @@ public class BukkitListener implements Listener {
MessageUtil.formatMessage(join ? jda.getSettings().getJoinFormat(player) : jda.getSettings().getQuitFormat(player), MessageUtil.formatMessage(join ? jda.getSettings().getJoinFormat(player) : jda.getSettings().getQuitFormat(player),
MessageUtil.sanitizeDiscordMarkdown(player.getName()), MessageUtil.sanitizeDiscordMarkdown(player.getName()),
MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()), MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()),
MessageUtil.sanitizeDiscordMarkdown(message)), MessageUtil.sanitizeDiscordMarkdown(message),
jda.getPlugin().getEss().getOnlinePlayers().size() - (join ? 0 : 1),
jda.getPlugin().getEss().getUserMap().getUniqueUsers()),
player); player);
} }

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

@ -293,6 +293,8 @@ messages:
# - {username}: The name of the user joining # - {username}: The name of the user joining
# - {displayname}: The display name of the user joining # - {displayname}: The display name of the user joining
# - {joinmessage}: The full default join message used in game # - {joinmessage}: The full default join message used in game
# - {online}: The amount of players online
# - {unique}: The amount of unique players to ever join the server
# ... PlaceholderAPI placeholders are also supported here too! # ... PlaceholderAPI placeholders are also supported here too!
join: ":arrow_right: {displayname} has joined!" join: ":arrow_right: {displayname} has joined!"
# This is the message sent to Discord when a player leaves the minecraft server. # This is the message sent to Discord when a player leaves the minecraft server.
@ -300,6 +302,8 @@ messages:
# - {username}: The name of the user leaving # - {username}: The name of the user leaving
# - {displayname}: The display name of the user leaving # - {displayname}: The display name of the user leaving
# - {quitmessage}: The full default leave message used in game # - {quitmessage}: The full default leave message used in game
# - {online}: The amount of players online
# - {unique}: The amount of unique players to ever join the server
# ... PlaceholderAPI placeholders are also supported here too! # ... PlaceholderAPI placeholders are also supported here too!
quit: ":arrow_left: {displayname} has left!" quit: ":arrow_left: {displayname} has left!"
# This is the message sent to Discord when a player dies. # This is the message sent to Discord when a player dies.