mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-26 17:05:01 +00:00
Clean up DiscordToMinecraftListener
This commit is contained in:
parent
0fc5b01b29
commit
1726050d65
@ -26,76 +26,91 @@ public class DiscordToMinecraftListener extends ListenerAdapter
|
|||||||
public void onMessageReceived(MessageReceivedEvent event)
|
public void onMessageReceived(MessageReceivedEvent event)
|
||||||
{
|
{
|
||||||
String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
|
String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
|
||||||
if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id))
|
if (event.getMember() == null)
|
||||||
{
|
{
|
||||||
if (!event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
|
return;
|
||||||
{
|
}
|
||||||
Member member = event.getMember();
|
|
||||||
String tag = getDisplay(member);
|
|
||||||
Message msg = event.getMessage();
|
|
||||||
|
|
||||||
ComponentBuilder emsg = new ComponentBuilder();
|
if (chat_channel_id.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Prefix
|
if (event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
|
||||||
emsg.append(ChatColor.DARK_GRAY + "[");
|
{
|
||||||
TextComponent inviteLink = new TextComponent("Discord");
|
return;
|
||||||
inviteLink.setColor(ChatColor.DARK_AQUA.asBungee());
|
}
|
||||||
inviteLink.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
|
|
||||||
new Text("Click here to get the invite link!")));
|
|
||||||
inviteLink.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL,
|
|
||||||
ConfigEntry.DISCORD_INVITE_LINK.getString()));
|
|
||||||
emsg.append(inviteLink);
|
|
||||||
emsg.append(ChatColor.DARK_GRAY + "] ", ComponentBuilder.FormatRetention.NONE);
|
|
||||||
|
|
||||||
// Tag (if they have one)
|
if (!event.getChannel().getId().equals(chat_channel_id))
|
||||||
if (tag != null)
|
{
|
||||||
{
|
return;
|
||||||
emsg.append(tag);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
Member member = event.getMember();
|
||||||
|
String tag = getDisplay(member);
|
||||||
|
Message msg = event.getMessage();
|
||||||
|
|
||||||
|
ComponentBuilder emsg = new ComponentBuilder();
|
||||||
|
|
||||||
|
// Prefix
|
||||||
|
emsg.append(ChatColor.DARK_GRAY + "[");
|
||||||
|
TextComponent inviteLink = new TextComponent("Discord");
|
||||||
|
inviteLink.setColor(ChatColor.DARK_AQUA.asBungee());
|
||||||
|
inviteLink.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
|
||||||
|
new Text("Click here to get the invite link!")));
|
||||||
|
inviteLink.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL,
|
||||||
|
ConfigEntry.DISCORD_INVITE_LINK.getString()));
|
||||||
|
emsg.append(inviteLink);
|
||||||
|
emsg.append(ChatColor.DARK_GRAY + "] ", ComponentBuilder.FormatRetention.NONE);
|
||||||
|
|
||||||
|
// Tag (if they have one)
|
||||||
|
if (tag != null)
|
||||||
|
{
|
||||||
|
emsg.append(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
emsg.append(" ");
|
||||||
|
|
||||||
|
// User
|
||||||
|
TextComponent user = new TextComponent(FUtil.stripColors(member.getEffectiveName()));
|
||||||
|
user.setColor(ChatColor.RED.asBungee());
|
||||||
|
emsg.append(user);
|
||||||
|
|
||||||
|
// Message
|
||||||
|
emsg.append(ChatColor.DARK_GRAY + ": " + ChatColor.RESET
|
||||||
|
+ FUtil.stripColors(msg.getContentDisplay()), ComponentBuilder.FormatRetention.NONE);
|
||||||
|
|
||||||
|
// Attachments
|
||||||
|
if (!msg.getAttachments().isEmpty())
|
||||||
|
{
|
||||||
|
if (!msg.getContentDisplay().isEmpty())
|
||||||
emsg.append(" ");
|
emsg.append(" ");
|
||||||
|
|
||||||
// User
|
for (Message.Attachment attachment : msg.getAttachments())
|
||||||
TextComponent user = new TextComponent(FUtil.stripColors(member.getEffectiveName()));
|
{
|
||||||
user.setColor(ChatColor.RED.asBungee());
|
TextComponent media = new TextComponent("[Media] ");
|
||||||
emsg.append(user);
|
media.setColor(ChatColor.YELLOW.asBungee());
|
||||||
|
media.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
|
||||||
|
media.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(attachment.getUrl())));
|
||||||
|
|
||||||
// Message
|
emsg.append(media, ComponentBuilder.FormatRetention.NONE);
|
||||||
emsg.append(ChatColor.DARK_GRAY + ": " + ChatColor.RESET
|
|
||||||
+ FUtil.stripColors(msg.getContentDisplay()), ComponentBuilder.FormatRetention.NONE);
|
|
||||||
|
|
||||||
// Attachments
|
|
||||||
if (!msg.getAttachments().isEmpty())
|
|
||||||
{
|
|
||||||
if (!msg.getContentDisplay().isEmpty())
|
|
||||||
emsg.append(" ");
|
|
||||||
|
|
||||||
for (Message.Attachment attachment : msg.getAttachments())
|
|
||||||
{
|
|
||||||
TextComponent media = new TextComponent("[Media] ");
|
|
||||||
media.setColor(ChatColor.YELLOW.asBungee());
|
|
||||||
media.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
|
|
||||||
media.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(attachment.getUrl())));
|
|
||||||
|
|
||||||
emsg.append(media, ComponentBuilder.FormatRetention.NONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseComponent[] components = emsg.create();
|
|
||||||
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers())
|
|
||||||
{
|
|
||||||
if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
|
|
||||||
{
|
|
||||||
player.sendMessage(components);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FLog.info(TextComponent.toLegacyText(components), true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BaseComponent[] components = emsg.create();
|
||||||
|
|
||||||
|
for (Player player : Bukkit.getOnlinePlayers())
|
||||||
|
{
|
||||||
|
if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
|
||||||
|
{
|
||||||
|
player.sendMessage(components);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FLog.info(TextComponent.toLegacyText(components), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getDisplay(Member member)
|
public String getDisplay(Member member)
|
||||||
{
|
{
|
||||||
Guild server = Discord.bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
|
Guild server = Discord.bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
|
||||||
|
Loading…
Reference in New Issue
Block a user