diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 57cce6e..96e0f23 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -144,6 +144,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { private long lastannouncementtime = 0; private long lastseentime = 0; + public static final String DELIVERED_REACTION = "✅"; private void AnnouncementGetterThreadMethod() { while (!stop) { diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index 54a7ef3..0c14ce8 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -5,6 +5,7 @@ import buttondevteam.discordplugin.DiscordSender; import buttondevteam.lib.TBMCCoreAPI; import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; +import sx.blah.discord.util.RateLimitException; public class AutoUpdaterListener implements IListener { @Override @@ -21,6 +22,12 @@ public class AutoUpdaterListener implements IListener { String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']')); String project = title.substring(title.indexOf('[') + 1, title.indexOf(':')); if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev"))) - TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch); + if (TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch)) + try { + event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION); + } catch (RateLimitException e) { // TODO: Handle + } catch (Exception e) { + TBMCCoreAPI.SendException("An error occured while reacting to plugin update!", e); + } } } diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 34f33bb..69ee4cd 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -19,14 +19,9 @@ import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; import sx.blah.discord.handle.obj.IReaction; import sx.blah.discord.handle.obj.IUser; -import sx.blah.discord.util.DiscordException; -import sx.blah.discord.util.EmbedBuilder; -import sx.blah.discord.util.MissingPermissionsException; import sx.blah.discord.util.RateLimitException; public class MCChatListener implements Listener, IListener { - private static final String DELIVERED_REACTION = "✅"; - @EventHandler // Minecraft public void onMCChat(TBMCChatEvent e) { if (e.isCancelled()) @@ -100,10 +95,10 @@ public class MCChatListener implements Listener, IListener dmessage + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage() .getAttachments().stream().map(a -> a.getUrl()).collect(Collectors.joining("\n")) : "")); - event.getMessage().addReaction(DELIVERED_REACTION); + event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION); event.getMessage().getChannel().getMessages().stream().forEach(m -> { try { - final IReaction reaction = m.getReactionByName(DELIVERED_REACTION); + final IReaction reaction = m.getReactionByName(DiscordPlugin.DELIVERED_REACTION); if (reaction != null) { while (true) try { diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java index cf38145..0b31068 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java @@ -12,7 +12,6 @@ import buttondevteam.discordplugin.commands.ConnectCommand; import buttondevteam.lib.TBMCPlayerGetInfoEvent; import buttondevteam.lib.TBMCPlayerJoinEvent; import buttondevteam.lib.TBMCPlayerQuitEvent; -import buttondevteam.lib.TBMCYEEHAWEvent; import net.ess3.api.events.AfkStatusChangeEvent; import sx.blah.discord.handle.obj.IUser; import sx.blah.discord.handle.obj.Status.StatusType;