From 9f23812b16e3ba24a1b52a5467959a0d19145dbd Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Wed, 2 Aug 2023 22:12:51 +0200 Subject: [PATCH] Attempt to add text to embeds for appeal reminders so users can be tagged in them --- .../alttd/schedulers/ReminderScheduler.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alttd/schedulers/ReminderScheduler.java b/src/main/java/com/alttd/schedulers/ReminderScheduler.java index 22af5b4..7e7458c 100644 --- a/src/main/java/com/alttd/schedulers/ReminderScheduler.java +++ b/src/main/java/com/alttd/schedulers/ReminderScheduler.java @@ -154,6 +154,23 @@ public class ReminderScheduler { return null; } + private MessageCreateAction getCreateAction(Channel channel, String text) { + switch (channel.getType()) { + case TEXT, NEWS, FORUM -> { + if (channel instanceof TextChannel textChannel) { + return textChannel.sendMessage(text); + } + } + case GUILD_NEWS_THREAD, GUILD_PUBLIC_THREAD, GUILD_PRIVATE_THREAD -> { + if (channel instanceof ThreadChannel threadChannel) { + return threadChannel.sendMessage(text); + } + } + default -> Logger.altitudeLogs.warning("Received unexpected channel type " + channel.getType() + " can't send reminder..."); + } + return null; + } + private void sendEmbed(Reminder reminder, Channel channel, EmbedBuilder embedBuilder, Member member) { embedBuilder.setAuthor(member.getEffectiveName(), null, member.getEffectiveAvatarUrl()); switch (reminder.reminderType()) { @@ -180,11 +197,11 @@ public class ReminderScheduler { e.printStackTrace(); } } - MessageCreateAction messageCreateAction = getCreateAction(channel, embedBuilder); + MessageCreateAction messageCreateAction = getCreateAction(channel, "<@" + userId + ">"); if (messageCreateAction == null) return; if (userId != 0) { - messageCreateAction.addContent("<@" + userId + ">"); + messageCreateAction.addEmbeds(embedBuilder.build()); } messageCreateAction.queue(RestAction.getDefaultSuccess(), Util::handleFailure); }