diff --git a/pom.xml b/pom.xml index dbfed1e..7bf2887 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.eggy03 papertrailbot - 4.1.0 + 4.1.1 PaperTrail Bot A simple bot for logging all server and member actions quarkus @@ -23,7 +23,7 @@ 6.4.1 - 2.0.5 + 3.0.0 3.20.0 33.5.0-jre 26.1.0 @@ -54,6 +54,12 @@ quarkus-arc + + + io.quarkus + quarkus-jackson + + io.quarkus diff --git a/src/main/java/io/github/eggy03/papertrail/bot/bean/PaperTrailSdkBeanProvider.java b/src/main/java/io/github/eggy03/papertrail/bot/bean/PaperTrailSdkBeanProvider.java index 2e42776..43b3247 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/bean/PaperTrailSdkBeanProvider.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/bean/PaperTrailSdkBeanProvider.java @@ -1,5 +1,6 @@ package io.github.eggy03.papertrail.bot.bean; +import com.fasterxml.jackson.databind.ObjectMapper; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.client.MessageLogContentClient; import io.github.eggy03.papertrail.sdk.client.MessageLogRegistrationClient; @@ -14,30 +15,32 @@ public final class PaperTrailSdkBeanProvider { private final @NonNull String apiUrl; + private final @NonNull ObjectMapper objectMapper; @Inject - public PaperTrailSdkBeanProvider(@ConfigProperty(name = "api.url") @NonNull String apiUrl) { + public PaperTrailSdkBeanProvider(@ConfigProperty(name = "api.url") @NonNull String apiUrl, @NonNull ObjectMapper objectMapper) { this.apiUrl = apiUrl; + this.objectMapper = objectMapper; } @Contract(" -> new") @Produces @ApplicationScoped public @NonNull AuditLogRegistrationClient auditLogRegistrationClient() { - return new AuditLogRegistrationClient(apiUrl); + return new AuditLogRegistrationClient(apiUrl, objectMapper); } @Contract(" -> new") @Produces @ApplicationScoped public @NonNull MessageLogRegistrationClient messageLogRegistrationClient() { - return new MessageLogRegistrationClient(apiUrl); + return new MessageLogRegistrationClient(apiUrl, objectMapper); } @Contract(" -> new") @Produces @ApplicationScoped public @NonNull MessageLogContentClient messageLogContentClient() { - return new MessageLogContentClient(apiUrl); + return new MessageLogContentClient(apiUrl, objectMapper); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/constant/ProjectInfo.java b/src/main/java/io/github/eggy03/papertrail/bot/constant/ProjectInfo.java index 73d4b8c..4773ce8 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/constant/ProjectInfo.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/constant/ProjectInfo.java @@ -10,7 +10,7 @@ public final class ProjectInfo { public static final String APPNAME = "PaperTrail"; @NonNull - public static final String VERSION = "v4.1.0"; + public static final String VERSION = "v4.1.1"; @NonNull public static final String PROJECT_ISSUE_LINK = "https://github.com/eggy03/PaperTrailBot/issues"; diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModActionTypeHandler.java index df1c516..7706480 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/AutoModActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.AutoModUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class AutoModEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class AutoModActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public AutoModEventHandler(@NonNull AuditLogRegistrationClient client) { + public AutoModActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelActionTypeHandler.java similarity index 98% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelActionTypeHandler.java index ac64e56..698dfcd 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.DurationUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.ChannelUtils; @@ -24,12 +24,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class ChannelEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class ChannelActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public ChannelEventHandler(@NonNull AuditLogRegistrationClient client) { + public ChannelActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideActionTypeHandler.java index 38a04e0..d301da2 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ChannelOverrideActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.ChannelUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -24,12 +24,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class ChannelOverrideEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class ChannelOverrideActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public ChannelOverrideEventHandler(@NonNull AuditLogRegistrationClient client) { + public ChannelOverrideActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiActionTypeHandler.java similarity index 96% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiActionTypeHandler.java index 0d84cf0..dc9b56d 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/EmojiActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -20,12 +20,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class EmojiEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class EmojiActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public EmojiEventHandler(@NonNull AuditLogRegistrationClient client) { + public EmojiActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateActionTypeHandler.java index 7973f82..f8a8610 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/GuildUpdateActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.DurationUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.GuildUtils; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class GuildUpdateEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class GuildUpdateActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public GuildUpdateEventHandler(@NonNull AuditLogRegistrationClient client) { + public GuildUpdateActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsActionTypeHandler.java similarity index 95% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsActionTypeHandler.java index 6b3aab0..3f71ffd 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/HomeSettingsActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -20,12 +20,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class HomeSettingsEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class HomeSettingsActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public HomeSettingsEventHandler(@NonNull AuditLogRegistrationClient client) { + public HomeSettingsActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationActionTypeHandler.java similarity index 96% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationActionTypeHandler.java index 22377af..689dde8 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/IntegrationActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -20,12 +20,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class IntegrationEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class IntegrationActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public IntegrationEventHandler(@NonNull AuditLogRegistrationClient client) { + public IntegrationActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteActionTypeHandler.java index bff8ad0..a977545 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/InviteActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.DurationUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.InviteUtils; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class InviteEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class InviteActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public InviteEventHandler(@NonNull AuditLogRegistrationClient client) { + public InviteActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberStatusEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberUpdateActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberStatusEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberUpdateActionTypeHandler.java index f261e62..cbd5bbb 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberStatusEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MemberUpdateActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.DurationUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.MemberUtils; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class MemberStatusEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class MemberUpdateActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public MemberStatusEventHandler(@NonNull AuditLogRegistrationClient client) { + public MemberUpdateActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageActionTypeHandler.java similarity index 94% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageActionTypeHandler.java index 8d05478..cd5736b 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessageActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -20,12 +20,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class MessageEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class MessageActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public MessageEventHandler(@NonNull AuditLogRegistrationClient client) { + public MessageActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinActionTypeHandler.java similarity index 95% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinActionTypeHandler.java index 4b8d85f..919aa0d 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/MessagePinActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.MessageUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class MessagePinEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class MessagePinActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public MessagePinEventHandler(@NonNull AuditLogRegistrationClient client) { + public MessagePinActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionActionTypeHandler.java index 8c09146..8d2fec9 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ModActionActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -20,12 +20,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class ModActionEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class ModActionActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public ModActionEventHandler(@NonNull AuditLogRegistrationClient client) { + public ModActionActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingActionTypeHandler.java similarity index 96% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingActionTypeHandler.java index 476fc1b..a7f5c00 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.OnboardingUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class OnboardingEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class OnboardingActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public OnboardingEventHandler(@NonNull AuditLogRegistrationClient client) { + public OnboardingActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptActionTypeHandler.java index 2629742..de12e8c 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/OnboardingPromptActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class OnboardingPromptEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class OnboardingPromptActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public OnboardingPromptEventHandler(@NonNull AuditLogRegistrationClient client) { + public OnboardingPromptActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleActionTypeHandler.java index 1a6fe69..525cb4a 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/RoleActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.RoleUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; @@ -23,12 +23,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class RoleEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class RoleActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public RoleEventHandler(@NonNull AuditLogRegistrationClient client) { + public RoleActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventActionTypeHandler.java index aecda5c..e75a1fa 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ScheduledEventActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.ScheduledEventUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class ScheduledEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class ScheduledEventActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public ScheduledEventHandler(@NonNull AuditLogRegistrationClient client) { + public ScheduledEventActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardActionTypeHandler.java index e12fee8..ec66c2a 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/SoundboardActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.SoundboardUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class SoundboardEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class SoundboardActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public SoundboardEventHandler(@NonNull AuditLogRegistrationClient client) { + public SoundboardActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceActionTypeHandler.java similarity index 96% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceActionTypeHandler.java index e519615..e4f16fb 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StageInstanceActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.StageUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class StageInstanceEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class StageInstanceActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public StageInstanceEventHandler(@NonNull AuditLogRegistrationClient client) { + public StageInstanceActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerActionTypeHandler.java index 262e597..de615ad 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/StickerActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.StickerUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; @@ -22,12 +22,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class StickerEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class StickerActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public StickerEventHandler(@NonNull AuditLogRegistrationClient client) { + public StickerActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadActionTypeHandler.java similarity index 98% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadActionTypeHandler.java index 4c706b6..ecc5354 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/ThreadActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.BooleanUtils; import io.github.eggy03.papertrail.bot.utils.DurationUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.ChannelUtils; @@ -25,12 +25,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class ThreadEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class ThreadActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public ThreadEventHandler(@NonNull AuditLogRegistrationClient client) { + public ThreadActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedActionTypeHandler.java similarity index 70% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedActionTypeHandler.java index d102059..e931233 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnimplementedActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import jakarta.enterprise.context.ApplicationScoped; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; @@ -10,10 +10,10 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class UnimplementedEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class UnimplementedActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { @Override - public void onUnimplementedEvent(@NonNull GuildAuditLogEntryCreateEvent event) { + public void onUnimplementedActionType(@NonNull GuildAuditLogEntryCreateEvent event) { log.warn("Unimplemented Action Type: {} with Target Type: {}", event.getEntry().getType(), event.getEntry().getType().getTargetType()); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownActionTypeHandler.java similarity index 90% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownActionTypeHandler.java index 3fd1e02..80786da 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/UnknownActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class UnknownEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class UnknownActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public UnknownEventHandler(@NonNull AuditLogRegistrationClient client) { + public UnknownActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } @@ -50,7 +50,7 @@ private void performChecksThenBuildAndSendEmbed(@NonNull GuildAuditLogEntryCreat } @Override - public void onUnknownEvent(@NonNull GuildAuditLogEntryCreateEvent event) { + public void onUnknownActionType(@NonNull GuildAuditLogEntryCreateEvent event) { String channelIdToSendTo = getRegisteredGuildChannel(event.getGuild().getId()); if (channelIdToSendTo.isBlank()) return; diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusActionTypeHandler.java similarity index 95% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusActionTypeHandler.java index 6541eef..98eb5dd 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/VoiceChannelStatusActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; import io.github.eggy03.papertrail.sdk.entity.AuditLogRegistrationEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -21,12 +21,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class VoiceChannelStatusEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class VoiceChannelStatusActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public VoiceChannelStatusEventHandler(@NonNull AuditLogRegistrationClient client) { + public VoiceChannelStatusActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookActionTypeHandler.java similarity index 97% rename from src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookActionTypeHandler.java index 0b504fa..d7deed1 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/handlers/auditlog/WebhookActionTypeHandler.java @@ -1,6 +1,6 @@ package io.github.eggy03.papertrail.bot.handlers.auditlog; -import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventHandler; +import io.github.eggy03.papertrail.bot.listeners.auditlog.GuildAuditLogEntryCreateEventActionTypeHandler; import io.github.eggy03.papertrail.bot.utils.auditlog.GuildUtils; import io.github.eggy03.papertrail.bot.utils.auditlog.WebhookUtils; import io.github.eggy03.papertrail.sdk.client.AuditLogRegistrationClient; @@ -22,12 +22,12 @@ @ApplicationScoped @Slf4j @SuppressWarnings("java:S1192") -public final class WebhookEventHandler extends GuildAuditLogEntryCreateEventHandler { +public final class WebhookActionTypeHandler extends GuildAuditLogEntryCreateEventActionTypeHandler { private final @NonNull AuditLogRegistrationClient client; @Inject - public WebhookEventHandler(@NonNull AuditLogRegistrationClient client) { + public WebhookActionTypeHandler(@NonNull AuditLogRegistrationClient client) { this.client = client; } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventHandler.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventActionTypeHandler.java similarity index 89% rename from src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventHandler.java rename to src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventActionTypeHandler.java index 5548aeb..585023b 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventHandler.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryCreateEventActionTypeHandler.java @@ -6,10 +6,10 @@ /** *

- * Abstract base class for routing {@link GuildAuditLogEntryCreateEvent} - * instances to their appropriate handler methods. + * Abstract base class for routing {@link GuildAuditLogEntryCreateEvent} {@link ActionType} + * to their appropriate handler methods. * Routing is performed by - * {@link #handleEvent(GuildAuditLogEntryCreateEvent)}. + * {@link #handleActionType(GuildAuditLogEntryCreateEvent)}. *

* *

@@ -22,19 +22,19 @@ *

* *

- * Subclasses may override only the event handlers they require. The - * {@code handleEvent(...)} method is responsible for determining which - * handler method should be invoked for a given audit log action. + * Subclasses may override only the action type handlers they require. The + * {@code handleActionType(...)} method is responsible for determining which + * handler method should be invoked for a given action type. *

* *

* If multiple subclasses are registered as CDI beans and are iterated - * through {@code Instance}, each handler + * through {@code Instance}, each handler * instance will independently receive and process the event. *

* *

- * For example, if two subclasses override {@code onBan()}, both + * For example, if two subclasses override {@code onBan()} for processing BAN action types, both * implementations will be executed when a BAN audit log event is * processed, assuming both handler instances are iterated and invoked. *

@@ -52,18 +52,17 @@ * * 
{@code
  * @ApplicationScoped
- * public class MyHandler extends GuildAuditLogEntryCreateEventHandler {
+ * public class MyHandler extends GuildAuditLogEntryCreateEventActionTypeHandler {
  *
  *     @Override
- *     public void onBan(@NonNull GuildAuditLogEntryCreateEvent event,
- *                       @NonNull String channelIdToSendTo) {
+ *     public void onBan(@NonNull GuildAuditLogEntryCreateEvent event) {
  *         // your logic here
  *     }
  * }
  * }
* *

- * Calling {@code handleEvent(...)} on {@code MyHandler} will + * Calling {@code handleActionType(...)} on {@code MyHandler} will * automatically route BAN audit log events to the overridden * {@code onBan()} method. *

@@ -75,10 +74,10 @@ * * 
{@code
  * @Inject
- * Instance eventHandlerInstance;
+ * Instance eventHandlerInstance;
  *
  * eventHandlerInstance.forEach(handler ->
- *     handler.handleEvent(event)
+ *     handler.handleActionType(event)
  * );
  * }
* @@ -87,7 +86,9 @@ * {@link GuildAuditLogEntryEventListener}. *

*/ -public abstract class GuildAuditLogEntryCreateEventHandler { +public abstract class GuildAuditLogEntryCreateEventActionTypeHandler { + + // handler methods for ActionType public void onAutoModerationFlagToChannel(@NonNull GuildAuditLogEntryCreateEvent event) { } @@ -297,25 +298,21 @@ public void onMessageDelete(@NonNull GuildAuditLogEntryCreateEvent event) { } /** - * For {@link ActionType} not fully known by JDA yet + * For {@link ActionType}s not defined in JDA yet */ - public void onUnknownEvent(@NonNull GuildAuditLogEntryCreateEvent event) { + public void onUnknownActionType(@NonNull GuildAuditLogEntryCreateEvent event) { } /** - * For {@link ActionType}s which are defined but not implemented by PaperTrail + * For {@link ActionType}s which are defined in JDA but not implemented by PaperTrail */ - public void onUnimplementedEvent(@NonNull GuildAuditLogEntryCreateEvent event) { + public void onUnimplementedActionType(@NonNull GuildAuditLogEntryCreateEvent event) { } /** *

* Routes a {@link GuildAuditLogEntryCreateEvent} to its corresponding - * event handler method based on the {@link ActionType} of the audit log entry. - *

- * - *

- * Each event handler method can be overridden multiple times + * handler method based on the {@link ActionType} of the audit log entry. *

* *

@@ -324,7 +321,7 @@ public void onUnimplementedEvent(@NonNull GuildAuditLogEntryCreateEvent event) { * * @param event the audit log event received from JDA */ - public final void handleEvent(@NonNull GuildAuditLogEntryCreateEvent event) { + public final void handleActionType(@NonNull GuildAuditLogEntryCreateEvent event) { ActionType action = event.getEntry().getType(); switch (action) { @@ -420,9 +417,9 @@ public final void handleEvent(@NonNull GuildAuditLogEntryCreateEvent event) { case HOME_SETTINGS_CREATE -> onHomeSettingsCreate(event); case HOME_SETTINGS_UPDATE -> onHomeSettingsUpdate(event); - case UNKNOWN -> onUnknownEvent(event); + case UNKNOWN -> onUnknownActionType(event); - default -> onUnimplementedEvent(event); + default -> onUnimplementedActionType(event); } } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryEventListener.java index 5567502..73ffdd0 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/auditlog/GuildAuditLogEntryEventListener.java @@ -11,35 +11,44 @@ /** * Listener responsible for receiving {@link GuildAuditLogEntryCreateEvent} * events from JDA and delegating them to all registered - * {@link GuildAuditLogEntryCreateEventHandler} CDI beans. + * {@link GuildAuditLogEntryCreateEventActionTypeHandler} CDI beans. * *

* Event handlers are resolved dynamically using - * {@code Instance}, allowing multiple + * {@code Instance}, allowing multiple * independent handler implementations to process the same audit log event. *

* *

* Each discovered handler instance will receive the event through - * {@link GuildAuditLogEntryCreateEventHandler#handleEvent(GuildAuditLogEntryCreateEvent)}. - * This enables a multicast-style event processing pipeline where multiple - * handler beans may react to the same audit log action independently. + * {@link GuildAuditLogEntryCreateEventActionTypeHandler#handleActionType(GuildAuditLogEntryCreateEvent)}, where + * it will process the event. *

*/ @Slf4j @ApplicationScoped public final class GuildAuditLogEntryEventListener extends ListenerAdapter { - private final @NonNull Instance guildAuditLogEntryCreateEventHandlers; + private final @NonNull Instance handlerInstances; @Inject - public GuildAuditLogEntryEventListener(@NonNull Instance guildAuditLogEntryCreateEventHandlers) { - this.guildAuditLogEntryCreateEventHandlers = guildAuditLogEntryCreateEventHandlers; + public GuildAuditLogEntryEventListener(@NonNull Instance handlerInstances) { + this.handlerInstances = handlerInstances; } @Override public void onGuildAuditLogEntryCreate(@NonNull GuildAuditLogEntryCreateEvent event) { - guildAuditLogEntryCreateEventHandlers.forEach(handler -> handler.handleEvent(event)); + + /* + Each handler instance gets its own virtual thread to handle the event's ActionType + or else, they will be processed sequentially in a single virtual thread. + This will be particularly slower if two or more inherited classes have overrides + for handling the same ActionType. + */ + handlerInstances.forEach(handler -> Thread.ofVirtual() + .name("guild-audit-log-entry-create-event-listener-vthread-", 0) + .start(() -> handler.handleActionType(event)) + ); } } \ No newline at end of file diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/AuditLogSetupCommandListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/AuditLogSetupCommandListener.java index 856b932..b2050e1 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/AuditLogSetupCommandListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/AuditLogSetupCommandListener.java @@ -26,14 +26,19 @@ public void onSlashCommandInteraction(@NonNull SlashCommandInteractionEvent even return; } - switch (event.getSubcommandName()) { - case "set" -> handler.setAuditLogging(event); - case "view" -> handler.viewAuditLoggingChannel(event); - case "remove" -> handler.unsetAuditLogging(event); - default -> { - // do nothing - } - } + Thread.ofVirtual() + .name("audit-log-setup-command-listener-vthread-", 0) + .start(() -> { + switch (event.getSubcommandName()) { + case "set" -> handler.setAuditLogging(event); + case "view" -> handler.viewAuditLoggingChannel(event); + case "remove" -> handler.unsetAuditLogging(event); + default -> { + // do nothing + } + } + }); + } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/BotSetupInstructionCommandListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/BotSetupInstructionCommandListener.java index 844649f..a818971 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/BotSetupInstructionCommandListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/BotSetupInstructionCommandListener.java @@ -21,7 +21,9 @@ public BotSetupInstructionCommandListener(@NonNull BotSetupInstructionCommandHan public void onSlashCommandInteraction(@NonNull SlashCommandInteractionEvent event) { if (event.getName().equals("setup")) { - handler.sendInstructions(event); + Thread.ofVirtual() + .name("bot-setup-instruction-command-listener-vthread-", 0) + .start(() -> handler.sendInstructions(event)); } } } \ No newline at end of file diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/DebugCommandListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/DebugCommandListener.java index 13f9d70..40f2327 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/DebugCommandListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/DebugCommandListener.java @@ -34,7 +34,10 @@ public void onSlashCommandInteraction(@NonNull SlashCommandInteractionEvent even return; } - handler.sendDebugInfo(event, guild, member); + Thread.ofVirtual() + .name("debug-command-listener-vthread-", 0) + .start(() -> handler.sendDebugInfo(event, guild, member)); + } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/MessageLogSetupCommandListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/MessageLogSetupCommandListener.java index 6db23a4..1c4d8f3 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/MessageLogSetupCommandListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/MessageLogSetupCommandListener.java @@ -26,13 +26,18 @@ public void onSlashCommandInteraction(@NonNull SlashCommandInteractionEvent even return; } - switch (event.getSubcommandName()) { - case "set" -> handler.setMessageLogging(event); - case "view" -> handler.viewMessageLoggingChannel(event); - case "remove" -> handler.unsetMessageLogging(event); - default -> { - // skip - } - } + Thread.ofVirtual().name("message-log-setup-command-listener-vthread-", 0) + .start(() -> { + switch (event.getSubcommandName()) { + case "set" -> handler.setMessageLogging(event); + case "view" -> handler.viewMessageLoggingChannel(event); + case "remove" -> handler.unsetMessageLogging(event); + default -> { + // skip + } + } + }); + + } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/ServerStatCommandListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/ServerStatCommandListener.java index 72b4975..c802517 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/ServerStatCommandListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/command/ServerStatCommandListener.java @@ -33,6 +33,9 @@ public void onSlashCommandInteraction(@NonNull SlashCommandInteractionEvent even return; } - handler.sendServerStats(event, guild); + Thread.ofVirtual() + .name("server-stat-command-listener-vthread-", 0) + .start(() -> handler.sendServerStats(event, guild)); + } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildBoostEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildBoostEventListener.java index 1f04212..c56569f 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildBoostEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildBoostEventListener.java @@ -21,16 +21,22 @@ public GuildBoostEventListener(@NonNull GuildBoostEventHandler handler) { @Override public void onGuildUpdateBoostTier(@NonNull GuildUpdateBoostTierEvent event) { - handler.handleUpdateBoostTier(event); + Thread.ofVirtual() + .name("guild-update-boost-tier-event-listener-vthread-", 0) + .start(() -> handler.handleUpdateBoostTier(event)); } @Override public void onGuildUpdateBoostCount(@NonNull GuildUpdateBoostCountEvent event) { - handler.handleUpdateBoostCount(event); + Thread.ofVirtual() + .name("guild-update-boost-count-event-listener-vthread-", 0) + .start(() -> handler.handleUpdateBoostCount(event)); } @Override public void onGuildMemberUpdateBoostTime(@NonNull GuildMemberUpdateBoostTimeEvent event) { - handler.handleMemberUpdateBoostTime(event); + Thread.ofVirtual() + .name("guild-member-update-boost-time-event-listener-vthread-", 0) + .start(() -> handler.handleMemberUpdateBoostTime(event)); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildMemberEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildMemberEventListener.java index e9e2630..8fb6d5d 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildMemberEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildMemberEventListener.java @@ -23,12 +23,16 @@ public GuildMemberEventListener(@NonNull GuildMemberEventHandler handler) { @Override public void onGuildMemberJoin(@NonNull GuildMemberJoinEvent event) { - handler.handleGuildMemberJoin(event); + Thread.ofVirtual() + .name("guild-member-join-event-listener-vthread-", 0) + .start(() -> handler.handleGuildMemberJoin(event)); } @Override public void onGuildMemberRemove(@NonNull GuildMemberRemoveEvent event) { - handler.handleGuildMemberRemove(event); + Thread.ofVirtual() + .name("guild-member-remove-event-listener-vthread-", 0) + .start(() -> handler.handleGuildMemberRemove(event)); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildPollEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildPollEventListener.java index 54bb1e1..d2c6445 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildPollEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildPollEventListener.java @@ -24,6 +24,8 @@ public void onMessageReceived(@NonNull MessageReceivedEvent event) { if (!event.isFromGuild()) return; - handler.handlePollCreationEvent(event); + Thread.ofVirtual() + .name("guild-poll-creation-event-listener-vthread-", 0) + .start(() -> handler.handlePollCreationEvent(event)); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildSecurityIncidentEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildSecurityIncidentEventListener.java index c576452..a528568 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildSecurityIncidentEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildSecurityIncidentEventListener.java @@ -20,12 +20,18 @@ public GuildSecurityIncidentEventListener(@NonNull GuildSecurityIncidentEventHan @Override public void onGuildUpdateSecurityIncidentDetections(@NonNull GuildUpdateSecurityIncidentDetectionsEvent event) { - handler.handleGuildUpdateSecurityIncidentDetections(event); + Thread.ofVirtual() + .name("guild-update-security-incident-detection-event-listener-vthread-", 0) + .start(() -> handler.handleGuildUpdateSecurityIncidentDetections(event)); + } @Override public void onGuildUpdateSecurityIncidentActions(@NonNull GuildUpdateSecurityIncidentActionsEvent event) { - handler.handleGuildUpdateSecurityIncidentActions(event); + Thread.ofVirtual() + .name("guild-update-security-incident-action-event-listener-vthread-", 0) + .start(() -> handler.handleGuildUpdateSecurityIncidentActions(event)); + } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildVoiceEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildVoiceEventListener.java index 51a6d32..3be92b1 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildVoiceEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/guild/GuildVoiceEventListener.java @@ -21,6 +21,9 @@ public GuildVoiceEventListener(@NonNull GuildVoiceEventHandler handler) { @Override public void onGuildVoiceUpdate(@NonNull GuildVoiceUpdateEvent event) { - handler.handleVoiceUpdateEvent(event); + Thread.ofVirtual() + .name("guild-voice-update-event-listener-vthread-", 0) + .start(() -> handler.handleVoiceUpdateEvent(event)); + } } \ No newline at end of file diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/message/GuildMessageEventListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/message/GuildMessageEventListener.java index 3704875..5c73100 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/message/GuildMessageEventListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/message/GuildMessageEventListener.java @@ -31,8 +31,9 @@ public void onMessageReceived(@NonNull MessageReceivedEvent event) { return; } - handler.handleMessageReceivedEvent(event); - + Thread.ofVirtual() + .name("message-received-event-listener-vthread-", 0) + .start(() -> handler.handleMessageReceivedEvent(event)); } @Override @@ -42,12 +43,15 @@ public void onMessageUpdate(@NonNull MessageUpdateEvent event) { return; } - handler.handleMessageUpdateEvent(event); - + Thread.ofVirtual() + .name("message-update-event-listener-vthread-", 0) + .start(() -> handler.handleMessageUpdateEvent(event)); } @Override public void onMessageDelete(@NonNull MessageDeleteEvent event) { - handler.handleMessageDeleteEvent(event); + Thread.ofVirtual() + .name("message-delete-event-listener-vthread-", 0) + .start(() -> handler.handleMessageDeleteEvent(event)); } } diff --git a/src/main/java/io/github/eggy03/papertrail/bot/listeners/misc/SelfKickListener.java b/src/main/java/io/github/eggy03/papertrail/bot/listeners/misc/SelfKickListener.java index dae62e7..a53b266 100644 --- a/src/main/java/io/github/eggy03/papertrail/bot/listeners/misc/SelfKickListener.java +++ b/src/main/java/io/github/eggy03/papertrail/bot/listeners/misc/SelfKickListener.java @@ -30,7 +30,13 @@ public SelfKickListener(@NonNull AuditLogRegistrationClient auditLogRegistration @Override public void onGuildLeave(@NonNull GuildLeaveEvent event) { Guild leftGuild = event.getGuild(); - auditLogRegistrationClient.deleteRegisteredGuild(leftGuild.getId()); - messageLogRegistrationClient.deleteRegisteredGuild(leftGuild.getId()); + + Thread.ofVirtual() + .name("self-guild-leave-event-listener-vthread-", 0) + .start(() -> { + auditLogRegistrationClient.deleteRegisteredGuild(leftGuild.getId()); + messageLogRegistrationClient.deleteRegisteredGuild(leftGuild.getId()); + }); + } }