From 18be26d5ca97fd0a2316399e107683c2db86d8a0 Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Wed, 29 Jun 2022 21:56:26 -0400 Subject: [PATCH] Added temporary bot-log redirect for zammy event --- .../fsbot/commands/staff/EditMetaCommand.java | 9 +++++ .../commands/staff/RemoveOutfitCommand.java | 9 +++++ .../commands/staff/RestoreOutfitCommand.java | 9 +++++ .../fsbot/commands/staff/RetagCommand.java | 9 +++++ .../salmonllama/fsbot/config/BotConfig.java | 3 ++ .../fsbot/listeners/ImageListener.java | 37 +++++++++++++++++++ 6 files changed, 76 insertions(+) diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/EditMetaCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/EditMetaCommand.java index c8a8c8c..c2c9ffe 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/EditMetaCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/EditMetaCommand.java @@ -77,6 +77,15 @@ public class EditMetaCommand extends Command { .setColor(Color.YELLOW) .addField("Edited By:", ctx.getAuthor().getDiscriminatedName()); + // TODO: START ZAMMY + if (outfit.getTag().equals("zammy")) + { + ctx.getApi().getServerTextChannelById(BotConfig.ZAMMY_LOG).ifPresent( + chnl -> chnl.sendMessage(log) + ); + } + // TODO: END ZAMMY + ctx.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresent( chnl -> chnl.sendMessage(log) ); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java index 2e1b4c4..5e9dd0d 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java @@ -77,6 +77,15 @@ public class RemoveOutfitCommand extends Command { .setColor(Color.RED) .addField("Deleted By:", ctx.getAuthor().getDiscriminatedName()); + // TODO: START ZAMMY + if (outfit.getTag().equals("zammy")) + { + ctx.getApi().getServerTextChannelById(BotConfig.ZAMMY_LOG).ifPresent( + chnl -> chnl.sendMessage(log) + ); + } + // TODO: END ZAMMY + ctx.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresent( chnl -> chnl.sendMessage(log) ); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/RestoreOutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/RestoreOutfitCommand.java index 689488f..bb8d23c 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/RestoreOutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/RestoreOutfitCommand.java @@ -78,6 +78,15 @@ public class RestoreOutfitCommand extends Command { .setColor(Color.BLUE) .addField("Restored By:", ctx.getAuthor().getDiscriminatedName()); + // TODO: START ZAMMY + if (outfit.getTag().equals("zammy")) + { + ctx.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresent( + chnl -> chnl.sendMessage(log) + ); + } + // TODO: END ZAMMY + ctx.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresent( chnl -> chnl.sendMessage(log) ); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java index a798625..ba3a1ea 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java @@ -81,6 +81,15 @@ public class RetagCommand extends Command { .setThumbnail(outfit.getLink()) .addField("New tag:", newTag); + // TODO: START ZAMMY + if (outfit.getTag().equals("zammy")) + { + ctx.getApi().getServerTextChannelById(BotConfig.ZAMMY_LOG).ifPresent( + chnl -> chnl.sendMessage(log) + ); + } + // TODO: END ZAMMY + ctx.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresent( chnl -> chnl.sendMessage(log) ); diff --git a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java index 4fba42f..b73dd74 100644 --- a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java +++ b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java @@ -56,6 +56,9 @@ public class BotConfig { @ConfigurationOption public static String OUTFIT_LOG = "outfit log channel"; + @ConfigurationOption + public static String ZAMMY_LOG = "zammy log here"; + @ConfigurationOption public static String ACTIVITY_LOG = "bot_log_channel"; diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java index b457b24..2a26893 100644 --- a/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java +++ b/src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java @@ -118,6 +118,43 @@ public class ImageListener implements MessageCreateListener { OutfitController.insert(outfit).thenAcceptAsync((Void) -> { // Log the outfit + + // TODO: START ZAMMY LOG + if (outfit.getTag().equals("zammy")) + { + event.getApi().getServerTextChannelById(BotConfig.ZAMMY_LOG).ifPresentOrElse(chnl -> + { + EmbedBuilder response = new EmbedBuilder() + .setTitle("Outfit Added") + .setAuthor(event.getMessageAuthor()) + .setThumbnail(outfit.getLink()) + .setFooter(String.format("%s | %s", outfit.getTag(), outfit.getId())) + .setUrl(outfit.getLink()) + .setColor(Color.GREEN) + .addField("Uploaded:", outfit.getCreated().toString()) + .addField("Discord Name:", outfit.getDiscordName()); + + if (!outfit.getMeta().equals("")) { + response.addField("Meta:", outfit.getMeta()); + } + + chnl.sendMessage(response); + logger.info(String.format("Outfit from %s successfully added to the zammy event.", event.getMessageAuthor().getDiscriminatedName())); + + // Add the reaction to the original message + GalleryController.getEmoji(channel.getIdAsString()).thenAcceptAsync( + emoji -> event.getMessage().addReaction(EmojiParser.parseToUnicode(emoji)) + ).exceptionally(ExceptionLogger.get()); + }, () -> + { + // Fallback error message to me + event.getApi().getUserById(BotConfig.BOT_OWNER).thenAcceptAsync( + user -> user.sendMessage("Could not find OUTFIT LOG") + ); + }); + } + // TODO: END ZAMMY LOG + event.getApi().getServerTextChannelById(BotConfig.OUTFIT_LOG).ifPresentOrElse(chnl -> { EmbedBuilder response = new EmbedBuilder() .setTitle("Outfit Added")