diff --git a/src/main/java/de/presti/ree6/bot/util/WebhookUtil.java b/src/main/java/de/presti/ree6/bot/util/WebhookUtil.java index f54d849ee..e278e3581 100644 --- a/src/main/java/de/presti/ree6/bot/util/WebhookUtil.java +++ b/src/main/java/de/presti/ree6/bot/util/WebhookUtil.java @@ -3,9 +3,11 @@ import club.minnced.discord.webhook.WebhookClient; import club.minnced.discord.webhook.send.WebhookMessage; import de.presti.ree6.bot.BotWorker; -import de.presti.ree6.module.logger.LogMessage; import de.presti.ree6.main.Main; +import de.presti.ree6.module.logger.LogMessage; import de.presti.ree6.sql.SQLSession; +import de.presti.ree6.sql.entities.ScheduledMessage; +import de.presti.ree6.sql.entities.Tickets; import de.presti.ree6.sql.entities.webhook.*; import de.presti.ree6.sql.entities.webhook.base.Webhook; import de.presti.ree6.sql.entities.webhook.base.WebhookSocial; @@ -34,9 +36,10 @@ private WebhookUtil() { * * @param message the MessageContent. * @param webhook the Webhook. + * @param typ the typ of the Webhook */ - public static void sendWebhook(WebhookMessage message, Webhook webhook) { - sendWebhook(null, message, webhook.getWebhookId(), webhook.getToken(), false); + public static void sendWebhook(WebhookMessage message, Webhook webhook, WebhookTyp typ) { + sendWebhook(null, message, webhook.getWebhookId(), webhook.getToken(), typ); } /** @@ -45,10 +48,10 @@ public static void sendWebhook(WebhookMessage message, Webhook webhook) { * @param loggerMessage the MessageContent, if it has been merged. * @param message the MessageContent. * @param webhook the Webhook. - * @param isLog is the Webhook Message a Log-Message? + * @param typ the typ of the Webhook */ - public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, Webhook webhook, boolean isLog) { - sendWebhook(loggerMessage, message, webhook.getWebhookId(), webhook.getToken(), isLog); + public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, Webhook webhook, WebhookTyp typ) { + sendWebhook(loggerMessage, message, webhook.getWebhookId(), webhook.getToken(), typ); } /** @@ -56,9 +59,10 @@ public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, * * @param message the MessageContent. * @param webhook the Webhook. + * @param typ the typ of the Webhook */ - public static void sendWebhook(WebhookMessage message, WebhookSocial webhook) { - sendWebhook(null, message, webhook.getWebhookId(), webhook.getToken(), false); + public static void sendWebhook(WebhookMessage message, WebhookSocial webhook, WebhookTyp typ) { + sendWebhook(null, message, webhook.getWebhookId(), webhook.getToken(), typ); } /** @@ -67,10 +71,10 @@ public static void sendWebhook(WebhookMessage message, WebhookSocial webhook) { * @param loggerMessage the MessageContent, if it has been merged. * @param message the MessageContent. * @param webhook the Webhook. - * @param isLog is the Webhook Message a Log-Message? + * @param typ the typ of the Webhook */ - public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, WebhookSocial webhook, boolean isLog) { - sendWebhook(loggerMessage, message, webhook.getWebhookId(), webhook.getToken(), isLog); + public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, WebhookSocial webhook, WebhookTyp typ) { + sendWebhook(loggerMessage, message, webhook.getWebhookId(), webhook.getToken(), typ); } @@ -81,15 +85,15 @@ public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, * @param message the MessageContent. * @param webhookId the ID of the Webhook. * @param webhookToken the Auth-Token of the Webhook. - * @param isLog is the Webhook Message a Log-Message? + * @param typ the typ of the Webhook */ - public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, long webhookId, String webhookToken, boolean isLog) { - Main.getInstance().logAnalytic("Received a Webhook to send. (Log-Typ: {})", isLog ? loggerMessage != null ? loggerMessage.getType().name() : "NONE-LOG" : "NONE-LOG"); + public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, long webhookId, String webhookToken, WebhookTyp typ) { + Main.getInstance().logAnalytic("Received a Webhook to send. (Log-Typ: {})", typ == WebhookTyp.LOG ? loggerMessage != null ? loggerMessage.getType().name() : "NONE-LOG" : "NONE-LOG"); // Check if the given data is valid. if (webhookToken.contains("Not setup!") || webhookId == 0) return; // Check if the given data is in the Database. - if (isLog) { + if (typ == WebhookTyp.LOG) { SQLSession.getSqlConnector().getSqlWorker().existsLogData(webhookId, webhookToken).subscribe(x -> { if (!x) { // If not, inform about invalid send. @@ -102,95 +106,104 @@ public static void sendWebhook(LogMessage loggerMessage, WebhookMessage message, return; } - sendWebhookMessage(loggerMessage, message, webhookId, webhookToken, true); + sendWebhookMessage(loggerMessage, message, webhookId, webhookToken, typ); } }); } else { - sendWebhookMessage(loggerMessage, message, webhookId, webhookToken, false); + sendWebhookMessage(loggerMessage, message, webhookId, webhookToken, typ); } } - private static void sendWebhookMessage(LogMessage loggerMessage, WebhookMessage message, long webhookId, String webhookToken, boolean isLog) { + private static void sendWebhookMessage(LogMessage loggerMessage, WebhookMessage message, long webhookId, String webhookToken, WebhookTyp typ) { // Try sending a Webhook to the given data. try (WebhookClient wcl = WebhookClient.withId(webhookId, webhookToken)) { // Send the message and handle exceptions. wcl.send(message).exceptionally(throwable -> { // If error 404 comes, that means that the webhook is invalid. if (throwable.getMessage().contains("failure 404")) { - // Inform and delete invalid webhook. - if (isLog) { - SQLSession.getSqlConnector().getSqlWorker().deleteLogWebhook(webhookId, webhookToken); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - // TODO:: this has become worst so please for the love of god find a better solution brain. - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookWelcome(), "FROM WebhookWelcome WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(welcome -> { - if (welcome.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(welcome.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { + switch (typ) { + case LOG -> + SQLSession.getSqlConnector().getSqlWorker().deleteLogWebhook(webhookId, webhookToken); + + case WELCOME -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookWelcome(), "FROM WebhookWelcome WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case YOUTUBE -> SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookYouTube(), "FROM WebhookYouTube WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookYouTube -> { - if (webhookYouTube.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookYouTube.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTwitter(), "FROM WebhookTwitter WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookTwitter -> { - if (webhookTwitter.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookTwitter.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTwitch(), "FROM WebhookTwitch WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookTwitch -> { - - if (webhookTwitch.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookTwitch.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookReddit(), "FROM WebhookReddit WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookReddit -> { - - if (webhookReddit.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookReddit.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookInstagram(), "FROM WebhookInstagram WHERE webhookId = :cid AND token = :token", - Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookInstagram -> { - - if (webhookInstagram.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookInstagram.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTikTok(), "FROM WebhookTikTok WHERE webhookId = :cid AND token = :token", Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(webhookTikTok -> { - if (webhookTikTok.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(webhookTikTok.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - SQLSession.getSqlConnector().getSqlWorker().getEntity(new RSSFeed(), "FROM WebhookTikTok WHERE webhookId = :cid AND token = :token", Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(rssFeed -> { - if (rssFeed.isPresent()) { - SQLSession.getSqlConnector().getSqlWorker().deleteEntity(rssFeed.get()).block(); - log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); - } else { - log.error("[Webhook] Invalid Webhook: {} - {}, has not been deleted since it is not a Log-Webhook.", webhookId, webhookToken); - } - }); - } - }); - } - }); - } - }); - } - }); - } - }); - } + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case TWITTER -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTwitter(), "FROM WebhookTwitter WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case TWITCH -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTwitch(), "FROM WebhookTwitch WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case REDDIT -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookReddit(), "FROM WebhookReddit WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case SPOTIFY -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookSpotify(), "FROM WebhookSpotify WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case TIKTOK -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookTikTok(), "FROM WebhookTikTok WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case INSTAGRAM -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new WebhookInstagram(), "FROM WebhookInstagram WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case RSS -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new RSSFeed(), "FROM RSSFeed WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case SCHEDULE -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new ScheduledMessage(), "FROM ScheduledMessage WHERE webhookId = :cid AND token = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); + }); + + case TICKET -> + SQLSession.getSqlConnector().getSqlWorker().getEntity(new Tickets(), "FROM Tickets WHERE logChannelWebhookId = :cid AND logChannelWebhookToken = :token", + Map.of("cid", String.valueOf(webhookId), "token", webhookToken)).subscribe(x -> { + if (x.isPresent()) + SQLSession.getSqlConnector().getSqlWorker().deleteEntity(x.get()); }); - } - }); } + log.error("[Webhook] Deleted invalid Webhook: {} - {}", webhookId, webhookToken); } else if (throwable.getMessage().contains("failure 400")) { // If 404 inform that the Message had an invalid Body. log.error("[Webhook] Invalid Body with LogTyp: {}", loggerMessage.getType().name()); @@ -223,4 +236,8 @@ public static void deleteWebhook(long guildId, Webhook webhookEntity) { .forEach(webhook -> webhook.delete().queue())); } } + + public enum WebhookTyp { + LOG, WELCOME, TIKTOK, SPOTIFY, YOUTUBE, REDDIT, TWITCH, TWITTER, INSTAGRAM, RSS, SCHEDULE, TICKET + } } \ No newline at end of file diff --git a/src/main/java/de/presti/ree6/events/MenuEvents.java b/src/main/java/de/presti/ree6/events/MenuEvents.java index 1eb90c888..c42dc2f2a 100644 --- a/src/main/java/de/presti/ree6/events/MenuEvents.java +++ b/src/main/java/de/presti/ree6/events/MenuEvents.java @@ -176,7 +176,7 @@ public void onButtonInteraction(@NotNull ButtonInteractionEvent event) { event.getChannel().getTimeCreated().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " "), ZonedDateTime.now().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " ")).getBytes(StandardCharsets.UTF_8)); - WebhookUtil.sendWebhook(null, webhookMessageBuilder.build(), ticketEntity.getLogChannelWebhookId(), ticketEntity.getLogChannelWebhookToken(), false); + WebhookUtil.sendWebhook(null, webhookMessageBuilder.build(), ticketEntity.getLogChannelWebhookId(), ticketEntity.getLogChannelWebhookToken(), WebhookUtil.WebhookTyp.TICKET); event.getHook().sendMessage(LanguageService.getByGuild(event.getGuild(), "message.ticket.close").block()).queue(); event.getChannel().delete().delay(2, TimeUnit.SECONDS).queue(); diff --git a/src/main/java/de/presti/ree6/events/OtherEvents.java b/src/main/java/de/presti/ree6/events/OtherEvents.java index 9d163fc78..bced6b12d 100644 --- a/src/main/java/de/presti/ree6/events/OtherEvents.java +++ b/src/main/java/de/presti/ree6/events/OtherEvents.java @@ -166,7 +166,7 @@ public void onGuildMemberJoin(@Nonnull GuildMemberJoinEvent event) { SQLSession.getSqlConnector().getSqlWorker().getWelcomeWebhook(event.getGuild().getIdLong()).subscribe(webhook -> { if (webhook.isEmpty()) return; - WebhookUtil.sendWebhook(wmb.build(), webhook.get()); + WebhookUtil.sendWebhook(wmb.build(), webhook.get(), WebhookUtil.WebhookTyp.WELCOME); }); }); } @@ -237,7 +237,7 @@ public void onGuildMemberRemove(@NotNull GuildMemberRemoveEvent event) { channel.getTimeCreated().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " "), ZonedDateTime.now().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " ")).getBytes(StandardCharsets.UTF_8)); - WebhookUtil.sendWebhook(null, webhookMessageBuilder.build(), ticketsEntity.getLogChannelId(), ticketsEntity.getLogChannelWebhookToken(), false); + WebhookUtil.sendWebhook(null, webhookMessageBuilder.build(), ticketsEntity.getLogChannelId(), ticketsEntity.getLogChannelWebhookToken(), WebhookUtil.WebhookTyp.TICKET); channel.delete().queue(); } } diff --git a/src/main/java/de/presti/ree6/main/Main.java b/src/main/java/de/presti/ree6/main/Main.java index 7f8043c94..bb65bb420 100644 --- a/src/main/java/de/presti/ree6/main/Main.java +++ b/src/main/java/de/presti/ree6/main/Main.java @@ -612,7 +612,7 @@ public void createCheckerThread() { WebhookUtil.sendWebhook(new WebhookMessageBuilder() .setUsername(BotConfig.getBotName() + "-Scheduler") .setAvatarUrl(BotWorker.getShardManager().getShards().get(0).getSelfUser().getEffectiveAvatarUrl()) - .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook()); + .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook(), WebhookUtil.WebhookTyp.SCHEDULE); SQLSession.getSqlConnector().getSqlWorker().deleteEntity(scheduledMessage).block(); } @@ -626,7 +626,7 @@ public void createCheckerThread() { WebhookUtil.sendWebhook(new WebhookMessageBuilder() .setUsername(BotConfig.getBotName() + "-Scheduler") .setAvatarUrl(BotWorker.getShardManager().getShards().get(0).getSelfUser().getEffectiveAvatarUrl()) - .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook()); + .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook(), WebhookUtil.WebhookTyp.SCHEDULE); scheduledMessage.setLastExecute(Timestamp.from(Instant.now())); SQLSession.getSqlConnector().getSqlWorker().updateEntity(scheduledMessage).block(); @@ -637,7 +637,7 @@ public void createCheckerThread() { WebhookUtil.sendWebhook(new WebhookMessageBuilder() .setUsername(BotConfig.getBotName() + "-Scheduler") .setAvatarUrl(BotWorker.getShardManager().getShards().get(0).getSelfUser().getEffectiveAvatarUrl()) - .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook()); + .append(scheduledMessage.getMessage()).build(), scheduledMessage.getScheduledMessageWebhook(), WebhookUtil.WebhookTyp.SCHEDULE); scheduledMessage.setLastExecute(Timestamp.from(Instant.now())); SQLSession.getSqlConnector().getSqlWorker().updateEntity(scheduledMessage).block(); diff --git a/src/main/java/de/presti/ree6/module/logger/LoggerQueue.java b/src/main/java/de/presti/ree6/module/logger/LoggerQueue.java index a0e2b71e5..bc3e6ec84 100644 --- a/src/main/java/de/presti/ree6/module/logger/LoggerQueue.java +++ b/src/main/java/de/presti/ree6/module/logger/LoggerQueue.java @@ -3,13 +3,13 @@ import club.minnced.discord.webhook.send.WebhookEmbed; import club.minnced.discord.webhook.send.WebhookEmbedBuilder; import club.minnced.discord.webhook.send.WebhookMessageBuilder; +import de.presti.ree6.bot.BotConfig; import de.presti.ree6.bot.util.WebhookUtil; import de.presti.ree6.language.LanguageService; import de.presti.ree6.module.logger.events.LogMessageMember; import de.presti.ree6.module.logger.events.LogMessageRole; import de.presti.ree6.module.logger.events.LogMessageUser; import de.presti.ree6.module.logger.events.LogMessageVoice; -import de.presti.ree6.bot.BotConfig; import de.presti.ree6.utils.others.ThreadUtil; import net.dv8tion.jda.api.Permission; @@ -470,7 +470,7 @@ else if (loggerMessage.getType() == LogTyp.SERVER_LEAVE && loggerMessage instanc ThreadUtil.createThread(x -> { // If not canceled, send it. if (!loggerMessage.isCanceled()) { - WebhookUtil.sendWebhook(loggerMessage, loggerMessage.getWebhookMessage(), loggerMessage.getId(), loggerMessage.getAuthCode(), true); + WebhookUtil.sendWebhook(loggerMessage, loggerMessage.getWebhookMessage(), loggerMessage.getId(), loggerMessage.getAuthCode(), WebhookUtil.WebhookTyp.LOG); } // Remove it from the list. diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/InstagramSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/InstagramSonic.java index af672119d..f15fa6e5f 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/InstagramSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/InstagramSonic.java @@ -124,7 +124,7 @@ public void run() { webhookMessageBuilder.addEmbeds(webhookEmbedBuilder.build()); webhooks.forEach(webhook -> WebhookUtil.sendWebhook(webhookMessageBuilder.setContent(webhook.getMessage() - .replace("%username%", user.getUsername())).build(), webhook)); + .replace("%username%", user.getUsername())).build(), webhook, WebhookUtil.WebhookTyp.INSTAGRAM)); }); } } diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/RSSSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/RSSSonic.java index 4f766b70f..cb6ec5f66 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/RSSSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/RSSSonic.java @@ -174,7 +174,7 @@ public void run() { .replace("#m", ""); } webhookMessageBuilder.setContent(message); - WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook); + WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.RSS); }); }); } else { @@ -212,7 +212,7 @@ public void run() { webhookMessageBuilder.addEmbeds(webhookEmbedBuilder.build()); - webhooks.forEach(webhook -> WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook)); + webhooks.forEach(webhook -> WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.RSS)); }); } catch (Exception exception) { Sentry.captureException(exception); diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/RedditSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/RedditSonic.java index 5d765fa7c..b0e7e2821 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/RedditSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/RedditSonic.java @@ -122,7 +122,7 @@ public void run() { .replace("%name%", redditPost.getSubreddit()) .replace("%url%", redditPost.getUrl()); webhookMessageBuilder.setContent(message); - WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook); + WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.REDDIT); }); })); } diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/SpotifySonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/SpotifySonic.java index b5a958d1f..a2e633940 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/SpotifySonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/SpotifySonic.java @@ -126,7 +126,7 @@ public void sendWebhooks(WebhookEmbedBuilder webhookEmbed, String description, S .replace("%name%", authorName) .replace("%url%", redirect); webhookMessageBuilder.setContent(message); - WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook); + WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.SPOTIFY); }); } diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/TikTokSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/TikTokSonic.java index 7d840f619..049101781 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/TikTokSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/TikTokSonic.java @@ -92,7 +92,7 @@ public void run() { .replace("%name%", user.getDisplayName()) .replace("%url%", "https://tiktok.com/share/video/" + post.getId()); webhookMessageBuilder.setContent(message); - WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook); + WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.TIKTOK); }); } limit.incrementAndGet(); diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/TwitchSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/TwitchSonic.java index 85ef137a5..275e00a9c 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/TwitchSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/TwitchSonic.java @@ -103,7 +103,7 @@ public void run() { .replace("%name%", channelGoLiveEvent.getStream().getUserName()) .replace("%url%", twitchUrl); wmb.setContent(message); - WebhookUtil.sendWebhook(wmb.build(), webhook); + WebhookUtil.sendWebhook(wmb.build(), webhook, WebhookUtil.WebhookTyp.TWITCH); }); })); diff --git a/src/main/java/de/presti/ree6/module/notifications/impl/YouTubeSonic.java b/src/main/java/de/presti/ree6/module/notifications/impl/YouTubeSonic.java index 43adeaffd..bbbeb6cde 100644 --- a/src/main/java/de/presti/ree6/module/notifications/impl/YouTubeSonic.java +++ b/src/main/java/de/presti/ree6/module/notifications/impl/YouTubeSonic.java @@ -96,7 +96,7 @@ public void run() { webhookMessageBuilder.setContent(message); webhookMessageBuilder.addEmbeds(webhookEmbedBuilder.build()); - WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook); + WebhookUtil.sendWebhook(webhookMessageBuilder.build(), webhook, WebhookUtil.WebhookTyp.YOUTUBE); }); break;