From ef9b898b94884b4c4708a1fbdd1018756433ecfb Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Thu, 23 May 2024 07:02:50 +0530 Subject: [PATCH] ... --- .../jdi/core/processor/ClassFileUtil.java | 9 +- .../processor/EventListenerValidator.java | 576 ++++++++++-------- .../jdi/core/processor/ListenerLoader.java | 8 +- .../jdi/core/api/ApplicationRequest.java | 53 +- .../ApplicationRoleConnectionMetaRequest.java | 22 +- .../jdi/core/api/AuditLogsRequest.java | 7 +- .../jdi/core/api/AutoModerationRequest.java | 29 +- .../jdi/core/api/ChannelRequest.java | 129 ++-- .../jdi/core/api/DiscordResponseParser.java | 91 +-- .../jdi/core/api/EmojiRequest.java | 7 +- .../jdi/core/api/GuildRequest.java | 86 ++- .../core/api/GuildScheduledEventRequest.java | 16 +- .../javadiscord/jdi/core/api/PollRequest.java | 4 +- .../jdi/core/api/StickerRequest.java | 24 +- .../javadiscord/jdi/core/api/UserRequest.java | 27 +- .../jdi/core/api/VoiceRequest.java | 4 +- .../jdi/core/api/WebhookRequest.java | 16 +- .../api/builders/BulkGuildBanBuilder.java | 4 +- .../CreateAutoModerationRuleBuilder.java | 28 +- .../core/api/builders/CreateGuildBuilder.java | 29 +- .../builders/CreateGuildChannelBuilder.java | 48 +- .../api/builders/CreateGuildRoleBuilder.java | 14 +- .../api/builders/CreateMessageBuilder.java | 39 +- .../builders/CreateScheduledEventBuilder.java | 30 +- .../core/api/builders/CreateStageBuilder.java | 17 +- .../api/builders/CreateWebhookBuilder.java | 4 +- .../api/builders/DeleteWebhookBuilder.java | 4 +- .../builders/DeleteWebhookMessageBuilder.java | 4 +- .../DeleteWebhookWithTokenBuilder.java | 4 +- .../EditChannelPermissionsBuilder.java | 4 +- .../core/api/builders/EditMessageBuilder.java | 27 +- .../builders/EditWebhookMessageBuilder.java | 29 +- ...ExecuteGithubCompatibleWebhookBuilder.java | 4 +- .../ExecuteSlackCompatibleWebhooBuilder.java | 4 +- .../api/builders/ExecuteWebhookBuilder.java | 43 +- .../builders/FetchChannelMessagesBuilder.java | 4 +- .../FetchUserReactionsToMessageBuilder.java | 4 +- .../api/builders/GetAnswerVotersBuilder.java | 4 +- .../api/builders/GetAuditLogsBuilder.java | 13 +- .../builders/GetCurrentUserGuildsBuilder.java | 4 +- .../api/builders/GetGuildBansBuilder.java | 4 +- .../core/api/builders/GetGuildBuilder.java | 4 +- .../builders/GetGuildPruneCountBuilder.java | 4 +- .../builders/GetGuildWidgetImageBuilder.java | 4 +- .../core/api/builders/GetInviteBuilder.java | 4 +- .../builders/GetScheduledEventBuilder.java | 4 +- .../GetScheduledEventUsersBuilder.java | 12 +- .../builders/GetWebhookMessageBuilder.java | 4 +- .../core/api/builders/GuildBanBuilder.java | 4 +- .../api/builders/ListGuildMembersBuilder.java | 4 +- ...stJoinedPrivateArchivedThreadsBuilder.java | 4 +- .../ListPrivateArchivedThreadsBuilder.java | 4 +- .../ListPublicArchivedThreadsBuilder.java | 4 +- .../builders/ListScheduledEventsBuilder.java | 4 +- .../builders/ListThreadMembersBuilder.java | 4 +- .../ModifyAutoModerationRuleBuilder.java | 28 +- .../builders/ModifyCurrentMemberBuilder.java | 4 +- .../builders/ModifyCurrentUserBuilder.java | 4 +- .../ModifyCurrentUserNickBuilder.java | 4 +- .../ModifyCurrentUserVoiceStateBuilder.java | 13 +- .../core/api/builders/ModifyEmojiBuilder.java | 4 +- .../core/api/builders/ModifyGuildBuilder.java | 49 +- .../builders/ModifyGuildMemberBuilder.java | 26 +- .../api/builders/ModifyGuildRoleBuilder.java | 15 +- .../builders/ModifyGuildStickerBuilder.java | 4 +- .../ModifyGuildWelcomeScreenBuilder.java | 4 +- .../builders/ModifyGuildWidgetBuilder.java | 4 +- .../builders/ModifyScheduledEventBuilder.java | 29 +- .../core/api/builders/ModifyStageBuilder.java | 4 +- .../builders/ModifyUserVoiceStateBuilder.java | 4 +- .../api/builders/ModifyWebhookBuilder.java | 4 +- .../ModifyWebhookWithTokenBuilder.java | 4 +- .../builders/SearchGuildMembersBuilder.java | 4 +- .../StartThreadFromMessageBuilder.java | 11 +- ...artThreadInForumOrMediaChannelBuilder.java | 24 +- .../StartThreadWithoutMessageBuilder.java | 12 +- ...tUserApplicationRoleConnectionBuilder.java | 16 +- .../internal/api/DiscordRequestBuilder.java | 17 +- .../api/DiscordRequestDispatcher.java | 64 +- .../EditCurrentApplicationRequest.java | 58 +- ...licationRoleConnectionMetadataRecords.java | 9 +- ...licationRoleConnectionMetadataRecords.java | 11 +- .../audit_logs/GetGuildAuditLogRequest.java | 22 +- .../CreateAutoModerationRuleRequest.java | 36 +- .../DeleteAutoModerationRuleRequest.java | 15 +- .../GetAutoModerationRuleRequest.java | 15 +- .../ListAutoModerationRulesRequest.java | 4 +- .../ModifyAutoModerationRuleRequest.java | 41 +- .../api/channel/AddThreadMemberRequest.java | 4 +- .../channel/BulkDeleteMessagesRequest.java | 18 +- .../channel/ChannelCreateInviteRequest.java | 28 +- .../api/channel/CreateMessageRequest.java | 55 +- .../api/channel/CreateReactionRequest.java | 16 +- .../api/channel/CrossPostMessageRequest.java | 4 +- .../DeleteAllReactionsForEmojiRequest.java | 16 +- .../channel/DeleteAllReactionsRequest.java | 4 +- .../api/channel/DeleteChannelRequest.java | 4 +- .../api/channel/DeleteMessageRequest.java | 4 +- .../api/channel/DeleteOwnReactionRequest.java | 16 +- .../channel/DeleteUserReactionRequest.java | 17 +- .../EditChannelPermissionsRequest.java | 16 +- .../api/channel/EditMessageRequest.java | 57 +- .../channel/FetchChannelMessageRequest.java | 4 +- .../channel/FetchChannelMessagesRequest.java | 21 +- .../FetchUserReactionsToMessageRequest.java | 23 +- .../FollowAnnouncementChannelRequest.java | 4 +- .../api/channel/GetThreadMemberRequest.java | 17 +- .../channel/GroupDMAddRecipientRequest.java | 11 +- .../GroupDMRemoveRecipientRequest.java | 4 +- .../api/channel/JoinThreadRequest.java | 4 +- .../api/channel/LeaveThreadRequest.java | 4 +- ...stJoinedPrivateArchivedThreadsRequest.java | 20 +- .../ListPrivateArchivedThreadsRequest.java | 24 +- .../ListPublicArchivedThreadsRequest.java | 24 +- .../api/channel/ListThreadMembersRequest.java | 17 +- .../api/channel/ModifyChannelRequest.java | 25 +- .../api/channel/PinMessageRequest.java | 4 +- .../channel/RemoveThreadMemberRequest.java | 4 +- .../StartThreadFromMessageRequest.java | 24 +- ...artThreadInForumOrMediaChannelRequest.java | 49 +- .../StartThreadWithoutMessageRequest.java | 26 +- .../api/channel/UnpinMessageRequest.java | 4 +- .../api/emojis/CreateEmojiRequest.java | 30 +- .../api/emojis/DeleteEmojiRequest.java | 4 +- .../internal/api/emojis/GetEmojiRequest.java | 4 +- .../api/emojis/ModifyEmojiRequest.java | 19 +- .../api/guild/AddGuildMemberRoleRequest.java | 11 +- .../api/guild/BeginGuildPruneRequest.java | 29 +- .../api/guild/BulkGuildBanRequest.java | 18 +- .../api/guild/CreateGuildBanRequest.java | 18 +- .../api/guild/CreateGuildChannelRequest.java | 68 ++- .../api/guild/CreateGuildRequest.java | 37 +- .../api/guild/CreateGuildRoleRequest.java | 24 +- .../guild/DeleteGuildIntegrationRequest.java | 10 +- .../api/guild/DeleteGuildRoleRequest.java | 4 +- .../api/guild/GetGuildBanRequest.java | 4 +- .../api/guild/GetGuildBansRequest.java | 13 +- .../api/guild/GetGuildMemberRequest.java | 4 +- .../api/guild/GetGuildPruneCountRequest.java | 27 +- .../internal/api/guild/GetGuildRequest.java | 12 +- .../guild/GetGuildWelcomeScreenRequest.java | 4 +- .../api/guild/GetGuildWidgetImageRequest.java | 12 +- .../guild/ListActiveGuildThreadsRequest.java | 4 +- .../api/guild/ListGuildMembersRequest.java | 13 +- .../api/guild/ModifyCurrentMemberRequest.java | 18 +- .../guild/ModifyCurrentUserNickRequest.java | 18 +- .../ModifyCurrentUserVoiceStateRequest.java | 22 +- .../ModifyGuildChannelPositionsRequest.java | 23 +- .../api/guild/ModifyGuildMFALevelRequest.java | 10 +- .../api/guild/ModifyGuildMemberRequest.java | 32 +- .../guild/ModifyGuildOnboardingRequest.java | 36 +- .../api/guild/ModifyGuildRequest.java | 55 +- .../ModifyGuildRolePositionsRequest.java | 16 +- .../api/guild/ModifyGuildRoleRequest.java | 32 +- .../ModifyGuildWelcomeScreenRequest.java | 24 +- .../api/guild/ModifyGuildWidgetRequest.java | 18 +- .../guild/ModifyUserVoiceStateRequest.java | 19 +- .../api/guild/RemoveGuildBanRequest.java | 4 +- .../guild/RemoveGuildMemberRoleRequest.java | 11 +- .../api/guild/SearchGuildMembersRequest.java | 15 +- .../CreateScheduledEventRequest.java | 61 +- .../DeleteScheduledEventRequest.java | 10 +- .../GetScheduledEventRequest.java | 18 +- .../GetScheduledEventUsersRequest.java | 29 +- .../ListScheduledEventsRequest.java | 18 +- .../ModifyScheduledEventRequest.java | 45 +- .../internal/api/invite/GetInviteRequest.java | 22 +- .../jdi/internal/api/poll/EndPollRequest.java | 4 +- .../api/poll/GetAnswerVotersRequest.java | 27 +- .../api/stage/CreateStageRequest.java | 20 +- .../api/stage/DeleteStageRequest.java | 4 +- .../api/stage/ModifyStageRequest.java | 18 +- .../sticker/CreateGuildStickerRequest.java | 35 +- .../sticker/DeleteGuildStickerRequest.java | 4 +- .../api/sticker/GetGuildStickerRequest.java | 4 +- .../sticker/ModifyGuildStickerRequest.java | 24 +- .../internal/api/user/CreateDMRequest.java | 10 +- .../api/user/CreateGroupDMRequest.java | 26 +- ...tUserApplicationRoleConnectionRequest.java | 9 +- .../GetCurrentUserGuildMemberRequest.java | 4 +- .../api/user/GetCurrentUserGuildsRequest.java | 16 +- .../api/user/ModifyCurrentUserRequest.java | 12 +- ...tUserApplicationRoleConnectionRequest.java | 24 +- .../api/webhook/CreateWebhookRequest.java | 32 +- .../webhook/DeleteWebhookMessageRequest.java | 22 +- .../api/webhook/DeleteWebhookRequest.java | 12 +- .../DeleteWebhookWithTokenRequest.java | 15 +- .../webhook/EditWebhookMessageRequest.java | 66 +- ...ExecuteGithubCompatibleWebhookRequest.java | 17 +- .../ExecuteSlackCompatibleWebhookRequest.java | 17 +- .../api/webhook/ExecuteWebhookRequest.java | 80 +-- .../api/webhook/GetWebhookMessageRequest.java | 22 +- .../webhook/GetWebhookWithTokenRequest.java | 10 +- .../api/webhook/ModifyWebhookRequest.java | 26 +- .../ModifyWebhookWithTokenRequest.java | 26 +- build.gradle | 17 +- .../jdi/internal/cache/CacheInterface.java | 64 +- .../com/javadiscord/jdi/core/Discord.java | 136 +++-- .../javadiscord/jdi/core/EventListener.java | 8 +- .../jdi/core/GatewayEventListener.java | 66 +- .../core/GatewayEventListenerAnnotations.java | 239 +++++--- .../java/com/javadiscord/jdi/core/Guild.java | 6 +- .../jdi/example/ExampleNoAnnotate.java | 12 +- .../internal/gateway/ConnectionDetails.java | 3 +- .../internal/gateway/ConnectionMediator.java | 7 +- .../jdi/internal/gateway/Gateway.java | 7 +- .../jdi/internal/gateway/GatewayEvent.java | 9 +- .../internal/gateway/SessionStartLimit.java | 9 +- .../internal/gateway/WebSocketHandler.java | 45 +- .../internal/gateway/WebSocketManager.java | 93 +-- .../gateway/WebSocketRetryHandler.java | 5 +- .../handlers/events/EventCodecHandler.java | 37 +- .../codec/decoders/AutoModerationDecoder.java | 8 +- .../events/codec/decoders/ChannelDecoder.java | 5 +- .../decoders/ChannelPinUpdateDecoder.java | 5 +- .../codec/decoders/EntitlementDecoder.java | 5 +- .../codec/decoders/EventUserDecoder.java | 5 +- .../codec/decoders/GuildBanDecoder.java | 5 +- .../events/codec/decoders/GuildDecoder.java | 5 +- .../codec/decoders/GuildInviteDecoder.java | 5 +- .../codec/decoders/GuildMemberDecoder.java | 5 +- .../codec/decoders/GuildRoleDecoder.java | 5 +- .../decoders/IntegrationUpdateDecoder.java | 5 +- .../decoders/InteractionCreateDecoder.java | 5 +- .../codec/decoders/MemberChunkDecoder.java | 5 +- .../decoders/MessageBulkDeleteDecoder.java | 5 +- .../events/codec/decoders/MessageDecoder.java | 5 +- .../decoders/MessageReactionDecoder.java | 5 +- .../MessageReactionsRemovedDecoder.java | 8 +- .../codec/decoders/ReadyEventDecoder.java | 5 +- .../codec/decoders/ScheduledEventDecoder.java | 5 +- .../events/codec/decoders/StageDecoder.java | 5 +- .../codec/decoders/StickerUpdateDecoder.java | 5 +- .../events/codec/decoders/ThreadDecoder.java | 5 +- .../codec/decoders/ThreadListSyncDecoder.java | 5 +- .../codec/decoders/ThreadMemberDecoder.java | 5 +- .../decoders/ThreadMemberUpdateDecoder.java | 8 +- .../codec/decoders/TypingStartDecoder.java | 5 +- .../events/codec/decoders/UserDecoder.java | 5 +- .../codec/decoders/VoiceServerDecoder.java | 5 +- .../codec/decoders/VoiceStateDecoder.java | 5 +- .../events/codec/decoders/WebhookDecoder.java | 5 +- .../AutoModerationRuleCreateHandler.java | 5 +- .../AutoModerationRuleDeleteHandler.java | 5 +- .../AutoModerationRuleUpdateHandler.java | 5 +- .../integration/IntegrationUpdateHandler.java | 5 +- .../message/MessageBulkDeleteHandler.java | 5 +- .../MessageReactionsRemovedHandler.java | 10 +- .../thread/ThreadMemberUpdateHandler.java | 5 +- .../guild/user/UserUpdateHandler.java | 13 +- .../events/codec/models/channel/Thread.java | 32 +- .../codec/models/channel/ThreadMember.java | 15 +- .../models/channel/ThreadMemberUpdate.java | 5 +- .../codec/models/channel/ThreadSync.java | 16 +- .../handlers/heartbeat/HeartbeatService.java | 49 +- .../heartbeat/HelloOperationHandler.java | 15 +- .../jdi/internal/gateway/identify/Data.java | 15 +- .../gateway/identify/IdentifyRequest.java | 27 +- .../core/models/application/Application.java | 58 +- .../application/ApplicationCommandOption.java | 15 +- .../application/ApplicationInstallParams.java | 9 +- .../ApplicationRoleConnectionMetadata.java | 17 +- .../core/models/audit_log/AuditLogEntry.java | 13 +- .../core/models/audit_log/AuditLogObject.java | 18 +- .../audit_log/OptionalAuditEntryInfo.java | 25 +- .../auto_moderation/AutoModerationAction.java | 5 +- .../AutoModerationActionMetadata.java | 7 +- .../auto_moderation/AutoModerationRule.java | 27 +- .../AutoModerationTriggerMetadata.java | 17 +- .../core/models/channel/AllowedMentions.java | 13 +- .../jdi/core/models/channel/Attachment.java | 27 +- .../jdi/core/models/channel/Channel.java | 78 +-- .../core/models/channel/ChannelMention.java | 9 +- .../core/models/channel/DefaultReaction.java | 4 +- .../ForumAndMediaThreadMessageParams.java | 22 +- .../jdi/core/models/channel/ForumTag.java | 11 +- .../jdi/core/models/channel/Overwrite.java | 9 +- .../jdi/core/models/channel/ThreadMember.java | 22 +- .../core/models/channel/ThreadMetadata.java | 13 +- .../jdi/core/models/emoji/Emoji.java | 24 +- .../jdi/core/models/guild/Entitlement.java | 19 +- .../jdi/core/models/guild/Guild.java | 97 +-- .../jdi/core/models/guild/GuildBan.java | 3 +- .../jdi/core/models/guild/GuildMember.java | 46 +- .../jdi/core/models/guild/Integration.java | 42 +- .../models/guild/IntegrationApplication.java | 14 +- .../jdi/core/models/guild/Interaction.java | 49 +- .../core/models/guild/InteractionData.java | 18 +- .../jdi/core/models/guild/MemberChunk.java | 22 +- .../jdi/core/models/guild/Onboarding.java | 15 +- .../core/models/guild/OnboardingPrompt.java | 19 +- .../models/guild/OnboardingPromptOption.java | 26 +- .../jdi/core/models/guild/ResolvedData.java | 20 +- .../jdi/core/models/guild/Role.java | 27 +- .../models/guild/RoleSubscriptionData.java | 9 +- .../jdi/core/models/guild/Tags.java | 13 +- .../jdi/core/models/guild/WelcomeScreen.java | 9 +- .../models/guild/WelcomeScreenChannel.java | 9 +- .../jdi/core/models/guild/WidgetObject.java | 20 +- .../models/guild/WidgetSettingsObject.java | 4 +- .../models/guild_template/GuildTemplate.java | 40 +- .../jdi/core/models/identify/Data.java | 15 +- .../jdi/core/models/invite/Invite.java | 30 +- .../jdi/core/models/message/Message.java | 76 +-- .../core/models/message/MessageActivity.java | 4 +- .../models/message/MessageAttachment.java | 27 +- .../models/message/MessageBulkDelete.java | 11 +- .../models/message/MessageInteraction.java | 16 +- .../message/MessageInteractionMetadata.java | 25 +- .../jdi/core/models/message/MessagePin.java | 7 +- .../core/models/message/MessageReaction.java | 20 +- .../message/MessageReactionsRemoved.java | 7 +- .../core/models/message/MessageReference.java | 9 +- .../models/message/ReactionCountDetails.java | 4 +- .../jdi/core/models/message/Sticker.java | 28 +- .../jdi/core/models/message/StickerItem.java | 7 +- .../jdi/core/models/message/StickerPack.java | 19 +- .../core/models/message/StickerUpdate.java | 8 +- .../jdi/core/models/message/TypingStart.java | 14 +- .../jdi/core/models/message/embed/Embed.java | 37 +- .../models/message/embed/EmbedAuthor.java | 9 +- .../core/models/message/embed/EmbedField.java | 7 +- .../models/message/embed/EmbedFooter.java | 7 +- .../core/models/message/embed/EmbedImage.java | 9 +- .../models/message/embed/EmbedThumbnail.java | 9 +- .../core/models/message/embed/EmbedVideo.java | 9 +- .../jdi/core/models/poll/Poll.java | 23 +- .../jdi/core/models/poll/PollAnswer.java | 4 +- .../jdi/core/models/poll/PollAnswerCount.java | 7 +- .../jdi/core/models/poll/PollMedia.java | 3 +- .../jdi/core/models/poll/PollResults.java | 9 +- .../jdi/core/models/ready/ReadyEvent.java | 38 +- .../models/scheduled_event/EventUser.java | 12 +- .../scheduled_event/ScheduledEvent.java | 38 +- .../jdi/core/models/stage/Stage.java | 15 +- .../jdi/core/models/user/Connection.java | 24 +- .../jdi/core/models/user/Member.java | 13 +- .../jdi/core/models/user/User.java | 35 +- .../jdi/core/models/voice/VoiceRegion.java | 11 +- .../jdi/core/models/voice/VoiceServer.java | 7 +- .../jdi/core/models/voice/VoiceState.java | 30 +- .../jdi/core/models/webhook/Webhook.java | 30 +- spotless.xml | 404 ++++++++++++ 343 files changed, 4275 insertions(+), 3142 deletions(-) create mode 100644 spotless.xml diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java index 6a3df158..0c2c270f 100644 --- a/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java +++ b/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java @@ -1,7 +1,5 @@ package com.javadiscord.jdi.core.processor; -import javassist.bytecode.ClassFile; - import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; @@ -10,6 +8,7 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import javassist.bytecode.ClassFile; public class ClassFileUtil { @@ -28,8 +27,10 @@ public static List getClassesInClassPath() { public static String getClassName(File file) throws IOException { String className = null; - try (FileInputStream fis = new FileInputStream(file); - DataInputStream dis = new DataInputStream(fis)) { + try ( + FileInputStream fis = new FileInputStream(file); + DataInputStream dis = new DataInputStream(fis) + ) { if (isJarFile(file)) { try (ZipInputStream zip = new ZipInputStream(fis)) { ZipEntry entry; diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/EventListenerValidator.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/EventListenerValidator.java index b943995e..3ea29634 100644 --- a/annotations/src/main/java/com/javadiscord/jdi/core/processor/EventListenerValidator.java +++ b/annotations/src/main/java/com/javadiscord/jdi/core/processor/EventListenerValidator.java @@ -1,349 +1,390 @@ package com.javadiscord.jdi.core.processor; -import com.javadiscord.jdi.core.annotations.*; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import com.javadiscord.jdi.core.annotations.*; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class EventListenerValidator { private static final Logger LOGGER = LogManager.getLogger(); private static final Map, String[]> EXPECTED_PARAM_TYPES_MAP = - new HashMap<>(); + new HashMap<>(); static { EXPECTED_PARAM_TYPES_MAP.put( - AutoModerationRuleCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + AutoModerationRuleCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - AutoModerationRuleDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + AutoModerationRuleDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - AutoModerationRuleUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + AutoModerationRuleUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.AutoModerationRuleObject", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - EntitlementCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Entitlement", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + EntitlementCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Entitlement", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - EntitlementDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Entitlement", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + EntitlementDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Entitlement", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - EntitlementUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Entitlement", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + EntitlementUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Entitlement", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ChannelCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.channel.Channel", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ChannelCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.channel.Channel", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ChannelUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.channel.Channel", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ChannelUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.channel.Channel", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ChannelDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.channel.Channel", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ChannelDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.channel.Channel", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ScheduledEventCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.ScheduledEvent", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ScheduledEventCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.ScheduledEvent", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ScheduledEventUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.ScheduledEvent", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ScheduledEventUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.ScheduledEvent", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ScheduledEventDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.ScheduledEvent", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ScheduledEventDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.ScheduledEvent", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildBan.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.GuildBan", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildBan.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.GuildBan", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildBanRemove.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.GuildBan", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildBanRemove.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.GuildBan", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildInviteCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Invite", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildInviteCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Invite", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildInviteDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Invite", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildInviteDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Invite", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildRoleUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Role", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildRoleUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Role", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildRoleCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Role", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildRoleCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Role", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - GuildRoleDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Role", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + GuildRoleDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Role", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - IntegrationUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.IntegrationUpdate", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + IntegrationUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.IntegrationUpdate", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - MessageBulkDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.message.MessageBulkDelete", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + MessageBulkDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.message.MessageBulkDelete", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - MessageCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.message.Message", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + MessageCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.message.Message", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - MessageDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.message.Message", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + MessageDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.message.Message", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - MessageReactionsRemoved.class, - new String[] { - "com.javadiscord.jdi.core.models.message.MessageReactionsRemoved", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + MessageReactionsRemoved.class, + new String[] { + "com.javadiscord.jdi.core.models.message.MessageReactionsRemoved", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - MessageUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.message.Message", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + MessageUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.message.Message", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ReactionRemove.class, - new String[] { - "com.javadiscord.jdi.core.models.message.MessageReaction", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ReactionRemove.class, + new String[] { + "com.javadiscord.jdi.core.models.message.MessageReaction", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - ReactionAdd.class, - new String[] { - "com.javadiscord.jdi.core.models.message.MessageReaction", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + ReactionAdd.class, + new String[] { + "com.javadiscord.jdi.core.models.message.MessageReaction", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - TypingStart.class, - new String[] { - "com.javadiscord.jdi.core.models.message.TypingStart", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + TypingStart.class, + new String[] { + "com.javadiscord.jdi.core.models.message.TypingStart", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); EXPECTED_PARAM_TYPES_MAP.put( - StageCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.stage.Stage", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + StageCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.stage.Stage", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - StageDelete.class, - new String[] { - "com.javadiscord.jdi.core.models.stage.Stage", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + StageDelete.class, + new String[] { + "com.javadiscord.jdi.core.models.stage.Stage", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - StageUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.stage.Stage", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + StageUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.stage.Stage", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - StickerUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.message.StickerUpdate", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + StickerUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.message.StickerUpdate", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadCreate.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadCreate.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadDelete.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadDelete.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadUpdate.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadUpdate.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadListSync.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadSync", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadListSync.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadSync", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadMember.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadMember", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadMember.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadMember", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - ThreadMemberUpdate.class, - new String[] { - "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadMemberUpdate", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + ThreadMemberUpdate.class, + new String[] { + "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.ThreadMemberUpdate", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - MemberChunk.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.MemberChunk", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + MemberChunk.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.MemberChunk", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - UserUpdate.class, - new String[] { - "com.javadiscord.jdi.core.models.user.User", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); - + UserUpdate.class, + new String[] { + "com.javadiscord.jdi.core.models.user.User", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); + EXPECTED_PARAM_TYPES_MAP.put( - InteractionCreate.class, - new String[] { - "com.javadiscord.jdi.core.models.guild.Interaction", - "com.javadiscord.jdi.core.Discord", - "com.javadiscord.jdi.core.Guild" - }); + InteractionCreate.class, + new String[] { + "com.javadiscord.jdi.core.models.guild.Interaction", + "com.javadiscord.jdi.core.Discord", + "com.javadiscord.jdi.core.Guild" + } + ); } public boolean validate(Class clazz) { @@ -364,8 +405,8 @@ public boolean hasZeroArgsConstructor(Class clazz) { private boolean validateMethods(Class clazz) { Method[] methods = clazz.getMethods(); for (Method method : methods) { - for (Map.Entry, String[]> entry : - EXPECTED_PARAM_TYPES_MAP.entrySet()) { + for (Map.Entry, String[]> entry : EXPECTED_PARAM_TYPES_MAP + .entrySet()) { Class annotationClass = entry.getKey(); if (method.isAnnotationPresent(annotationClass)) { String[] expectedParamTypes = entry.getValue(); @@ -388,7 +429,8 @@ private boolean validateMethods(Class clazz) { } } else if (method.getParameterCount() != 0) { LOGGER.error( - "{} does not have the expected parameter types", method.getName()); + "{} does not have the expected parameter types", method.getName() + ); return false; } } diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/ListenerLoader.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/ListenerLoader.java index 8f6e8297..231f14be 100644 --- a/annotations/src/main/java/com/javadiscord/jdi/core/processor/ListenerLoader.java +++ b/annotations/src/main/java/com/javadiscord/jdi/core/processor/ListenerLoader.java @@ -1,14 +1,14 @@ package com.javadiscord.jdi.core.processor; +import java.io.File; +import java.lang.reflect.Constructor; +import java.util.List; + import com.javadiscord.jdi.core.annotations.EventListener; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.File; -import java.lang.reflect.Constructor; -import java.util.List; - public class ListenerLoader { private static final Logger LOGGER = LogManager.getLogger(); private final EventListenerValidator eventListenerValidator = new EventListenerValidator(); diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRequest.java index 59324aa4..3ed14282 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRequest.java @@ -1,13 +1,13 @@ package com.javadiscord.jdi.core.api; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.core.models.application.Application; import com.javadiscord.jdi.core.models.application.ApplicationInstallParams; import com.javadiscord.jdi.internal.api.application.EditCurrentApplicationRequest; import com.javadiscord.jdi.internal.api.application.GetCurrentApplicationRequest; -import java.util.List; -import java.util.Map; - public class ApplicationRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -18,29 +18,32 @@ public ApplicationRequest(DiscordResponseParser responseParser, long guildId) { } public AsyncResponse editCurrentApplication( - String customInstallUrl, - String description, - String roleConnectionsVerificationUrl, - ApplicationInstallParams installParams, - Map integrationTypesConfig, - int flags, - String icon, - String coverImage, - String interactionsEndpointUrl, - List tags) { + String customInstallUrl, + String description, + String roleConnectionsVerificationUrl, + ApplicationInstallParams installParams, + Map integrationTypesConfig, + int flags, + String icon, + String coverImage, + String interactionsEndpointUrl, + List tags + ) { return responseParser.callAndParse( - Application.class, - new EditCurrentApplicationRequest( - customInstallUrl, - description, - roleConnectionsVerificationUrl, - installParams, - integrationTypesConfig, - flags, - icon, - coverImage, - interactionsEndpointUrl, - tags)); + Application.class, + new EditCurrentApplicationRequest( + customInstallUrl, + description, + roleConnectionsVerificationUrl, + installParams, + integrationTypesConfig, + flags, + icon, + coverImage, + interactionsEndpointUrl, + tags + ) + ); } public AsyncResponse getCurrentApplication() { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRoleConnectionMetaRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRoleConnectionMetaRequest.java index 4e7175a9..7dee705e 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRoleConnectionMetaRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/ApplicationRoleConnectionMetaRequest.java @@ -9,23 +9,29 @@ public class ApplicationRoleConnectionMetaRequest { private final long guildId; public ApplicationRoleConnectionMetaRequest( - DiscordResponseParser responseParser, long guildId) { + DiscordResponseParser responseParser, long guildId + ) { this.responseParser = responseParser; this.guildId = guildId; } public AsyncResponse getRecords(long applicationId) { return responseParser.callAndParse( - ApplicationRoleConnectionMetadata.class, - new GetApplicationRoleConnectionMetadataRecords(applicationId)); + ApplicationRoleConnectionMetadata.class, + new GetApplicationRoleConnectionMetadataRecords(applicationId) + ); } public AsyncResponse updateRecords( - long applicationId, - ApplicationRoleConnectionMetadata applicationRoleConnectionMetadata) { + long applicationId, + ApplicationRoleConnectionMetadata applicationRoleConnectionMetadata + ) { return responseParser.callAndParse( - ApplicationRoleConnectionMetadata.class, - new UpdateApplicationRoleConnectionMetadataRecords( - applicationId, applicationRoleConnectionMetadata)); + ApplicationRoleConnectionMetadata.class, + new UpdateApplicationRoleConnectionMetadataRecords( + applicationId, + applicationRoleConnectionMetadata + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/AuditLogsRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/AuditLogsRequest.java index 6c79c333..5d82a442 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/AuditLogsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/AuditLogsRequest.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.GetAuditLogsBuilder; import com.javadiscord.jdi.core.models.audit_log.AuditLogEntry; -import java.util.List; - public class AuditLogsRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -16,6 +16,7 @@ public AuditLogsRequest(DiscordResponseParser responseParser, long guildId) { public AsyncResponse> getAuditLogs(GetAuditLogsBuilder builder) { return responseParser.callAndParseMap( - "audit_log_entries", builder.guildId(guildId).build()); + "audit_log_entries", builder.guildId(guildId).build() + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/AutoModerationRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/AutoModerationRequest.java index 3f6249f5..b6d30fd8 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/AutoModerationRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/AutoModerationRequest.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.ModifyAutoModerationRuleBuilder; import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationRule; import com.javadiscord.jdi.core.request.builders.CreateAutoModerationRuleBuilder; import com.javadiscord.jdi.internal.api.auto_moderation.*; -import java.util.List; - public class AutoModerationRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -17,31 +17,38 @@ public AutoModerationRequest(DiscordResponseParser responseParser, long guildId) } public AsyncResponse createAutoModerationRuleRequest( - CreateAutoModerationRuleBuilder builder) { + CreateAutoModerationRuleBuilder builder + ) { return responseParser.callAndParse( - AutoModerationRule.class, builder.guildId(guildId).build()); + AutoModerationRule.class, builder.guildId(guildId).build() + ); } public AsyncResponse deleteAutoModerationRule(long autoModerationRuleId) { return responseParser.callAndParse( - AutoModerationRule.class, - new DeleteAutoModerationRuleRequest(guildId, autoModerationRuleId)); + AutoModerationRule.class, + new DeleteAutoModerationRuleRequest(guildId, autoModerationRuleId) + ); } public AsyncResponse getAutoModerationRule(long autoModerationRuleId) { return responseParser.callAndParse( - AutoModerationRule.class, - new GetAutoModerationRuleRequest(guildId, autoModerationRuleId)); + AutoModerationRule.class, + new GetAutoModerationRuleRequest(guildId, autoModerationRuleId) + ); } public AsyncResponse> listAutoModerationRules() { return responseParser.callAndParseList( - AutoModerationRule.class, new ListAutoModerationRulesRequest(guildId)); + AutoModerationRule.class, new ListAutoModerationRulesRequest(guildId) + ); } public AsyncResponse modifyAutoModerationRule( - ModifyAutoModerationRuleBuilder builder) { + ModifyAutoModerationRuleBuilder builder + ) { return responseParser.callAndParse( - AutoModerationRule.class, builder.guildId(guildId).build()); + AutoModerationRule.class, builder.guildId(guildId).build() + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java index 1d7a7288..408dd6ad 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java @@ -1,5 +1,8 @@ package com.javadiscord.jdi.core.api; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.api.builders.*; import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.channel.ThreadMember; @@ -9,9 +12,6 @@ import com.javadiscord.jdi.core.models.user.User; import com.javadiscord.jdi.internal.api.channel.*; -import java.util.List; -import java.util.Optional; - public class ChannelRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -23,19 +23,26 @@ public ChannelRequest(DiscordResponseParser responseParser, long guildId) { public AsyncResponse addThreadMember(long channelId, long userId) { return responseParser.callAndParse( - ThreadMember.class, new AddThreadMemberRequest(channelId, userId)); + ThreadMember.class, new AddThreadMemberRequest(channelId, userId) + ); } public AsyncResponse bulkDeleteMessages(long channelId, List messageIds) { return responseParser.callAndParse( - Void.class, new BulkDeleteMessagesRequest(channelId, messageIds)); + Void.class, new BulkDeleteMessagesRequest(channelId, messageIds) + ); } public AsyncResponse createInvite( - long channelId, int maxAge, int maxUses, boolean temporary) { + long channelId, + int maxAge, + int maxUses, + boolean temporary + ) { return responseParser.callAndParse( - Invite.class, - new ChannelCreateInviteRequest(channelId, maxAge, maxUses, temporary)); + Invite.class, + new ChannelCreateInviteRequest(channelId, maxAge, maxUses, temporary) + ); } public AsyncResponse createMessage(CreateMessageBuilder builder) { @@ -43,46 +50,64 @@ public AsyncResponse createMessage(CreateMessageBuilder builder) { } public AsyncResponse createReaction( - long channelId, long messageId, String emoji) { + long channelId, + long messageId, + String emoji + ) { return responseParser.callAndParse( - MessageReaction.class, new CreateReactionRequest(channelId, messageId, emoji)); + MessageReaction.class, new CreateReactionRequest(channelId, messageId, emoji) + ); } public AsyncResponse crossPostMessage(long channelId, long messageId) { return responseParser.callAndParse( - Message.class, new CrossPostMessageRequest(channelId, messageId)); + Message.class, new CrossPostMessageRequest(channelId, messageId) + ); } public AsyncResponse deleteAllReactionsForEmoji( - long channelId, long messageId, String emoji) { + long channelId, + long messageId, + String emoji + ) { return responseParser.callAndParse( - Void.class, new DeleteAllReactionsForEmojiRequest(channelId, messageId, emoji)); + Void.class, new DeleteAllReactionsForEmojiRequest(channelId, messageId, emoji) + ); } public AsyncResponse deleteAllReactions(long channelId, long messageId) { return responseParser.callAndParse( - Void.class, new DeleteAllReactionsRequest(channelId, messageId)); + Void.class, new DeleteAllReactionsRequest(channelId, messageId) + ); } public AsyncResponse deleteChannel(long channelId, long overwriteId) { return responseParser.callAndParse( - Channel.class, new DeleteChannelRequest(channelId, overwriteId)); + Channel.class, new DeleteChannelRequest(channelId, overwriteId) + ); } public AsyncResponse deleteMessage(long channelId, long messageId) { return responseParser.callAndParse( - Message.class, new DeleteMessageRequest(channelId, messageId)); + Message.class, new DeleteMessageRequest(channelId, messageId) + ); } public AsyncResponse deleteOwnReaction(long channelId, long messageId, String emoji) { return responseParser.callAndParse( - Void.class, new DeleteOwnReactionRequest(channelId, messageId, emoji)); + Void.class, new DeleteOwnReactionRequest(channelId, messageId, emoji) + ); } public AsyncResponse deleteUserReaction( - long channelId, long messageId, String emoji, long userId) { + long channelId, + long messageId, + String emoji, + long userId + ) { return responseParser.callAndParse( - Void.class, new DeleteUserReactionRequest(channelId, messageId, emoji, userId)); + Void.class, new DeleteUserReactionRequest(channelId, messageId, emoji, userId) + ); } public AsyncResponse editChannelPermissions(EditChannelPermissionsBuilder builder) { @@ -95,7 +120,8 @@ public AsyncResponse editMessage(EditMessageBuilder builder) { public AsyncResponse fetchChannelMessage(long channelId, long messageId) { return responseParser.callAndParse( - Message.class, new FetchChannelMessageRequest(channelId, messageId)); + Message.class, new FetchChannelMessageRequest(channelId, messageId) + ); } public AsyncResponse> fetchChannelMessages(FetchChannelMessagesBuilder builder) { @@ -107,41 +133,52 @@ public AsyncResponse fetchChannel(long channelId) { } public AsyncResponse> fetchUserReactionsToMessage( - FetchUserReactionsToMessageBuilder builder) { + FetchUserReactionsToMessageBuilder builder + ) { return responseParser.callAndParseList(User.class, builder.build()); } public AsyncResponse followAnnouncementChannel(long channelId) { return responseParser.callAndParse( - Channel.class, new FollowAnnouncementChannelRequest(channelId)); + Channel.class, new FollowAnnouncementChannelRequest(channelId) + ); } public AsyncResponse> channelInvites(long channelId) { return responseParser.callAndParseList( - Invite.class, new GetChannelInvitesRequest(channelId)); + Invite.class, new GetChannelInvitesRequest(channelId) + ); } public AsyncResponse> channelPinnedMessages(long channelId) { return responseParser.callAndParseList( - Message.class, new GetPinnedMessagesRequest(channelId)); + Message.class, new GetPinnedMessagesRequest(channelId) + ); } public AsyncResponse getThreadMember(long channelId, long userId) { return responseParser.callAndParse( - ThreadMember.class, - new GetThreadMemberRequest(channelId, userId, Optional.of(true))); + ThreadMember.class, + new GetThreadMemberRequest(channelId, userId, Optional.of(true)) + ); } public AsyncResponse groupDMAddRecipient( - long channelId, long userId, String accessToken, String nickname) { + long channelId, + long userId, + String accessToken, + String nickname + ) { return responseParser.callAndParse( - Void.class, - new GroupDMAddRecipientRequest(channelId, userId, accessToken, nickname)); + Void.class, + new GroupDMAddRecipientRequest(channelId, userId, accessToken, nickname) + ); } public AsyncResponse groupDMRemoveRecipient(long channelId, long userId) { return responseParser.callAndParse( - Void.class, new GroupDMRemoveRecipientRequest(channelId, userId)); + Void.class, new GroupDMRemoveRecipientRequest(channelId, userId) + ); } public AsyncResponse joinThread(long channelId) { @@ -153,17 +190,20 @@ public AsyncResponse leaveThread(long channelId) { } public AsyncResponse> listJoinedPrivateArchivedThreads( - ListJoinedPrivateArchivedThreadsBuilder builder) { + ListJoinedPrivateArchivedThreadsBuilder builder + ) { return responseParser.callAndParseList(Channel.class, builder.build()); } public AsyncResponse> listPrivateArchivedThreads( - ListPrivateArchivedThreadsBuilder builder) { + ListPrivateArchivedThreadsBuilder builder + ) { return responseParser.callAndParseList(Channel.class, builder.build()); } public AsyncResponse> listPublicArchivedThreads( - ListPublicArchivedThreadsBuilder builder) { + ListPublicArchivedThreadsBuilder builder + ) { return responseParser.callAndParseList(Channel.class, builder.build()); } @@ -172,9 +212,13 @@ public AsyncResponse> listThreadMembers(ListThreadMembersBuil } public AsyncResponse modifyChannel( - long channelId, String name, String base64EncodedIcon) { + long channelId, + String name, + String base64EncodedIcon + ) { return responseParser.callAndParse( - Channel.class, new ModifyChannelRequest(channelId, name, base64EncodedIcon)); + Channel.class, new ModifyChannelRequest(channelId, name, base64EncodedIcon) + ); } public AsyncResponse pinMessage(long channelId, long messageId) { @@ -183,7 +227,8 @@ public AsyncResponse pinMessage(long channelId, long messageId) { public AsyncResponse removeThreadMember(long channelId, long userId) { return responseParser.callAndParse( - ThreadMember.class, new RemoveThreadMemberRequest(channelId, userId)); + ThreadMember.class, new RemoveThreadMemberRequest(channelId, userId) + ); } public AsyncResponse startThreadFromMessage(StartThreadFromMessageBuilder builder) { @@ -191,22 +236,26 @@ public AsyncResponse startThreadFromMessage(StartThreadFromMessageBuild } public AsyncResponse startThreadInForumOrMediaChannel( - StartThreadInForumOrMediaChannelBuilder builder) { + StartThreadInForumOrMediaChannelBuilder builder + ) { return responseParser.callAndParse(Channel.class, builder.build()); } public AsyncResponse startThreadWithoutMessage( - StartThreadWithoutMessageBuilder builder) { + StartThreadWithoutMessageBuilder builder + ) { return responseParser.callAndParse(Channel.class, builder.build()); } public AsyncResponse typingIndicatorRequest(long channelId) { return responseParser.callAndParse( - Void.class, new TriggerTypingIndicatorRequest(channelId)); + Void.class, new TriggerTypingIndicatorRequest(channelId) + ); } public AsyncResponse unpinMessage(long channelId, long messageId) { return responseParser.callAndParse( - Void.class, new UnpinMessageRequest(channelId, messageId)); + Void.class, new UnpinMessageRequest(channelId, messageId) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/DiscordResponseParser.java b/api/src/main/java/com/javadiscord/jdi/core/api/DiscordResponseParser.java index 233f8829..b727fa38 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/DiscordResponseParser.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/DiscordResponseParser.java @@ -1,14 +1,15 @@ package com.javadiscord.jdi.core.api; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestDispatcher; import com.javadiscord.jdi.internal.api.DiscordResponse; import com.javadiscord.jdi.internal.api.DiscordResponseFuture; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; public class DiscordResponseParser { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -22,18 +23,19 @@ public AsyncResponse> callAndParseList(Class clazz, DiscordReques AsyncResponse> asyncResponse = new AsyncResponse<>(); DiscordResponseFuture future = dispatcher.queue(request); future.onSuccess( - response -> { - if (isSuccessfulResponse(response)) { - try { - List resultList = parseResponseFromList(clazz, response.body()); - asyncResponse.setResult(resultList); - } catch (Exception e) { - asyncResponse.setException(e); - } - } else { - asyncResponse.setException(errorResponseException(response)); + response -> { + if (isSuccessfulResponse(response)) { + try { + List resultList = parseResponseFromList(clazz, response.body()); + asyncResponse.setResult(resultList); + } catch (Exception e) { + asyncResponse.setException(e); } - }); + } else { + asyncResponse.setException(errorResponseException(response)); + } + } + ); future.onError(asyncResponse::setException); return asyncResponse; } @@ -42,37 +44,44 @@ public AsyncResponse> callAndParseMap(String key, DiscordRequest req AsyncResponse> asyncResponse = new AsyncResponse<>(); DiscordResponseFuture future = dispatcher.queue(request); future.onSuccess( - response -> { - if (isSuccessfulResponse(response)) { - try { - List resultList = parseResponseFromMap(key, response.body()); - asyncResponse.setResult(resultList); - } catch (Exception e) { - asyncResponse.setException(e); - } - } else { - asyncResponse.setException(errorResponseException(response)); + response -> { + if (isSuccessfulResponse(response)) { + try { + List resultList = parseResponseFromMap(key, response.body()); + asyncResponse.setResult(resultList); + } catch (Exception e) { + asyncResponse.setException(e); } - }); + } else { + asyncResponse.setException(errorResponseException(response)); + } + } + ); future.onError(asyncResponse::setException); return asyncResponse; } - private List parseResponseFromList(Class elementType, String response) - throws JsonProcessingException { + private List parseResponseFromList( + Class elementType, + String response + ) throws JsonProcessingException { return OBJECT_MAPPER.readValue( - response, - OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, elementType)); + response, + OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, elementType) + ); } - private List parseResponseFromMap(String key, String response) - throws JsonProcessingException { + private List parseResponseFromMap( + String key, + String response + ) throws JsonProcessingException { Map> res = - OBJECT_MAPPER.readValue( - response, - OBJECT_MAPPER - .getTypeFactory() - .constructMapType(Map.class, String.class, List.class)); + OBJECT_MAPPER.readValue( + response, + OBJECT_MAPPER + .getTypeFactory() + .constructMapType(Map.class, String.class, List.class) + ); return res.get(key); } @@ -85,7 +94,10 @@ public AsyncResponse callAndParse(Class clazz, DiscordRequest request) } private void success( - Class type, DiscordResponse response, AsyncResponse asyncResponse) { + Class type, + DiscordResponse response, + AsyncResponse asyncResponse + ) { if (isSuccessfulResponse(response)) { try { T result = OBJECT_MAPPER.readValue(response.body(), type); @@ -104,6 +116,7 @@ private boolean isSuccessfulResponse(DiscordResponse response) { private Throwable errorResponseException(DiscordResponse response) { return new Exception( - "Received HTTP status code " + response.status() + " " + response.body()); + "Received HTTP status code " + response.status() + " " + response.body() + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/EmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/EmojiRequest.java index 8a59898f..6869f696 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/EmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/EmojiRequest.java @@ -1,11 +1,11 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.ModifyEmojiBuilder; import com.javadiscord.jdi.core.models.emoji.Emoji; import com.javadiscord.jdi.internal.api.emojis.*; -import java.util.List; - public class EmojiRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -17,7 +17,8 @@ public EmojiRequest(DiscordResponseParser responseParser, long guildId) { public AsyncResponse createEmoji(String name, String image, List roles) { return responseParser.callAndParse( - Emoji.class, new CreateEmojiRequest(guildId, name, image, roles)); + Emoji.class, new CreateEmojiRequest(guildId, name, image, roles) + ); } public AsyncResponse deleteEmoji(long emojiId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/GuildRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/GuildRequest.java index 8ec04621..51f11bb3 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/GuildRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/GuildRequest.java @@ -1,5 +1,7 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.*; import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.guild.*; @@ -9,8 +11,6 @@ import com.javadiscord.jdi.core.models.voice.VoiceState; import com.javadiscord.jdi.internal.api.guild.*; -import java.util.List; - public class GuildRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -22,14 +22,19 @@ public GuildRequest(DiscordResponseParser responseParser, long guildId) { public AsyncResponse addGuildMemberRole(long userId, long roleId) { return responseParser.callAndParse( - Void.class, new AddGuildMemberRoleRequest(guildId, userId, roleId)); + Void.class, new AddGuildMemberRoleRequest(guildId, userId, roleId) + ); } public AsyncResponse> beginGuildPrune( - int days, boolean computePruneCount, List includeRoles) { + int days, + boolean computePruneCount, + List includeRoles + ) { return responseParser.callAndParseList( - GuildMember.class, - new BeginGuildPruneRequest(guildId, days, computePruneCount, includeRoles)); + GuildMember.class, + new BeginGuildPruneRequest(guildId, days, computePruneCount, includeRoles) + ); } public AsyncResponse bulkGuildBan(BulkGuildBanBuilder builder) { @@ -54,7 +59,8 @@ public AsyncResponse createGuildRole(CreateGuildRoleBuilder builder) { public AsyncResponse deleteGuildIntegration(long integrationId) { return responseParser.callAndParse( - Void.class, new DeleteGuildIntegrationRequest(guildId, integrationId)); + Void.class, new DeleteGuildIntegrationRequest(guildId, integrationId) + ); } public AsyncResponse deleteGuild() { @@ -79,7 +85,8 @@ public AsyncResponse> guildChannels() { public AsyncResponse guildIntegrations() { return responseParser.callAndParse( - Integration.class, new GetGuildIntegrationsRequest(guildId)); + Integration.class, new GetGuildIntegrationsRequest(guildId) + ); } public AsyncResponse guildInvites() { @@ -88,12 +95,14 @@ public AsyncResponse guildInvites() { public AsyncResponse guildMember(long userId) { return responseParser.callAndParse( - GuildMember.class, new GetGuildMemberRequest(guildId, userId)); + GuildMember.class, new GetGuildMemberRequest(guildId, userId) + ); } public AsyncResponse guildOnboarding() { return responseParser.callAndParse( - Onboarding.class, new GetGuildOnboardingRequest(guildId)); + Onboarding.class, new GetGuildOnboardingRequest(guildId) + ); } public AsyncResponse guildPreview() { @@ -118,12 +127,14 @@ public AsyncResponse guildVanityURL() { public AsyncResponse guildVoiceRegions() { return responseParser.callAndParse( - VoiceRegion.class, new GetGuildVoiceRegionsRequest(guildId)); + VoiceRegion.class, new GetGuildVoiceRegionsRequest(guildId) + ); } public AsyncResponse guildWelcomeScreen() { return responseParser.callAndParse( - WelcomeScreen.class, new GetGuildWelcomeScreenRequest(guildId)); + WelcomeScreen.class, new GetGuildWelcomeScreenRequest(guildId) + ); } public AsyncResponse guildWidgetImage(GetGuildWidgetImageBuilder builder) { @@ -136,12 +147,14 @@ public AsyncResponse guildWidget() { public AsyncResponse guildWidgetSettings() { return responseParser.callAndParse( - WidgetSettingsObject.class, new GetGuildWidgetSettingsRequest(guildId)); + WidgetSettingsObject.class, new GetGuildWidgetSettingsRequest(guildId) + ); } public AsyncResponse> listActiveGuildThreads() { return responseParser.callAndParseList( - Channel.class, new ListActiveGuildThreadsRequest(guildId)); + Channel.class, new ListActiveGuildThreadsRequest(guildId) + ); } public AsyncResponse> listGuildMembers(ListGuildMembersBuilder builder) { @@ -158,19 +171,23 @@ public AsyncResponse modifyCurrentUserNick(ModifyCurrentUserNickBuilder bu } public AsyncResponse modifyCurrentUserVoiceState( - ModifyCurrentUserVoiceStateBuilder builder) { + ModifyCurrentUserVoiceStateBuilder builder + ) { return responseParser.callAndParse(VoiceState.class, builder.guildId(guildId).build()); } public AsyncResponse modifyGuildChannelPositions( - List channels) { + List channels + ) { return responseParser.callAndParse( - Channel.class, new ModifyGuildChannelPositionsRequest(guildId, channels)); + Channel.class, new ModifyGuildChannelPositionsRequest(guildId, channels) + ); } public AsyncResponse modifyGuildMFALevel(MFALevel level) { return responseParser.callAndParse( - MFALevel.class, new ModifyGuildMFALevelRequest(guildId, level)); + MFALevel.class, new ModifyGuildMFALevelRequest(guildId, level) + ); } public AsyncResponse modifyGuildMember(ModifyGuildMemberBuilder builder) { @@ -178,14 +195,21 @@ public AsyncResponse modifyGuildMember(ModifyGuildMemberBuilder bui } public AsyncResponse modifyGuildOnboarding( - List prompts, - List defaultChannelIds, - boolean enabled, - OnboardingMode mode) { + List prompts, + List defaultChannelIds, + boolean enabled, + OnboardingMode mode + ) { return responseParser.callAndParse( - Onboarding.class, - new ModifyGuildOnboardingRequest( - guildId, prompts, defaultChannelIds, enabled, mode)); + Onboarding.class, + new ModifyGuildOnboardingRequest( + guildId, + prompts, + defaultChannelIds, + enabled, + mode + ) + ); } public AsyncResponse modifyGuild(ModifyGuildBuilder builder) { @@ -193,9 +217,11 @@ public AsyncResponse modifyGuild(ModifyGuildBuilder builder) { } public AsyncResponse> modifyGuildRolePositions( - List roles) { + List roles + ) { return responseParser.callAndParseList( - Role.class, new ModifyGuildRolePositionsRequest(guildId, roles)); + Role.class, new ModifyGuildRolePositionsRequest(guildId, roles) + ); } public AsyncResponse modifyGuildRole(ModifyGuildRoleBuilder builder) { @@ -203,7 +229,8 @@ public AsyncResponse modifyGuildRole(ModifyGuildRoleBuilder builder) { } public AsyncResponse modifyGuildWelcomeScreen( - ModifyGuildWelcomeScreenBuilder builder) { + ModifyGuildWelcomeScreenBuilder builder + ) { return responseParser.callAndParse(WelcomeScreen.class, builder.guildId(guildId).build()); } @@ -221,7 +248,8 @@ public AsyncResponse removeGuildBan(long userId) { public AsyncResponse removeGuildMemberRole(long userId, long roleId) { return responseParser.callAndParse( - GuildMember.class, new RemoveGuildMemberRoleRequest(guildId, userId, roleId)); + GuildMember.class, new RemoveGuildMemberRoleRequest(guildId, userId, roleId) + ); } public AsyncResponse> searchGuildMembers(SearchGuildMembersBuilder builder) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/GuildScheduledEventRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/GuildScheduledEventRequest.java index d3b2d73c..425f88af 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/GuildScheduledEventRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/GuildScheduledEventRequest.java @@ -1,5 +1,7 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.CreateScheduledEventBuilder; import com.javadiscord.jdi.core.api.builders.GetScheduledEventBuilder; import com.javadiscord.jdi.core.api.builders.GetScheduledEventUsersBuilder; @@ -8,8 +10,6 @@ import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEvent; import com.javadiscord.jdi.internal.api.guild_scheduled_event.*; -import java.util.List; - public class GuildScheduledEventRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -25,7 +25,8 @@ public AsyncResponse createScheduledEvent(CreateScheduledEventBu public AsyncResponse deleteScheduledEvent(long scheduledEventId) { return responseParser.callAndParse( - ScheduledEvent.class, new DeleteScheduledEventRequest(guildId, scheduledEventId)); + ScheduledEvent.class, new DeleteScheduledEventRequest(guildId, scheduledEventId) + ); } public AsyncResponse getScheduledEvent(GetScheduledEventBuilder builder) { @@ -33,13 +34,16 @@ public AsyncResponse getScheduledEvent(GetScheduledEventBuilder } public AsyncResponse> getScheduledEventUsers( - GetScheduledEventUsersBuilder builder) { + GetScheduledEventUsersBuilder builder + ) { return responseParser.callAndParseList(EventUser.class, builder.guildId(guildId).build()); } public AsyncResponse> listScheduledEvents( - ListScheduledEventsBuilder builder) { + ListScheduledEventsBuilder builder + ) { return responseParser.callAndParseList( - ScheduledEvent.class, builder.guildId(guildId).build()); + ScheduledEvent.class, builder.guildId(guildId).build() + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/PollRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/PollRequest.java index 46410977..ebdb8f06 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/PollRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/PollRequest.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.GetAnswerVotersBuilder; import com.javadiscord.jdi.core.models.poll.Poll; import com.javadiscord.jdi.core.models.user.User; import com.javadiscord.jdi.internal.api.poll.EndPollRequest; -import java.util.List; - public class PollRequest { private final DiscordResponseParser responseParser; private final long guildId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/StickerRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/StickerRequest.java index 9bd275cd..8d488058 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/StickerRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/StickerRequest.java @@ -1,13 +1,13 @@ package com.javadiscord.jdi.core.api; +import java.nio.file.Path; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.ModifyGuildStickerBuilder; import com.javadiscord.jdi.core.models.message.Sticker; import com.javadiscord.jdi.core.models.message.StickerPack; import com.javadiscord.jdi.internal.api.sticker.*; -import java.nio.file.Path; -import java.util.List; - public class StickerRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -18,20 +18,28 @@ public StickerRequest(DiscordResponseParser responseParser, long guildId) { } public AsyncResponse createGuildSticker( - long guildId, String name, String description, String tags, Path filePath) { + long guildId, + String name, + String description, + String tags, + Path filePath + ) { return responseParser.callAndParse( - Sticker.class, - new CreateGuildStickerRequest(guildId, name, description, tags, filePath)); + Sticker.class, + new CreateGuildStickerRequest(guildId, name, description, tags, filePath) + ); } public AsyncResponse deleteGuildSticker(long stickerId) { return responseParser.callAndParse( - Sticker.class, new DeleteGuildStickerRequest(guildId, stickerId)); + Sticker.class, new DeleteGuildStickerRequest(guildId, stickerId) + ); } public AsyncResponse getGuildSticker(long stickerId) { return responseParser.callAndParse( - Sticker.class, new GetGuildStickerRequest(guildId, stickerId)); + Sticker.class, new GetGuildStickerRequest(guildId, stickerId) + ); } public AsyncResponse> getGuildStickers() { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/UserRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/UserRequest.java index 9cf7a455..8bcba63d 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/UserRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/UserRequest.java @@ -1,5 +1,8 @@ package com.javadiscord.jdi.core.api; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.core.api.builders.GetCurrentUserGuildsBuilder; import com.javadiscord.jdi.core.api.builders.ModifyCurrentUserBuilder; import com.javadiscord.jdi.core.api.builders.UpdateCurrentUserApplicationRoleConnectionBuilder; @@ -10,9 +13,6 @@ import com.javadiscord.jdi.core.models.user.User; import com.javadiscord.jdi.internal.api.user.*; -import java.util.List; -import java.util.Map; - public class UserRequest { private final DiscordResponseParser responseParser; private final long guildId; @@ -27,25 +27,31 @@ public AsyncResponse createDM(long recipientId) { } public AsyncResponse createGroupDM( - List accessTokens, Map nicks) { + List accessTokens, + Map nicks + ) { return responseParser.callAndParse( - Channel.class, new CreateGroupDMRequest(accessTokens, nicks)); + Channel.class, new CreateGroupDMRequest(accessTokens, nicks) + ); } public AsyncResponse getCurrentUserApplicationRoleConnection(long applicationId) { return responseParser.callAndParse( - Connection.class, - new GetCurrentUserApplicationRoleConnectionRequest(applicationId)); + Connection.class, + new GetCurrentUserApplicationRoleConnectionRequest(applicationId) + ); } public AsyncResponse getCurrentUserConnections() { return responseParser.callAndParse( - Connection.class, new GetCurrentUserConnectionsRequest()); + Connection.class, new GetCurrentUserConnectionsRequest() + ); } public AsyncResponse getCurrentUserGuildMember() { return responseParser.callAndParse( - Member.class, new GetCurrentUserGuildMemberRequest(guildId)); + Member.class, new GetCurrentUserGuildMemberRequest(guildId) + ); } public AsyncResponse> getCurrentUserGuilds(GetCurrentUserGuildsBuilder builder) { @@ -69,7 +75,8 @@ public AsyncResponse modifyCurrentUser(ModifyCurrentUserBuilder builder) { } public AsyncResponse updateCurrentUserApplicationRoleConnection( - UpdateCurrentUserApplicationRoleConnectionBuilder builder) { + UpdateCurrentUserApplicationRoleConnectionBuilder builder + ) { return responseParser.callAndParse(Connection.class, builder.build()); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/VoiceRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/VoiceRequest.java index 20fe9c1f..9e328f5b 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/VoiceRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/VoiceRequest.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.models.voice.VoiceRegion; import com.javadiscord.jdi.internal.api.voice.ListVoiceRegionsRequest; -import java.util.List; - public class VoiceRequest { private final DiscordResponseParser responseParser; private final long guildId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/WebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/WebhookRequest.java index d92ae6eb..47c83979 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/WebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/WebhookRequest.java @@ -1,5 +1,7 @@ package com.javadiscord.jdi.core.api; +import java.util.List; + import com.javadiscord.jdi.core.api.builders.CreateWebhookBuilder; import com.javadiscord.jdi.core.api.builders.DeleteWebhookBuilder; import com.javadiscord.jdi.core.api.builders.DeleteWebhookMessageBuilder; @@ -17,8 +19,6 @@ import com.javadiscord.jdi.internal.api.webhook.GetWebhookRequest; import com.javadiscord.jdi.internal.api.webhook.GetWebhookWithTokenRequest; -import java.util.List; - public final class WebhookRequest { private final DiscordResponseParser responseParser; @@ -47,12 +47,14 @@ public AsyncResponse editWebhookMessage(EditWebhookMessageBuilder build } public AsyncResponse executeGithubCompatibleWebhook( - ExecuteGithubCompatibleWebhookBuilder builder) { + ExecuteGithubCompatibleWebhookBuilder builder + ) { return responseParser.callAndParse(Void.class, builder.build()); } public AsyncResponse executeSlackCompatibleWebhook( - ExecuteSlackCompatibleWebhooBuilder builder) { + ExecuteSlackCompatibleWebhooBuilder builder + ) { return responseParser.callAndParse(Void.class, builder.build()); } @@ -62,7 +64,8 @@ public AsyncResponse executeWebhook(ExecuteWebhookBuilder builder) { public AsyncResponse> getChannelWebhooks(long channelId) { return responseParser.callAndParseList( - Webhook.class, new GetChannelWebhooksRequest(channelId)); + Webhook.class, new GetChannelWebhooksRequest(channelId) + ); } public AsyncResponse> getGuildWebhooks(long guildId) { @@ -79,7 +82,8 @@ public AsyncResponse getWebhook(long webhookId) { public AsyncResponse getWebhookWithToken(long webhookId, String webhookToken) { return responseParser.callAndParse( - Webhook.class, new GetWebhookWithTokenRequest(webhookId, webhookToken)); + Webhook.class, new GetWebhookWithTokenRequest(webhookId, webhookToken) + ); } public AsyncResponse modifyWebhook(ModifyWebhookBuilder builder) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/BulkGuildBanBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/BulkGuildBanBuilder.java index 6a07b18b..a449f6a8 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/BulkGuildBanBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/BulkGuildBanBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.BulkGuildBanRequest; - import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.BulkGuildBanRequest; + public class BulkGuildBanBuilder { private long guildId; private final List userIds; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateAutoModerationRuleBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateAutoModerationRuleBuilder.java index 4aa3f8e3..9d64000e 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateAutoModerationRuleBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateAutoModerationRuleBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.request.builders; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; import com.javadiscord.jdi.internal.api.auto_moderation.CreateAutoModerationRuleRequest; -import java.util.List; -import java.util.Optional; - public class CreateAutoModerationRuleBuilder { private long guildId; private final String name; @@ -19,7 +19,8 @@ public class CreateAutoModerationRuleBuilder { private Optional> exemptChannels; public CreateAutoModerationRuleBuilder( - String name, int eventType, int triggerType, List actions) { + String name, int eventType, int triggerType, List actions + ) { this.name = name; this.eventType = eventType; this.triggerType = triggerType; @@ -47,15 +48,16 @@ public CreateAutoModerationRuleBuilder exemptChannels(List exemptChannels) public CreateAutoModerationRuleRequest build() { return new CreateAutoModerationRuleRequest( - guildId, - name, - eventType, - triggerType, - actions, - triggerMetadata, - enabled, - exemptRoles, - exemptChannels); + guildId, + name, + eventType, + triggerType, + actions, + triggerMetadata, + enabled, + exemptRoles, + exemptChannels + ); } public CreateAutoModerationRuleBuilder guildId(long guildId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildBuilder.java index 23c037ef..3ef31400 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.guild.Role; import com.javadiscord.jdi.internal.api.guild.CreateGuildRequest; -import java.util.List; -import java.util.Optional; - public class CreateGuildBuilder { private final String name; private Optional icon; @@ -86,16 +86,17 @@ public CreateGuildBuilder systemChannelFlags(int systemChannelFlags) { public CreateGuildRequest build() { return new CreateGuildRequest( - name, - icon, - verificationLevel, - defaultMessageNotifications, - explicitContentFilter, - roles, - channels, - afkChannelId, - afkTimeout, - systemChannelId, - systemChannelFlags); + name, + icon, + verificationLevel, + defaultMessageNotifications, + explicitContentFilter, + roles, + channels, + afkChannelId, + afkTimeout, + systemChannelId, + systemChannelFlags + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildChannelBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildChannelBuilder.java index a3f56adf..e9471486 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildChannelBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildChannelBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.*; import com.javadiscord.jdi.core.models.guild.Tags; import com.javadiscord.jdi.internal.api.guild.CreateGuildChannelRequest; -import java.util.List; -import java.util.Optional; - public class CreateGuildChannelBuilder { private long guildId; private final String name; @@ -51,25 +51,26 @@ public CreateGuildChannelBuilder(String name) { public CreateGuildChannelRequest build() { return new CreateGuildChannelRequest( - guildId, - name, - type, - topic, - bitrate, - userLimit, - rateLimitPerUser, - position, - permissionOverwrites, - parentId, - nsfw, - rtcRegion, - videoQualityMode, - defaultAutoArchiveDuration, - defaultReactionEmoji, - availableTags, - defaultSortOrder, - defaultForumLayout, - defaultThreadRateLimitPerUser); + guildId, + name, + type, + topic, + bitrate, + userLimit, + rateLimitPerUser, + position, + permissionOverwrites, + parentId, + nsfw, + rtcRegion, + videoQualityMode, + defaultAutoArchiveDuration, + defaultReactionEmoji, + availableTags, + defaultSortOrder, + defaultForumLayout, + defaultThreadRateLimitPerUser + ); } public CreateGuildChannelBuilder guildId(long guildId) { @@ -158,7 +159,8 @@ public CreateGuildChannelBuilder defaultForumLayout(ForumLayoutType defaultForum } public CreateGuildChannelBuilder defaultThreadRateLimitPerUser( - int defaultThreadRateLimitPerUser) { + int defaultThreadRateLimitPerUser + ) { this.defaultThreadRateLimitPerUser = Optional.of(defaultThreadRateLimitPerUser); return this; } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildRoleBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildRoleBuilder.java index 3c12c1fe..ab2d03bd 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildRoleBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateGuildRoleBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.CreateGuildRoleRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.CreateGuildRoleRequest; + public class CreateGuildRoleBuilder { private long guildId; private Optional name; @@ -66,6 +66,14 @@ public CreateGuildRoleBuilder mentionable(boolean mentionable) { public CreateGuildRoleRequest build() { return new CreateGuildRoleRequest( - guildId, name, permissions, color, hoist, icon, unicodeEmoji, mentionable); + guildId, + name, + permissions, + color, + hoist, + icon, + unicodeEmoji, + mentionable + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateMessageBuilder.java index 218a14be..ac64c441 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateMessageBuilder.java @@ -1,16 +1,16 @@ package com.javadiscord.jdi.core.api.builders; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.ChannelMention; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.message.MessageReference; import com.javadiscord.jdi.core.models.message.embed.Embed; import com.javadiscord.jdi.internal.api.channel.CreateMessageRequest; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - public class CreateMessageBuilder { private final long channelId; private Optional content; @@ -111,19 +111,20 @@ public CreateMessageBuilder enforceNonce(boolean enforceNonce) { public CreateMessageRequest build() { return new CreateMessageRequest( - channelId, - content, - nonce, - tts, - embeds, - mentions, - messageReferences, - components, - stickerIds, - files, - payloadJson, - attachments, - flags, - enforceNonce); + channelId, + content, + nonce, + tts, + embeds, + mentions, + messageReferences, + components, + stickerIds, + files, + payloadJson, + attachments, + flags, + enforceNonce + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateScheduledEventBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateScheduledEventBuilder.java index 4aa2c981..1b73642b 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateScheduledEventBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateScheduledEventBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api.builders; +import java.time.OffsetDateTime; +import java.util.Optional; + import com.javadiscord.jdi.core.models.guild.EntityMetadata; import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEntityType; import com.javadiscord.jdi.internal.api.guild_scheduled_event.CreateScheduledEventRequest; -import java.time.OffsetDateTime; -import java.util.Optional; - public class CreateScheduledEventBuilder { private long guildId; private final String name; @@ -21,7 +21,8 @@ public class CreateScheduledEventBuilder { private Optional image; public CreateScheduledEventBuilder( - String name, ScheduledEntityType entityType, OffsetDateTime scheduledStartTime) { + String name, ScheduledEntityType entityType, OffsetDateTime scheduledStartTime + ) { this.name = name; this.entityType = entityType; this.privacyLevel = 2; @@ -60,16 +61,17 @@ public CreateScheduledEventBuilder image(String image) { public CreateScheduledEventRequest build() { return new CreateScheduledEventRequest( - guildId, - channelId, - entityMetadata, - name, - privacyLevel, - scheduledStartTime, - scheduledEndTime, - description, - entityType, - image); + guildId, + channelId, + entityMetadata, + name, + privacyLevel, + scheduledStartTime, + scheduledEndTime, + description, + entityType, + image + ); } public CreateScheduledEventBuilder guildId(long guildId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateStageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateStageBuilder.java index 2d8febdc..831d4c18 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateStageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateStageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.stage.CreateStageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.stage.CreateStageRequest; + public class CreateStageBuilder { private final long channelId; private final String topic; @@ -38,11 +38,12 @@ public CreateStageBuilder auditReason(String auditReason) { public CreateStageRequest build() { return new CreateStageRequest( - channelId, - topic, - privacyLevel, - sendStartNotification, - guildScheduledEventId, - auditReason); + channelId, + topic, + privacyLevel, + sendStartNotification, + guildScheduledEventId, + auditReason + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateWebhookBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateWebhookBuilder.java index 08abf626..2f9bcb76 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateWebhookBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateWebhookBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.CreateWebhookRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.CreateWebhookRequest; + public final class CreateWebhookBuilder { private final long channelId; private final String name; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookBuilder.java index 2b0c6a12..1b651ab2 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookRequest; + public final class DeleteWebhookBuilder { private final long webhookId; private Optional reason; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookMessageBuilder.java index 6ec145f3..8e8d2113 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookMessageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookMessageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookMessageRequest; + public final class DeleteWebhookMessageBuilder { private final long webhookId; private final String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookWithTokenBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookWithTokenBuilder.java index 58b8ceea..62c70dcf 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookWithTokenBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/DeleteWebhookWithTokenBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookWithTokenRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.DeleteWebhookWithTokenRequest; + public final class DeleteWebhookWithTokenBuilder { private final long webhookId; private final String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditChannelPermissionsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditChannelPermissionsBuilder.java index 725a3af7..6585413b 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditChannelPermissionsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditChannelPermissionsBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.EditChannelPermissionsRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.EditChannelPermissionsRequest; + public class EditChannelPermissionsBuilder { private final long channelId; private final long overwriteId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditMessageBuilder.java index c957d64a..b5858f44 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditMessageBuilder.java @@ -1,14 +1,14 @@ package com.javadiscord.jdi.core.api.builders; +import java.nio.file.Path; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.ChannelMention; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.message.embed.Embed; import com.javadiscord.jdi.internal.api.channel.EditMessageRequest; -import java.nio.file.Path; -import java.util.List; -import java.util.Optional; - public class EditMessageBuilder { private final long channelId; private final long messageId; @@ -69,14 +69,15 @@ public EditMessageBuilder attachments(List attachments) { public EditMessageRequest build() { return new EditMessageRequest( - channelId, - messageId, - content, - embeds, - flags, - allowedMentions, - components, - files, - attachments); + channelId, + messageId, + content, + embeds, + flags, + allowedMentions, + components, + files, + attachments + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditWebhookMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditWebhookMessageBuilder.java index 3476aedc..1a60036b 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditWebhookMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/EditWebhookMessageBuilder.java @@ -1,15 +1,15 @@ package com.javadiscord.jdi.core.api.builders; +import java.nio.file.Path; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.AllowedMentions; import com.javadiscord.jdi.core.models.message.Component; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.message.embed.Embed; import com.javadiscord.jdi.internal.api.webhook.EditWebhookMessageRequest; -import java.nio.file.Path; -import java.util.List; -import java.util.Optional; - public final class EditWebhookMessageBuilder { private final long webhookId; private final String webhookToken; @@ -72,15 +72,16 @@ public EditWebhookMessageBuilder attachments(List attachments public EditWebhookMessageRequest build() { return new EditWebhookMessageRequest( - this.webhookId, - this.webhookToken, - this.messageId, - this.threadId, - this.content, - this.embeds, - this.allowedMentions, - this.components, - this.files, - this.attachments); + this.webhookId, + this.webhookToken, + this.messageId, + this.threadId, + this.content, + this.embeds, + this.allowedMentions, + this.components, + this.files, + this.attachments + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteGithubCompatibleWebhookBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteGithubCompatibleWebhookBuilder.java index 5c7c9c67..fd34e582 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteGithubCompatibleWebhookBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteGithubCompatibleWebhookBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.ExecuteGithubCompatibleWebhookRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.ExecuteGithubCompatibleWebhookRequest; + public final class ExecuteGithubCompatibleWebhookBuilder { private final long webhookId; private final String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteSlackCompatibleWebhooBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteSlackCompatibleWebhooBuilder.java index fd5344bd..b1b2661e 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteSlackCompatibleWebhooBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteSlackCompatibleWebhooBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.ExecuteSlackCompatibleWebhookRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.ExecuteSlackCompatibleWebhookRequest; + public final class ExecuteSlackCompatibleWebhooBuilder { private long webhookId; private String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteWebhookBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteWebhookBuilder.java index 06d679d2..24993d5d 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteWebhookBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ExecuteWebhookBuilder.java @@ -1,15 +1,15 @@ package com.javadiscord.jdi.core.api.builders; +import java.nio.file.Path; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.AllowedMentions; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.message.embed.Embed; import com.javadiscord.jdi.core.models.poll.Poll; import com.javadiscord.jdi.internal.api.webhook.ExecuteWebhookRequest; -import java.nio.file.Path; -import java.util.List; -import java.util.Optional; - public final class ExecuteWebhookBuilder { private final long webhookId; private final String webhookToken; @@ -126,22 +126,23 @@ public ExecuteWebhookBuilder poll(Poll poll) { public ExecuteWebhookRequest build() { return new ExecuteWebhookRequest( - webhookId, - webhookToken, - waits, - threadId, - content, - username, - avatarUrl, - tts, - embeds, - allowedMentions, - components, - files, - attachments, - flags, - threadName, - appliedTags, - poll); + webhookId, + webhookToken, + waits, + threadId, + content, + username, + avatarUrl, + tts, + embeds, + allowedMentions, + components, + files, + attachments, + flags, + threadName, + appliedTags, + poll + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchChannelMessagesBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchChannelMessagesBuilder.java index 0be5492b..d2883396 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchChannelMessagesBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchChannelMessagesBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.FetchChannelMessagesRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.FetchChannelMessagesRequest; + public class FetchChannelMessagesBuilder { private final long channelId; private Optional around; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchUserReactionsToMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchUserReactionsToMessageBuilder.java index ac215ec5..6c67e888 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchUserReactionsToMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/FetchUserReactionsToMessageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.FetchUserReactionsToMessageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.FetchUserReactionsToMessageRequest; + public class FetchUserReactionsToMessageBuilder { private final long channelId; private final long messageId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAnswerVotersBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAnswerVotersBuilder.java index f1871e8f..f0619564 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAnswerVotersBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAnswerVotersBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.poll.GetAnswerVotersRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.poll.GetAnswerVotersRequest; + public class GetAnswerVotersBuilder { private final long channelId; private final long messageId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAuditLogsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAuditLogsBuilder.java index 6f2852b2..d47e6667 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAuditLogsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetAuditLogsBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.audit_logs.GetGuildAuditLogRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.audit_logs.GetGuildAuditLogRequest; + public class GetAuditLogsBuilder { private long guildId; private Optional userId; @@ -54,7 +54,14 @@ public GetAuditLogsBuilder reason(String reason) { public GetGuildAuditLogRequest build() { return new GetGuildAuditLogRequest( - guildId, userId, actionType, before, after, limit, reason); + guildId, + userId, + actionType, + before, + after, + limit, + reason + ); } public GetAuditLogsBuilder guildId(long guildId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetCurrentUserGuildsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetCurrentUserGuildsBuilder.java index 4a0a1435..9783c8ab 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetCurrentUserGuildsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetCurrentUserGuildsBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.user.GetCurrentUserGuildsRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.user.GetCurrentUserGuildsRequest; + public class GetCurrentUserGuildsBuilder { private Optional before; private Optional after; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBansBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBansBuilder.java index e4c96c2e..d27dea83 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBansBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBansBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.GetGuildBansRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.GetGuildBansRequest; + public class GetGuildBansBuilder { private long guildId; private Optional limit; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBuilder.java index 1feb4924..4d50c7a6 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.GetGuildRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.GetGuildRequest; + public final class GetGuildBuilder { private long guildId; private Optional withCounts; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildPruneCountBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildPruneCountBuilder.java index 3cf981b5..89270ed1 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildPruneCountBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildPruneCountBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.GetGuildPruneCountRequest; - import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.GetGuildPruneCountRequest; + public final class GetGuildPruneCountBuilder { private long guildId; private Optional days; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildWidgetImageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildWidgetImageBuilder.java index 3ebd5d57..fcd46083 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildWidgetImageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetGuildWidgetImageBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.Optional; + import com.javadiscord.jdi.core.models.guild.WidgetStyleOptions; import com.javadiscord.jdi.internal.api.guild.GetGuildWidgetImageRequest; -import java.util.Optional; - public final class GetGuildWidgetImageBuilder { private long guildId; private Optional style; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetInviteBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetInviteBuilder.java index 82d48f58..584f1456 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetInviteBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetInviteBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.invite.GetInviteRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.invite.GetInviteRequest; + public class GetInviteBuilder { private final String inviteCode; private Optional withCounts; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventBuilder.java index 8e2c1ee4..242fb457 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild_scheduled_event.GetScheduledEventRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild_scheduled_event.GetScheduledEventRequest; + public class GetScheduledEventBuilder { private long guildId; private final long scheduledEventId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventUsersBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventUsersBuilder.java index 60e6ce30..878c7c88 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventUsersBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetScheduledEventUsersBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild_scheduled_event.GetScheduledEventUsersRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild_scheduled_event.GetScheduledEventUsersRequest; + public class GetScheduledEventUsersBuilder { private long guildId; private final long scheduledEventId; @@ -42,7 +42,13 @@ public GetScheduledEventUsersBuilder after(long after) { public GetScheduledEventUsersRequest build() { return new GetScheduledEventUsersRequest( - guildId, scheduledEventId, limit, withMember, before, after); + guildId, + scheduledEventId, + limit, + withMember, + before, + after + ); } public GetScheduledEventUsersBuilder guildId(long guildId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetWebhookMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetWebhookMessageBuilder.java index 0e43ac17..62b98b3c 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetWebhookMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GetWebhookMessageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.GetWebhookMessageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.GetWebhookMessageRequest; + public final class GetWebhookMessageBuilder { private final long webhookId; private final String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GuildBanBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GuildBanBuilder.java index 6a876bfa..1c61bbb4 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/GuildBanBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/GuildBanBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.CreateGuildBanRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.CreateGuildBanRequest; + public class GuildBanBuilder { private long guildId; private final long userId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListGuildMembersBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListGuildMembersBuilder.java index 33486ad0..86b6f430 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListGuildMembersBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListGuildMembersBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ListGuildMembersRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ListGuildMembersRequest; + public final class ListGuildMembersBuilder { private long guildId; private Optional limit; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListJoinedPrivateArchivedThreadsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListJoinedPrivateArchivedThreadsBuilder.java index f20b1e96..4e96bf03 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListJoinedPrivateArchivedThreadsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListJoinedPrivateArchivedThreadsBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.ListJoinedPrivateArchivedThreadsRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.ListJoinedPrivateArchivedThreadsRequest; + public class ListJoinedPrivateArchivedThreadsBuilder { private final long channelId; private Optional before; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPrivateArchivedThreadsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPrivateArchivedThreadsBuilder.java index aa7c49f5..db3eb713 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPrivateArchivedThreadsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPrivateArchivedThreadsBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.ListPrivateArchivedThreadsRequest; - import java.time.OffsetDateTime; import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.ListPrivateArchivedThreadsRequest; + public class ListPrivateArchivedThreadsBuilder { private final long channelId; private Optional before; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPublicArchivedThreadsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPublicArchivedThreadsBuilder.java index 1cebd50f..0070f3cb 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPublicArchivedThreadsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListPublicArchivedThreadsBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.ListPublicArchivedThreadsRequest; - import java.time.OffsetDateTime; import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.ListPublicArchivedThreadsRequest; + public class ListPublicArchivedThreadsBuilder { private final long channelId; private Optional before; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListScheduledEventsBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListScheduledEventsBuilder.java index 6d4b33f9..aea592a7 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListScheduledEventsBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListScheduledEventsBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild_scheduled_event.ListScheduledEventsRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild_scheduled_event.ListScheduledEventsRequest; + public class ListScheduledEventsBuilder { private long guildId; private Optional withUserCount; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListThreadMembersBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListThreadMembersBuilder.java index aaa873eb..6f96c9e9 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListThreadMembersBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ListThreadMembersBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.ListThreadMembersRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.ListThreadMembersRequest; + public class ListThreadMembersBuilder { private final long channelId; private Optional withMember; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyAutoModerationRuleBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyAutoModerationRuleBuilder.java index 8e2b716a..54fe4e1e 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyAutoModerationRuleBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyAutoModerationRuleBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.List; +import java.util.Optional; + import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; import com.javadiscord.jdi.internal.api.auto_moderation.ModifyAutoModerationRuleRequest; -import java.util.List; -import java.util.Optional; - public class ModifyAutoModerationRuleBuilder { private long guildId; private final long autoModerationRuleId; @@ -40,7 +40,8 @@ public ModifyAutoModerationRuleBuilder eventType(Integer eventType) { } public ModifyAutoModerationRuleBuilder triggerMetadata( - AutoModerationTriggerMetadata triggerMetadata) { + AutoModerationTriggerMetadata triggerMetadata + ) { this.triggerMetadata = Optional.of(triggerMetadata); return this; } @@ -67,15 +68,16 @@ public ModifyAutoModerationRuleBuilder exemptChannel(List exemptChannel) { public ModifyAutoModerationRuleRequest build() { return new ModifyAutoModerationRuleRequest( - guildId, - autoModerationRuleId, - name, - eventType, - triggerMetadata, - actions, - enabled, - exemptRoles, - exemptChannel); + guildId, + autoModerationRuleId, + name, + eventType, + triggerMetadata, + actions, + enabled, + exemptRoles, + exemptChannel + ); } public ModifyAutoModerationRuleBuilder guildId(long guildId) { diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentMemberBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentMemberBuilder.java index 3ae45128..35350df6 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentMemberBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentMemberBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyCurrentMemberRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyCurrentMemberRequest; + public final class ModifyCurrentMemberBuilder { private long guildId; private Optional nick; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserBuilder.java index 4cc643e0..85109e06 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.user.ModifyCurrentUserRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.user.ModifyCurrentUserRequest; + public class ModifyCurrentUserBuilder { private final String username; private Optional avatarImage; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserNickBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserNickBuilder.java index 737cba8c..7a9557d7 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserNickBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserNickBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyCurrentUserNickRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyCurrentUserNickRequest; + public final class ModifyCurrentUserNickBuilder { private long guildId; private Optional nick; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserVoiceStateBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserVoiceStateBuilder.java index 945d154b..04b637e9 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserVoiceStateBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyCurrentUserVoiceStateBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyCurrentUserVoiceStateRequest; - import java.time.OffsetDateTime; import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyCurrentUserVoiceStateRequest; + public final class ModifyCurrentUserVoiceStateBuilder { private long guildId; private Optional channelId; @@ -33,13 +33,18 @@ public ModifyCurrentUserVoiceStateBuilder suppress(boolean suppress) { } public ModifyCurrentUserVoiceStateBuilder requestToSpeakTimestamp( - OffsetDateTime requestToSpeakTimestamp) { + OffsetDateTime requestToSpeakTimestamp + ) { this.requestToSpeakTimestamp = Optional.of(requestToSpeakTimestamp); return this; } public ModifyCurrentUserVoiceStateRequest build() { return new ModifyCurrentUserVoiceStateRequest( - guildId, channelId, suppress, requestToSpeakTimestamp); + guildId, + channelId, + suppress, + requestToSpeakTimestamp + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyEmojiBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyEmojiBuilder.java index 1e5ab1be..1915441d 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyEmojiBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyEmojiBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.emojis.ModifyEmojiRequest; - import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.internal.api.emojis.ModifyEmojiRequest; + public class ModifyEmojiBuilder { private long guildId; private final long emojiId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildBuilder.java index c4ce3aa3..41a25d2c 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildBuilder.java @@ -1,11 +1,11 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.core.models.guild.GuildFeature; -import com.javadiscord.jdi.internal.api.guild.ModifyGuildRequest; - import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.core.models.guild.GuildFeature; +import com.javadiscord.jdi.internal.api.guild.ModifyGuildRequest; + public final class ModifyGuildBuilder { private long guildId; private Optional name; @@ -154,26 +154,27 @@ public ModifyGuildBuilder safetyAlertsChannelId(long safetyAlertsChannelId) { public ModifyGuildRequest build() { return new ModifyGuildRequest( - guildId, - name, - verificationLevel, - defaultMessageNotifications, - explicitContentFilter, - afkChannelId, - afkTimeout, - icon, - ownerId, - splash, - discoverySplash, - banner, - systemChannelId, - systemChannelFlags, - rulesChannelId, - publicUpdatesChannelId, - preferredLocale, - features, - description, - premiumProgressBarEnabled, - safetyAlertsChannelId); + guildId, + name, + verificationLevel, + defaultMessageNotifications, + explicitContentFilter, + afkChannelId, + afkTimeout, + icon, + ownerId, + splash, + discoverySplash, + banner, + systemChannelId, + systemChannelFlags, + rulesChannelId, + publicUpdatesChannelId, + preferredLocale, + features, + description, + premiumProgressBarEnabled, + safetyAlertsChannelId + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildMemberBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildMemberBuilder.java index 2a9aea46..0b79d9e8 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildMemberBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildMemberBuilder.java @@ -1,11 +1,11 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyGuildMemberRequest; - import java.time.OffsetDateTime; import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyGuildMemberRequest; + public final class ModifyGuildMemberBuilder { private long guildId; private final long userId; @@ -59,7 +59,8 @@ public ModifyGuildMemberBuilder channelId(long channelId) { } public ModifyGuildMemberBuilder communicationDisabledUntil( - OffsetDateTime communicationDisabledUntil) { + OffsetDateTime communicationDisabledUntil + ) { this.communicationDisabledUntil = Optional.of(communicationDisabledUntil); return this; } @@ -71,14 +72,15 @@ public ModifyGuildMemberBuilder flags(int flags) { public ModifyGuildMemberRequest build() { return new ModifyGuildMemberRequest( - guildId, - userId, - nick, - roles, - mute, - deafen, - channelId, - communicationDisabledUntil, - flags); + guildId, + userId, + nick, + roles, + mute, + deafen, + channelId, + communicationDisabledUntil, + flags + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildRoleBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildRoleBuilder.java index eba6f219..59723ff2 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildRoleBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildRoleBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyGuildRoleRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyGuildRoleRequest; + public final class ModifyGuildRoleBuilder { private long guildId; private final long roleId; @@ -68,6 +68,15 @@ public ModifyGuildRoleBuilder mentionable(boolean mentionable) { public ModifyGuildRoleRequest build() { return new ModifyGuildRoleRequest( - guildId, roleId, name, permissions, color, hoist, icon, unicodeEmoji, mentionable); + guildId, + roleId, + name, + permissions, + color, + hoist, + icon, + unicodeEmoji, + mentionable + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildStickerBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildStickerBuilder.java index 67967959..643ba11d 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildStickerBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildStickerBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.sticker.ModifyGuildStickerRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.sticker.ModifyGuildStickerRequest; + public class ModifyGuildStickerBuilder { private long guildId; private final long stickerId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWelcomeScreenBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWelcomeScreenBuilder.java index a584ac9f..4e4caf85 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWelcomeScreenBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWelcomeScreenBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.Optional; + import com.javadiscord.jdi.core.models.guild.WelcomeScreenChannel; import com.javadiscord.jdi.internal.api.guild.ModifyGuildWelcomeScreenRequest; -import java.util.Optional; - public final class ModifyGuildWelcomeScreenBuilder { private long guildId; private Optional enabled; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWidgetBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWidgetBuilder.java index b3998879..f6e35187 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWidgetBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyGuildWidgetBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyGuildWidgetRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyGuildWidgetRequest; + public final class ModifyGuildWidgetBuilder { private long guildId; private Optional enabled; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyScheduledEventBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyScheduledEventBuilder.java index b587b542..f5a0eec6 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyScheduledEventBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyScheduledEventBuilder.java @@ -1,11 +1,11 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.Optional; + import com.javadiscord.jdi.core.models.guild.EntityMetadata; import com.javadiscord.jdi.core.models.guild.PrivacyLevel; import com.javadiscord.jdi.internal.api.guild_scheduled_event.ModifyScheduledEventRequest; -import java.util.Optional; - public class ModifyScheduledEventBuilder { private final long guildId; private final long scheduledEventId; @@ -87,17 +87,18 @@ public ModifyScheduledEventBuilder image(String image) { public ModifyScheduledEventRequest build() { return new ModifyScheduledEventRequest( - guildId, - scheduledEventId, - channelId, - entityMetadata, - name, - privacyLevel, - scheduledStartTime, - scheduledEndTim, - description, - entityType, - status, - image); + guildId, + scheduledEventId, + channelId, + entityMetadata, + name, + privacyLevel, + scheduledStartTime, + scheduledEndTim, + description, + entityType, + status, + image + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyStageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyStageBuilder.java index 8c13d7de..f4402554 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyStageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyStageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.stage.ModifyStageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.stage.ModifyStageRequest; + public class ModifyStageBuilder { private final long channelId; private Optional topic; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyUserVoiceStateBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyUserVoiceStateBuilder.java index 3489ee0d..e0409ceb 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyUserVoiceStateBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyUserVoiceStateBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.ModifyUserVoiceStateRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.ModifyUserVoiceStateRequest; + public final class ModifyUserVoiceStateBuilder { private long guildId; private final long userId; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookBuilder.java index 7bc4547d..38d20dfe 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.ModifyWebhookRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.ModifyWebhookRequest; + public final class ModifyWebhookBuilder { private final String webhookId; private Optional name; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookWithTokenBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookWithTokenBuilder.java index 53090d49..5724c63a 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookWithTokenBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/ModifyWebhookWithTokenBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.webhook.ModifyWebhookWithTokenRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.webhook.ModifyWebhookWithTokenRequest; + public final class ModifyWebhookWithTokenBuilder { private final long webhookId; private final String webhookToken; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/SearchGuildMembersBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/SearchGuildMembersBuilder.java index 81d5f31b..1b7744d3 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/SearchGuildMembersBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/SearchGuildMembersBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.guild.SearchGuildMembersRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.guild.SearchGuildMembersRequest; + public final class SearchGuildMembersBuilder { private long guildId; private Optional query; diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadFromMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadFromMessageBuilder.java index ccf04dfe..4d0721a6 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadFromMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadFromMessageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.StartThreadFromMessageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.StartThreadFromMessageRequest; + public class StartThreadFromMessageBuilder { private final long channelId; private final long messageId; @@ -31,6 +31,11 @@ public StartThreadFromMessageBuilder rateLimitPerUser(int rate) { public StartThreadFromMessageRequest build() { return new StartThreadFromMessageRequest( - channelId, messageId, name, autoArchiveDuration, rateLimitPerUser); + channelId, + messageId, + name, + autoArchiveDuration, + rateLimitPerUser + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadInForumOrMediaChannelBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadInForumOrMediaChannelBuilder.java index a479324e..b9d4506b 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadInForumOrMediaChannelBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadInForumOrMediaChannelBuilder.java @@ -1,12 +1,12 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.core.models.channel.ForumAndMediaThreadMessageParams; -import com.javadiscord.jdi.internal.api.channel.StartThreadInForumOrMediaChannelRequest; - import java.nio.file.Path; import java.util.List; import java.util.Optional; +import com.javadiscord.jdi.core.models.channel.ForumAndMediaThreadMessageParams; +import com.javadiscord.jdi.internal.api.channel.StartThreadInForumOrMediaChannelRequest; + public class StartThreadInForumOrMediaChannelBuilder { private final long channelId; private final String name; @@ -17,7 +17,8 @@ public class StartThreadInForumOrMediaChannelBuilder { private Optional> files; public StartThreadInForumOrMediaChannelBuilder( - long channelId, String name, ForumAndMediaThreadMessageParams message) { + long channelId, String name, ForumAndMediaThreadMessageParams message + ) { this.channelId = channelId; this.name = name; this.message = message; @@ -49,12 +50,13 @@ public StartThreadInForumOrMediaChannelBuilder files(List files) { public StartThreadInForumOrMediaChannelRequest build() { return new StartThreadInForumOrMediaChannelRequest( - channelId, - name, - autoArchiveDuration, - rateLimitPerUser, - message, - appliedTags, - files); + channelId, + name, + autoArchiveDuration, + rateLimitPerUser, + message, + appliedTags, + files + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadWithoutMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadWithoutMessageBuilder.java index cbadc7fe..ff836082 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadWithoutMessageBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/StartThreadWithoutMessageBuilder.java @@ -1,9 +1,9 @@ package com.javadiscord.jdi.core.api.builders; -import com.javadiscord.jdi.internal.api.channel.StartThreadWithoutMessageRequest; - import java.util.Optional; +import com.javadiscord.jdi.internal.api.channel.StartThreadWithoutMessageRequest; + public class StartThreadWithoutMessageBuilder { private final long channelId; private final String name; @@ -43,6 +43,12 @@ public StartThreadWithoutMessageBuilder rateLimitPerUser(int rateLimitPerUser) { public StartThreadWithoutMessageRequest build() { return new StartThreadWithoutMessageRequest( - channelId, name, autoArchiveDuration, type, invitable, rateLimitPerUser); + channelId, + name, + autoArchiveDuration, + type, + invitable, + rateLimitPerUser + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/UpdateCurrentUserApplicationRoleConnectionBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/UpdateCurrentUserApplicationRoleConnectionBuilder.java index b7bd9d58..b74ed523 100644 --- a/api/src/main/java/com/javadiscord/jdi/core/api/builders/UpdateCurrentUserApplicationRoleConnectionBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/core/api/builders/UpdateCurrentUserApplicationRoleConnectionBuilder.java @@ -1,10 +1,10 @@ package com.javadiscord.jdi.core.api.builders; +import java.util.Optional; + import com.javadiscord.jdi.core.models.application.ApplicationRoleConnectionMetadata; import com.javadiscord.jdi.internal.api.user.UpdateCurrentUserApplicationRoleConnectionRequest; -import java.util.Optional; - public class UpdateCurrentUserApplicationRoleConnectionBuilder { private final long applicationId; private Optional platformName; @@ -24,19 +24,25 @@ public UpdateCurrentUserApplicationRoleConnectionBuilder platformName(String pla } public UpdateCurrentUserApplicationRoleConnectionBuilder platformUsername( - String platformUsername) { + String platformUsername + ) { this.platformUsername = Optional.of(platformUsername); return this; } public UpdateCurrentUserApplicationRoleConnectionBuilder metadata( - ApplicationRoleConnectionMetadata metadata) { + ApplicationRoleConnectionMetadata metadata + ) { this.metadata = Optional.of(metadata); return this; } public UpdateCurrentUserApplicationRoleConnectionRequest build() { return new UpdateCurrentUserApplicationRoleConnectionRequest( - applicationId, platformName, platformUsername, metadata); + applicationId, + platformName, + platformUsername, + metadata + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestBuilder.java b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestBuilder.java index 31024a9d..b17f82cd 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestBuilder.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestBuilder.java @@ -1,20 +1,20 @@ package com.javadiscord.jdi.internal.api; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.github.mizosoft.methanol.MultipartBodyPublisher; - import java.net.URLEncoder; import java.net.http.HttpRequest; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.github.mizosoft.methanol.MultipartBodyPublisher; + public class DiscordRequestBuilder { private static final ObjectMapper OBJECT_MAPPER = - JsonMapper.builder().addModule(new JavaTimeModule()).build(); + JsonMapper.builder().addModule(new JavaTimeModule()).build(); private final DiscordResponseFuture future = new DiscordResponseFuture(); private final Map headers = new HashMap<>(); private final Map queryParameters = new HashMap<>(); @@ -97,7 +97,8 @@ protected String getQueryParameters() { encodedParams.append(URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8)); encodedParams.append("="); encodedParams.append( - URLEncoder.encode(String.valueOf(entry.getValue()), StandardCharsets.UTF_8)); + URLEncoder.encode(String.valueOf(entry.getValue()), StandardCharsets.UTF_8) + ); } return encodedParams.toString(); } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java index f9a67027..32dbe0ef 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java @@ -1,8 +1,5 @@ package com.javadiscord.jdi.internal.api; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; @@ -13,11 +10,14 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class DiscordRequestDispatcher implements Runnable { private static final String BASE_URL = - System.getProperty("DISCORD_BASE_URL") != null - ? System.getProperty("DISCORD_BASE_URL") - : "https://discord.com/api"; + System.getProperty("DISCORD_BASE_URL") != null + ? System.getProperty("DISCORD_BASE_URL") + : "https://discord.com/api"; private static final Logger LOGGER = LogManager.getLogger(); private final HttpClient httpClient; @@ -73,16 +73,19 @@ public void stop() { private void sendRequest(DiscordRequestBuilder discordRequestBuilder) { try { HttpRequest.Builder requestBuilder = - HttpRequest.newBuilder() - .uri( - URI.create( - "%s%s%s" - .formatted( - BASE_URL, - discordRequestBuilder.getPath(), - discordRequestBuilder - .getQueryParameters()))) - .header("Authorization", "Bot " + botToken); + HttpRequest.newBuilder() + .uri( + URI.create( + "%s%s%s" + .formatted( + BASE_URL, + discordRequestBuilder.getPath(), + discordRequestBuilder + .getQueryParameters() + ) + ) + ) + .header("Authorization", "Bot " + botToken); if (!discordRequestBuilder.getHeaders().containsKey("Content-Type")) { requestBuilder.headers("Content-Type", "application/json"); @@ -98,36 +101,43 @@ private void sendRequest(DiscordRequestBuilder discordRequestBuilder) { case HttpMethod.DELETE -> requestBuilder.DELETE(); case HttpMethod.PUT -> requestBuilder.PUT(discordRequestBuilder.getBody()); case HttpMethod.PATCH -> - requestBuilder.method( - HttpMethod.PATCH.name(), discordRequestBuilder.getBody()); + requestBuilder.method( + HttpMethod.PATCH.name(), discordRequestBuilder.getBody() + ); default -> - throw new IllegalArgumentException( - "Unsupported HTTP method: " + discordRequestBuilder.getMethod()); + throw new IllegalArgumentException( + "Unsupported HTTP method: " + discordRequestBuilder.getMethod() + ); } HttpRequest httpRequest = requestBuilder.build(); HttpResponse response = - httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString()); + httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString()); numberOfRequestsSent++; timeSinceLastRequest = System.currentTimeMillis(); discordRequestBuilder.setSuccessResult( - new DiscordResponse( - response.body(), response.statusCode(), response.headers().map())); + new DiscordResponse( + response.body(), + response.statusCode(), + response.headers().map() + ) + ); } catch (Exception e) { LOGGER.error( - "Failed to send request to {}{}", BASE_URL, discordRequestBuilder.getPath(), e); + "Failed to send request to {}{}", BASE_URL, discordRequestBuilder.getPath(), e + ); discordRequestBuilder.setFailureError(e); } } private static String[] headerMapToStringArr(Map headers) { return headers.keySet().stream() - .flatMap(key -> Stream.of(key, headers.get(key).toString())) - .toList() - .toArray(new String[0]); + .flatMap(key -> Stream.of(key, headers.get(key).toString())) + .toList() + .toArray(new String[0]); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/application/EditCurrentApplicationRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/application/EditCurrentApplicationRequest.java index 03d865be..800ebc25 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/application/EditCurrentApplicationRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/application/EditCurrentApplicationRequest.java @@ -1,41 +1,43 @@ package com.javadiscord.jdi.internal.api.application; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.core.models.application.ApplicationInstallParams; import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.List; -import java.util.Map; - public record EditCurrentApplicationRequest( - String customInstallUrl, - String description, - String roleConnectionsVerificationUrl, - ApplicationInstallParams installParams, - Map integrationTypesConfig, - int flags, - String icon, - String coverImage, - String interactionsEndpointUrl, - List tags) - implements DiscordRequest { + String customInstallUrl, + String description, + String roleConnectionsVerificationUrl, + ApplicationInstallParams installParams, + Map integrationTypesConfig, + int flags, + String icon, + String coverImage, + String interactionsEndpointUrl, + List tags +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .patch() - .path("/applications/@me") - .body( - Map.of( - "custom_install_url", customInstallUrl, - "description", description, - "role_connections_verification_url", roleConnectionsVerificationUrl, - "install_params", installParams, - "integration_types_config", integrationTypesConfig, - "flags", flags, - "icon", icon, - "cover_image", coverImage, - "interactions_endpoint_url", interactionsEndpointUrl, - "tags", tags)); + .patch() + .path("/applications/@me") + .body( + Map.of( + "custom_install_url", customInstallUrl, + "description", description, + "role_connections_verification_url", roleConnectionsVerificationUrl, + "install_params", installParams, + "integration_types_config", integrationTypesConfig, + "flags", flags, + "icon", icon, + "cover_image", coverImage, + "interactions_endpoint_url", interactionsEndpointUrl, + "tags", tags + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/GetApplicationRoleConnectionMetadataRecords.java b/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/GetApplicationRoleConnectionMetadataRecords.java index 7c80ffb9..f25e29e5 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/GetApplicationRoleConnectionMetadataRecords.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/GetApplicationRoleConnectionMetadataRecords.java @@ -3,13 +3,14 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record GetApplicationRoleConnectionMetadataRecords(long applicationId) - implements DiscordRequest { +public record GetApplicationRoleConnectionMetadataRecords( + long applicationId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .path("/applications/%s/role-connections/metadata".formatted(applicationId)) - .get(); + .path("/applications/%s/role-connections/metadata".formatted(applicationId)) + .get(); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/UpdateApplicationRoleConnectionMetadataRecords.java b/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/UpdateApplicationRoleConnectionMetadataRecords.java index b9bf8a4a..64776c48 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/UpdateApplicationRoleConnectionMetadataRecords.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/UpdateApplicationRoleConnectionMetadataRecords.java @@ -5,14 +5,15 @@ import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; public record UpdateApplicationRoleConnectionMetadataRecords( - long applicationId, ApplicationRoleConnectionMetadata applicationRoleConnectionMetadata) - implements DiscordRequest { + long applicationId, + ApplicationRoleConnectionMetadata applicationRoleConnectionMetadata +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .path("/applications/%s/role-connections/metadata".formatted(applicationId)) - .put() - .body(applicationRoleConnectionMetadata); + .path("/applications/%s/role-connections/metadata".formatted(applicationId)) + .put() + .body(applicationRoleConnectionMetadata); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/audit_logs/GetGuildAuditLogRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/audit_logs/GetGuildAuditLogRequest.java index 14eded03..3ae11191 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/audit_logs/GetGuildAuditLogRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/audit_logs/GetGuildAuditLogRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.audit_logs; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record GetGuildAuditLogRequest( - long guildId, - Optional userId, - Optional actionType, - Optional before, - Optional after, - Optional limit, - Optional reason) - implements DiscordRequest { + long guildId, + Optional userId, + Optional actionType, + Optional before, + Optional after, + Optional limit, + Optional reason +) implements DiscordRequest { public GetGuildAuditLogRequest { if (limit.isPresent() && (limit.get() > 100 || limit.get() < 1)) { @@ -24,7 +24,7 @@ public record GetGuildAuditLogRequest( @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().get().path("/guilds/%s/audit-logs".formatted(guildId)); + new DiscordRequestBuilder().get().path("/guilds/%s/audit-logs".formatted(guildId)); userId.ifPresent(val -> discordRequestBuilder.queryParam("user_id", val)); actionType.ifPresent(val -> discordRequestBuilder.queryParam("action_type", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/CreateAutoModerationRuleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/CreateAutoModerationRuleRequest.java index 806948c4..c0451717 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/CreateAutoModerationRuleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/CreateAutoModerationRuleRequest.java @@ -1,26 +1,26 @@ package com.javadiscord.jdi.internal.api.auto_moderation; -import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; -import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; +import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateAutoModerationRuleRequest( - long guildId, - String name, - int eventType, - int triggerType, - List actions, - Optional triggerMetadata, - Optional enabled, - Optional> exemptRoles, - Optional> exemptChannels) - implements DiscordRequest { + long guildId, + String name, + int eventType, + int triggerType, + List actions, + Optional triggerMetadata, + Optional enabled, + Optional> exemptRoles, + Optional> exemptChannels +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -35,8 +35,8 @@ public DiscordRequestBuilder create() { exemptChannels.ifPresent(val -> body.put("exempt_channels", val)); return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/auto-moderation/rules".formatted(guildId)) - .body(body); + .post() + .path("/guilds/%s/auto-moderation/rules".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/DeleteAutoModerationRuleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/DeleteAutoModerationRuleRequest.java index 14996bdc..eab75679 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/DeleteAutoModerationRuleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/DeleteAutoModerationRuleRequest.java @@ -3,14 +3,17 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteAutoModerationRuleRequest(long guildId, long autoModerationRuleId) - implements DiscordRequest { +public record DeleteAutoModerationRuleRequest( + long guildId, + long autoModerationRuleId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path( - "/guilds/%s/auto-moderation/rules/%s" - .formatted(guildId, autoModerationRuleId)); + .delete() + .path( + "/guilds/%s/auto-moderation/rules/%s" + .formatted(guildId, autoModerationRuleId) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/GetAutoModerationRuleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/GetAutoModerationRuleRequest.java index df546ef2..07c80a7d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/GetAutoModerationRuleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/GetAutoModerationRuleRequest.java @@ -3,14 +3,17 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record GetAutoModerationRuleRequest(long guildId, long autoModerationRuleId) - implements DiscordRequest { +public record GetAutoModerationRuleRequest( + long guildId, + long autoModerationRuleId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path( - "/guilds/%s/auto-moderation/rules/%s" - .formatted(guildId, autoModerationRuleId)); + .get() + .path( + "/guilds/%s/auto-moderation/rules/%s" + .formatted(guildId, autoModerationRuleId) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ListAutoModerationRulesRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ListAutoModerationRulesRequest.java index 6566dbe3..4f90d999 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ListAutoModerationRulesRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ListAutoModerationRulesRequest.java @@ -7,7 +7,7 @@ public record ListAutoModerationRulesRequest(long guildId) implements DiscordReq @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/auto-moderation/rules".formatted(guildId)); + .get() + .path("/guilds/%s/auto-moderation/rules".formatted(guildId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ModifyAutoModerationRuleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ModifyAutoModerationRuleRequest.java index e47577b6..bd244f0c 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ModifyAutoModerationRuleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/auto_moderation/ModifyAutoModerationRuleRequest.java @@ -1,26 +1,26 @@ package com.javadiscord.jdi.internal.api.auto_moderation; -import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; -import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationAction; +import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationTriggerMetadata; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyAutoModerationRuleRequest( - long guildId, - long autoModerationRuleId, - Optional name, - Optional eventType, - Optional triggerMetadata, - Optional> actions, - Optional enabled, - Optional> exemptRoles, - Optional> exemptChannels) - implements DiscordRequest { + long guildId, + long autoModerationRuleId, + Optional name, + Optional eventType, + Optional triggerMetadata, + Optional> actions, + Optional enabled, + Optional> exemptRoles, + Optional> exemptChannels +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); @@ -33,10 +33,11 @@ public DiscordRequestBuilder create() { exemptChannels.ifPresent(val -> body.put("exempt_channels", exemptChannels)); return new DiscordRequestBuilder() - .patch() - .path( - "/guilds/%s/auto-moderation/rules/%s" - .formatted(guildId, autoModerationRuleId)) - .body(body); + .patch() + .path( + "/guilds/%s/auto-moderation/rules/%s" + .formatted(guildId, autoModerationRuleId) + ) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/AddThreadMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/AddThreadMemberRequest.java index 1bad76c7..b87c86f7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/AddThreadMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/AddThreadMemberRequest.java @@ -8,7 +8,7 @@ public record AddThreadMemberRequest(long channelId, long userId) implements Dis @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); + .put() + .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/BulkDeleteMessagesRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/BulkDeleteMessagesRequest.java index 1761d7b0..8de61cdf 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/BulkDeleteMessagesRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/BulkDeleteMessagesRequest.java @@ -1,19 +1,21 @@ package com.javadiscord.jdi.internal.api.channel; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.List; import java.util.Map; -public record BulkDeleteMessagesRequest(long channelId, List messageIds) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record BulkDeleteMessagesRequest( + long channelId, + List messageIds +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/channels/%s/messages/bulk-delete") - .body(Map.of("messages", messageIds)); + .post() + .path("/channels/%s/messages/bulk-delete") + .body(Map.of("messages", messageIds)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ChannelCreateInviteRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ChannelCreateInviteRequest.java index df6dac0f..1f444f5c 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ChannelCreateInviteRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ChannelCreateInviteRequest.java @@ -1,22 +1,28 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Map; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Map; - -public record ChannelCreateInviteRequest(long channelId, int maxAge, int maxUses, boolean temporary) - implements DiscordRequest { +public record ChannelCreateInviteRequest( + long channelId, + int maxAge, + int maxUses, + boolean temporary +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/channels/%s/invites".formatted(channelId)) - .body( - Map.of( - "max_age", maxAge, - "max_uses", maxUses, - "temporary", temporary)); + .post() + .path("/channels/%s/invites".formatted(channelId)) + .body( + Map.of( + "max_age", maxAge, + "max_uses", maxUses, + "temporary", temporary + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateMessageRequest.java index 6f48e187..7bce7bc1 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateMessageRequest.java @@ -1,6 +1,11 @@ package com.javadiscord.jdi.internal.api.channel; -import com.github.mizosoft.methanol.MultipartBodyPublisher; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.ChannelMention; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.message.MessageReference; @@ -8,28 +13,24 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import com.github.mizosoft.methanol.MultipartBodyPublisher; public record CreateMessageRequest( - long channelId, - Optional content, - Optional nonce, - Optional tts, - Optional> embeds, - Optional> mentions, - Optional> messageReferences, - Optional> components, - Optional> stickerIds, - Optional> files, - Optional payloadJson, - List attachments, - Optional flags, - Optional enforceNonce) - implements DiscordRequest { + long channelId, + Optional content, + Optional nonce, + Optional tts, + Optional> embeds, + Optional> mentions, + Optional> messageReferences, + Optional> components, + Optional> stickerIds, + Optional> files, + Optional payloadJson, + List attachments, + Optional flags, + Optional enforceNonce +) implements DiscordRequest { /** TODO: Add functionality for the enforceNonce flag */ @Override @@ -53,14 +54,14 @@ public DiscordRequestBuilder create() { bodyBuilder.textPart("payload_json", body); return new DiscordRequestBuilder() - .post() - .path("/channels/%s/messages".formatted(channelId)) - .multipartBody(bodyBuilder.build()); + .post() + .path("/channels/%s/messages".formatted(channelId)) + .multipartBody(bodyBuilder.build()); } return new DiscordRequestBuilder() - .post() - .path("/channels/%s/messages".formatted(channelId)) - .body(body); + .post() + .path("/channels/%s/messages".formatted(channelId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java index 7e28d0d9..c0223985 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java @@ -3,14 +3,18 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record CreateReactionRequest(long channelId, long messageId, String emoji) - implements DiscordRequest { +public record CreateReactionRequest( + long channelId, + long messageId, + String emoji +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path( - "/channels/%s/messages/%s/reactions/%s/@me" - .formatted(channelId, messageId, emoji)); + .put() + .path( + "/channels/%s/messages/%s/reactions/%s/@me" + .formatted(channelId, messageId, emoji) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CrossPostMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CrossPostMessageRequest.java index 6aa287e4..0da89405 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CrossPostMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CrossPostMessageRequest.java @@ -8,7 +8,7 @@ public record CrossPostMessageRequest(long channelId, long messageId) implements @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/channels/%s/messages/%s/crosspost".formatted(channelId, messageId)); + .post() + .path("/channels/%s/messages/%s/crosspost".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsForEmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsForEmojiRequest.java index b5c53514..b8daddab 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsForEmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsForEmojiRequest.java @@ -3,14 +3,18 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteAllReactionsForEmojiRequest(long channelId, long messageId, String emoji) - implements DiscordRequest { +public record DeleteAllReactionsForEmojiRequest( + long channelId, + long messageId, + String emoji +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path( - "/channels/%s/messages/%s/reactions/%s" - .formatted(channelId, messageId, emoji)); + .delete() + .path( + "/channels/%s/messages/%s/reactions/%s" + .formatted(channelId, messageId, emoji) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsRequest.java index 18c39067..6d89ae04 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteAllReactionsRequest.java @@ -7,7 +7,7 @@ public record DeleteAllReactionsRequest(long channelId, long messageId) implemen @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/messages/%s/reactions".formatted(channelId, messageId)); + .delete() + .path("/channels/%s/messages/%s/reactions".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteChannelRequest.java index 554e8023..cc878292 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteChannelRequest.java @@ -8,7 +8,7 @@ public record DeleteChannelRequest(long channelId, long overwriteId) implements @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/permissions/%s".formatted(channelId, overwriteId)); + .delete() + .path("/channels/%s/permissions/%s".formatted(channelId, overwriteId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteMessageRequest.java index 27a83960..6354fc25 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteMessageRequest.java @@ -7,7 +7,7 @@ public record DeleteMessageRequest(long channelId, long messageId) implements Di @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/messages/%s".formatted(channelId, messageId)); + .delete() + .path("/channels/%s/messages/%s".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteOwnReactionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteOwnReactionRequest.java index efad234a..7bc0db3d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteOwnReactionRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteOwnReactionRequest.java @@ -3,14 +3,18 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteOwnReactionRequest(long channelId, long messageId, String emoji) - implements DiscordRequest { +public record DeleteOwnReactionRequest( + long channelId, + long messageId, + String emoji +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path( - "/channels/%s/messages/%s/reactions/%s}/@me" - .formatted(channelId, messageId, emoji)); + .delete() + .path( + "/channels/%s/messages/%s/reactions/%s}/@me" + .formatted(channelId, messageId, emoji) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteUserReactionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteUserReactionRequest.java index a0e750b1..947fc1a3 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteUserReactionRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/DeleteUserReactionRequest.java @@ -3,14 +3,19 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteUserReactionRequest(long channelId, long messageId, String emoji, long userId) - implements DiscordRequest { +public record DeleteUserReactionRequest( + long channelId, + long messageId, + String emoji, + long userId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path( - "/channels/%s/messages/%s/reactions/%s/%s" - .formatted(channelId, messageId, emoji, userId)); + .delete() + .path( + "/channels/%s/messages/%s/reactions/%s/%s" + .formatted(channelId, messageId, emoji, userId) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditChannelPermissionsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditChannelPermissionsRequest.java index 41aafb46..eb48c7c2 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditChannelPermissionsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditChannelPermissionsRequest.java @@ -1,18 +1,22 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record EditChannelPermissionsRequest( - long channelId, long overwriteId, Optional allow, Optional deny, int type) - implements DiscordRequest { + long channelId, + long overwriteId, + Optional allow, + Optional deny, + int type +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/channels/%s/permissions/%s".formatted(channelId, overwriteId)); + .put() + .path("/channels/%s/permissions/%s".formatted(channelId, overwriteId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditMessageRequest.java index 15706b93..a94690f6 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/EditMessageRequest.java @@ -1,12 +1,5 @@ package com.javadiscord.jdi.internal.api.channel; -import com.github.mizosoft.methanol.MultipartBodyPublisher; -import com.javadiscord.jdi.core.models.channel.ChannelMention; -import com.javadiscord.jdi.core.models.message.MessageAttachment; -import com.javadiscord.jdi.core.models.message.embed.Embed; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.io.FileNotFoundException; import java.nio.file.Path; import java.util.HashMap; @@ -14,17 +7,25 @@ import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.channel.ChannelMention; +import com.javadiscord.jdi.core.models.message.MessageAttachment; +import com.javadiscord.jdi.core.models.message.embed.Embed; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +import com.github.mizosoft.methanol.MultipartBodyPublisher; + public record EditMessageRequest( - long channelId, - long messageId, - Optional content, - Optional> embeds, - Optional flags, - Optional> allowedMentions, - Optional> components, - Optional> files, - Optional> attachments) - implements DiscordRequest { + long channelId, + long messageId, + Optional content, + Optional> embeds, + Optional flags, + Optional> allowedMentions, + Optional> components, + Optional> files, + Optional> attachments +) implements DiscordRequest { // TODO: Fix sending files/attachments @Override @@ -43,18 +44,18 @@ public DiscordRequestBuilder create() { bodyBuilder.textPart("payload_json", body); files.ifPresent( - paths -> { - for (int i = 0; i < paths.size(); i++) { - try { - bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); - } catch (FileNotFoundException ignored) { - } - } - }); + paths -> { + for (int i = 0; i < paths.size(); i++) { + try { + bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); + } catch (FileNotFoundException ignored) {} + } + } + ); return new DiscordRequestBuilder() - .patch() - .path("/channels/%s/messages/%s".formatted(channelId, messageId)) - .multipartBody(bodyBuilder.build()); + .patch() + .path("/channels/%s/messages/%s".formatted(channelId, messageId)) + .multipartBody(bodyBuilder.build()); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessageRequest.java index eaa55d7a..28551979 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessageRequest.java @@ -8,7 +8,7 @@ public record FetchChannelMessageRequest(long channelId, long messageId) impleme @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/channel/%s/messages/%s".formatted(channelId, messageId)); + .get() + .path("/channel/%s/messages/%s".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessagesRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessagesRequest.java index 465545b9..e14c3752 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessagesRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchChannelMessagesRequest.java @@ -1,23 +1,24 @@ package com.javadiscord.jdi.internal.api.channel; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.Optional; import java.util.stream.Stream; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record FetchChannelMessagesRequest( - long channelId, - Optional around, - Optional before, - Optional after, - int limit) - implements DiscordRequest { + long channelId, + Optional around, + Optional before, + Optional after, + int limit +) implements DiscordRequest { public FetchChannelMessagesRequest { if (Stream.of(around, before, after).filter(Optional::isPresent).count() > 1) { throw new IllegalArgumentException( - "Only one of the values 'around', 'before', or 'after' should be set."); + "Only one of the values 'around', 'before', or 'after' should be set." + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchUserReactionsToMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchUserReactionsToMessageRequest.java index e275494f..5116d766 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchUserReactionsToMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FetchUserReactionsToMessageRequest.java @@ -1,22 +1,27 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record FetchUserReactionsToMessageRequest( - long channelId, long messageId, String emoji, Optional after, Optional limit) - implements DiscordRequest { + long channelId, + long messageId, + String emoji, + Optional after, + Optional limit +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path( - "/channels/%s/messages/%s/reactions/%s" - .formatted(channelId, messageId, emoji)); + new DiscordRequestBuilder() + .get() + .path( + "/channels/%s/messages/%s/reactions/%s" + .formatted(channelId, messageId, emoji) + ); after.ifPresent(val -> discordRequestBuilder.queryParam("after", val)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); return discordRequestBuilder; diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FollowAnnouncementChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FollowAnnouncementChannelRequest.java index 1b501644..4b5058d2 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FollowAnnouncementChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/FollowAnnouncementChannelRequest.java @@ -8,7 +8,7 @@ public record FollowAnnouncementChannelRequest(long channelId) implements Discor @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/channels/%s/followers".formatted(channelId)); + .post() + .path("/channels/%s/followers".formatted(channelId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GetThreadMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GetThreadMemberRequest.java index 3580f16f..b4214ccf 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GetThreadMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GetThreadMemberRequest.java @@ -1,19 +1,22 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - -public record GetThreadMemberRequest(long channelId, long userId, Optional withMember) - implements DiscordRequest { +public record GetThreadMemberRequest( + long channelId, + long userId, + Optional withMember +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); + new DiscordRequestBuilder() + .get() + .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); withMember.ifPresent(val -> discordRequestBuilder.queryParam("with_member", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMAddRecipientRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMAddRecipientRequest.java index 01cd35f4..4c7b7007 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMAddRecipientRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMAddRecipientRequest.java @@ -4,13 +4,16 @@ import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; public record GroupDMAddRecipientRequest( - long channelId, long userId, String accessToken, String nickname) - implements DiscordRequest { + long channelId, + long userId, + String accessToken, + String nickname +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/channels/%s/recipients/%s".formatted(channelId, userId)); + .put() + .path("/channels/%s/recipients/%s".formatted(channelId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMRemoveRecipientRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMRemoveRecipientRequest.java index 19343e73..dfe37d45 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMRemoveRecipientRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/GroupDMRemoveRecipientRequest.java @@ -8,7 +8,7 @@ public record GroupDMRemoveRecipientRequest(long channelId, long userId) impleme @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/recipients/%s".formatted(channelId, userId)); + .delete() + .path("/channels/%s/recipients/%s".formatted(channelId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/JoinThreadRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/JoinThreadRequest.java index fce5d064..9d12e284 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/JoinThreadRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/JoinThreadRequest.java @@ -8,7 +8,7 @@ public record JoinThreadRequest(long channelId) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/channels/%s/thread-members/@me".formatted(channelId)); + .put() + .path("/channels/%s/thread-members/@me".formatted(channelId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/LeaveThreadRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/LeaveThreadRequest.java index 3b10b4c4..d36cceea 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/LeaveThreadRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/LeaveThreadRequest.java @@ -8,7 +8,7 @@ public record LeaveThreadRequest(long channelId) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/thread-members/@me".formatted(channelId)); + .delete() + .path("/channels/%s/thread-members/@me".formatted(channelId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListJoinedPrivateArchivedThreadsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListJoinedPrivateArchivedThreadsRequest.java index 2c6311a8..0f15aa1c 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListJoinedPrivateArchivedThreadsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListJoinedPrivateArchivedThreadsRequest.java @@ -1,21 +1,25 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record ListJoinedPrivateArchivedThreadsRequest( - long channelId, Optional before, Optional limit) implements DiscordRequest { + long channelId, + Optional before, + Optional limit +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path( - "/channels/%s/users/@me/threads/archived/private" - .formatted(channelId)); + new DiscordRequestBuilder() + .get() + .path( + "/channels/%s/users/@me/threads/archived/private" + .formatted(channelId) + ); before.ifPresent(val -> discordRequestBuilder.queryParam("before", val)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPrivateArchivedThreadsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPrivateArchivedThreadsRequest.java index 68e560cf..8b4f672d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPrivateArchivedThreadsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPrivateArchivedThreadsRequest.java @@ -1,25 +1,27 @@ package com.javadiscord.jdi.internal.api.channel; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.OffsetDateTime; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.time.OffsetDateTime; -import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonFormat; public record ListPrivateArchivedThreadsRequest( - long channelId, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - Optional before, - Optional limit) - implements DiscordRequest { + long channelId, + @JsonFormat( + shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX" + ) Optional before, + Optional limit +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path("/channels/%s/threads/archived/private".formatted(channelId)); + new DiscordRequestBuilder() + .get() + .path("/channels/%s/threads/archived/private".formatted(channelId)); before.ifPresent(val -> discordRequestBuilder.queryParam("before", val)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPublicArchivedThreadsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPublicArchivedThreadsRequest.java index 57770276..4ec75421 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPublicArchivedThreadsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListPublicArchivedThreadsRequest.java @@ -1,25 +1,27 @@ package com.javadiscord.jdi.internal.api.channel; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.OffsetDateTime; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.time.OffsetDateTime; -import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonFormat; public record ListPublicArchivedThreadsRequest( - long channelId, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - Optional before, - Optional limit) - implements DiscordRequest { + long channelId, + @JsonFormat( + shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX" + ) Optional before, + Optional limit +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path("/channels/%s/threads/archived/public".formatted(channelId)); + new DiscordRequestBuilder() + .get() + .path("/channels/%s/threads/archived/public".formatted(channelId)); before.ifPresent(val -> discordRequestBuilder.queryParam("before", val)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListThreadMembersRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListThreadMembersRequest.java index d66d9057..3f83cda2 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListThreadMembersRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ListThreadMembersRequest.java @@ -1,20 +1,23 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record ListThreadMembersRequest( - long channelId, Optional withMember, Optional after, Optional limit) - implements DiscordRequest { + long channelId, + Optional withMember, + Optional after, + Optional limit +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path("/channels/%s/thread-members".formatted(channelId)); + new DiscordRequestBuilder() + .get() + .path("/channels/%s/thread-members".formatted(channelId)); withMember.ifPresent(val -> discordRequestBuilder.queryParam("with_member", val)); after.ifPresent(val -> discordRequestBuilder.queryParam("after", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ModifyChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ModifyChannelRequest.java index b028b9de..db685912 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ModifyChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/ModifyChannelRequest.java @@ -1,21 +1,26 @@ package com.javadiscord.jdi.internal.api.channel; +import java.util.Map; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Map; - -public record ModifyChannelRequest(long channelId, String name, String base64EncodedIcon) - implements DiscordRequest { +public record ModifyChannelRequest( + long channelId, + String name, + String base64EncodedIcon +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .patch() - .path("/channels/%s".formatted(channelId)) - .body( - Map.of( - "name", name, - "icon", base64EncodedIcon)); + .patch() + .path("/channels/%s".formatted(channelId)) + .body( + Map.of( + "name", name, + "icon", base64EncodedIcon + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/PinMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/PinMessageRequest.java index a2a083e8..9368450b 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/PinMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/PinMessageRequest.java @@ -8,7 +8,7 @@ public record PinMessageRequest(long channelId, long messageId) implements Disco @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/channels/%s/pins/%s".formatted(channelId, messageId)); + .put() + .path("/channels/%s/pins/%s".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/RemoveThreadMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/RemoveThreadMemberRequest.java index 0afcced3..78c08169 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/RemoveThreadMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/RemoveThreadMemberRequest.java @@ -8,7 +8,7 @@ public record RemoveThreadMemberRequest(long channelId, long userId) implements @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); + .delete() + .path("/channels/%s/thread-members/%s".formatted(channelId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadFromMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadFromMessageRequest.java index f8621a07..d012c7ec 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadFromMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadFromMessageRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.channel; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record StartThreadFromMessageRequest( - long channelId, - long messageId, - String name, - Optional autoArchiveDuration, - Optional rateLimitPerUser) - implements DiscordRequest { + long channelId, + long messageId, + String name, + Optional autoArchiveDuration, + Optional rateLimitPerUser +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -23,8 +23,8 @@ public DiscordRequestBuilder create() { rateLimitPerUser.ifPresent(val -> body.put("rate_limit_per_user", val)); return new DiscordRequestBuilder() - .post() - .path("/channels/%s/messages/%s/threads".formatted(channelId, messageId)) - .body(body); + .post() + .path("/channels/%s/messages/%s/threads".formatted(channelId, messageId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadInForumOrMediaChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadInForumOrMediaChannelRequest.java index fc6e82a8..379867ea 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadInForumOrMediaChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadInForumOrMediaChannelRequest.java @@ -1,10 +1,5 @@ package com.javadiscord.jdi.internal.api.channel; -import com.github.mizosoft.methanol.MultipartBodyPublisher; -import com.javadiscord.jdi.core.models.channel.ForumAndMediaThreadMessageParams; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.io.FileNotFoundException; import java.nio.file.Path; import java.util.HashMap; @@ -12,15 +7,21 @@ import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.channel.ForumAndMediaThreadMessageParams; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +import com.github.mizosoft.methanol.MultipartBodyPublisher; + public record StartThreadInForumOrMediaChannelRequest( - long channelId, - String name, - Optional autoArchiveDuration, - Optional rateLimitPerUser, - ForumAndMediaThreadMessageParams message, - Optional> appliedTags, - Optional> files) - implements DiscordRequest { + long channelId, + String name, + Optional autoArchiveDuration, + Optional rateLimitPerUser, + ForumAndMediaThreadMessageParams message, + Optional> appliedTags, + Optional> files +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -37,18 +38,18 @@ public DiscordRequestBuilder create() { bodyBuilder.textPart("payload_json", body); files.ifPresent( - paths -> { - for (int i = 0; i < paths.size(); i++) { - try { - bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); - } catch (FileNotFoundException ignored) { - } - } - }); + paths -> { + for (int i = 0; i < paths.size(); i++) { + try { + bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); + } catch (FileNotFoundException ignored) {} + } + } + ); return new DiscordRequestBuilder() - .post() - .path("/channels/%s/threads".formatted(channelId)) - .multipartBody(bodyBuilder.build()); + .post() + .path("/channels/%s/threads".formatted(channelId)) + .multipartBody(bodyBuilder.build()); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadWithoutMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadWithoutMessageRequest.java index dd5ba6f0..d6cf3fe8 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadWithoutMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/StartThreadWithoutMessageRequest.java @@ -1,20 +1,20 @@ package com.javadiscord.jdi.internal.api.channel; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record StartThreadWithoutMessageRequest( - long channelId, - String name, - Optional autoArchiveDuration, - Optional type, - Optional invitable, - Optional rateLimitPerUser) - implements DiscordRequest { + long channelId, + String name, + Optional autoArchiveDuration, + Optional type, + Optional invitable, + Optional rateLimitPerUser +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -26,8 +26,8 @@ public DiscordRequestBuilder create() { rateLimitPerUser.ifPresent(val -> body.put("rate_limit", val)); return new DiscordRequestBuilder() - .post() - .path("/channels/%s/threads".formatted(channelId)) - .body(body); + .post() + .path("/channels/%s/threads".formatted(channelId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/UnpinMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/UnpinMessageRequest.java index 9c45dc6d..ea46837c 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/UnpinMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/UnpinMessageRequest.java @@ -8,7 +8,7 @@ public record UnpinMessageRequest(long channelId, long messageId) implements Dis @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/channels/%s/pins/%s".formatted(channelId, messageId)); + .delete() + .path("/channels/%s/pins/%s".formatted(channelId, messageId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/CreateEmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/CreateEmojiRequest.java index 7ff859b0..1f357629 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/CreateEmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/CreateEmojiRequest.java @@ -1,23 +1,29 @@ package com.javadiscord.jdi.internal.api.emojis; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.List; import java.util.Map; -public record CreateEmojiRequest(long guildId, String name, String image, List roles) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record CreateEmojiRequest( + long guildId, + String name, + String image, + List roles +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/emojis".formatted(guildId)) - .body( - Map.of( - "name", name, - "image", image, - "roles", roles)); + .post() + .path("/guilds/%s/emojis".formatted(guildId)) + .body( + Map.of( + "name", name, + "image", image, + "roles", roles + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/DeleteEmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/DeleteEmojiRequest.java index 0630c32e..40e4b302 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/DeleteEmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/DeleteEmojiRequest.java @@ -8,7 +8,7 @@ public record DeleteEmojiRequest(long guildId, long emojiId) implements DiscordR @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)); + .delete() + .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/GetEmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/GetEmojiRequest.java index fc2fe64f..40cac581 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/GetEmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/GetEmojiRequest.java @@ -8,7 +8,7 @@ public record GetEmojiRequest(long guildId, long emojiId) implements DiscordRequ @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)); + .get() + .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/ModifyEmojiRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/ModifyEmojiRequest.java index 71d6e44b..4778527c 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/ModifyEmojiRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/emojis/ModifyEmojiRequest.java @@ -1,16 +1,19 @@ package com.javadiscord.jdi.internal.api.emojis; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyEmojiRequest( - long guildId, long emojiId, Optional name, Optional> roles) - implements DiscordRequest { + long guildId, + long emojiId, + Optional name, + Optional> roles +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -19,8 +22,8 @@ public DiscordRequestBuilder create() { roles.ifPresent(val -> body.put("roles", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)) - .body(body); + .patch() + .path("/guilds/%s/emojis/%s".formatted(guildId, emojiId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/AddGuildMemberRoleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/AddGuildMemberRoleRequest.java index 9c56db75..f2dd6837 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/AddGuildMemberRoleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/AddGuildMemberRoleRequest.java @@ -3,13 +3,16 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record AddGuildMemberRoleRequest(long guildId, long userId, long roleId) - implements DiscordRequest { +public record AddGuildMemberRoleRequest( + long guildId, + long userId, + long roleId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/guilds/%s/members/%s/roles/%s".formatted(guildId, userId, roleId)); + .put() + .path("/guilds/%s/members/%s/roles/%s".formatted(guildId, userId, roleId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BeginGuildPruneRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BeginGuildPruneRequest.java index 08c45966..5ac78786 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BeginGuildPruneRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BeginGuildPruneRequest.java @@ -1,26 +1,31 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.List; import java.util.Map; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + // https://discord.com/developers/docs/resources/guild#begin-guild-prune // it has warnings and stuff so read that public record BeginGuildPruneRequest( - long guildId, int days, boolean computePruneCount, List includeRoles) - implements DiscordRequest { + long guildId, + int days, + boolean computePruneCount, + List includeRoles +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/prune".formatted(guildId)) - .body( - Map.of( - "days", days, - "compute_prune_count", computePruneCount, - "include_roles", includeRoles)); + .post() + .path("/guilds/%s/prune".formatted(guildId)) + .body( + Map.of( + "days", days, + "compute_prune_count", computePruneCount, + "include_roles", includeRoles + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BulkGuildBanRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BulkGuildBanRequest.java index bbd99e50..eaa624b5 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BulkGuildBanRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/BulkGuildBanRequest.java @@ -1,16 +1,18 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record BulkGuildBanRequest( - long guildId, List userIds, Optional deleteMessageSeconds) - implements DiscordRequest { + long guildId, + List userIds, + Optional deleteMessageSeconds +) implements DiscordRequest { public BulkGuildBanRequest { if (userIds.size() > 200) { @@ -29,8 +31,8 @@ public DiscordRequestBuilder create() { deleteMessageSeconds.ifPresent(val -> body.put("delete_message_seconds", val)); return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/bulk-ban".formatted(guildId)) - .body(body); + .post() + .path("/guilds/%s/bulk-ban".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildBanRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildBanRequest.java index 5c7a787c..8a40db08 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildBanRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildBanRequest.java @@ -1,15 +1,17 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateGuildBanRequest( - long guildId, long userId, Optional deleteMessageSeconds) - implements DiscordRequest { + long guildId, + long userId, + Optional deleteMessageSeconds +) implements DiscordRequest { public CreateGuildBanRequest { if (deleteMessageSeconds.isPresent() && deleteMessageSeconds.get() > 604800) { @@ -23,8 +25,8 @@ public DiscordRequestBuilder create() { deleteMessageSeconds.ifPresent(val -> body.put("delete_message_seconds", val)); return new DiscordRequestBuilder() - .put() - .path("/guilds/%s/bans/%s".formatted(guildId, userId)) - .body(body); + .put() + .path("/guilds/%s/bans/%s".formatted(guildId, userId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildChannelRequest.java index be016ee0..cdf6a469 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildChannelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildChannelRequest.java @@ -1,48 +1,50 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.core.models.channel.*; -import com.javadiscord.jdi.core.models.guild.Tags; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.channel.*; +import com.javadiscord.jdi.core.models.guild.Tags; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateGuildChannelRequest( - long guildId, - String name, - Optional type, - Optional topic, - Optional bitrate, - Optional userLimit, - Optional rateLimitPerUser, - Optional position, - Optional> permissionOverwrites, - Optional parentId, - Optional nsfw, - Optional rtcRegion, - Optional videoQualityMode, - Optional defaultAutoArchiveDuration, - Optional defaultReactionEmoji, - Optional> availableTags, - Optional defaultSortOrder, - Optional defaultForumLayout, - Optional defaultThreadRateLimitPerUser) - implements DiscordRequest { + long guildId, + String name, + Optional type, + Optional topic, + Optional bitrate, + Optional userLimit, + Optional rateLimitPerUser, + Optional position, + Optional> permissionOverwrites, + Optional parentId, + Optional nsfw, + Optional rtcRegion, + Optional videoQualityMode, + Optional defaultAutoArchiveDuration, + Optional defaultReactionEmoji, + Optional> availableTags, + Optional defaultSortOrder, + Optional defaultForumLayout, + Optional defaultThreadRateLimitPerUser +) implements DiscordRequest { public CreateGuildChannelRequest { if (name.isEmpty() || name.length() > 100) { throw new IllegalArgumentException( - "Channel name must be between 1 and 100 character's long"); + "Channel name must be between 1 and 100 character's long" + ); } if (topic.isPresent()) { String value = topic.get(); if (value.length() > 1024) { throw new IllegalArgumentException( - "Channel topic must be between 0 and 1024 characters"); + "Channel topic must be between 0 and 1024 characters" + ); } } @@ -50,7 +52,8 @@ public record CreateGuildChannelRequest( int value = rateLimitPerUser.get(); if (value < 0 || value > 21600) { throw new IllegalArgumentException( - "Rate limit per user must be between 0 and 21,600"); + "Rate limit per user must be between 0 and 21,600" + ); } } @@ -83,11 +86,12 @@ public DiscordRequestBuilder create() { defaultSortOrder.ifPresent(val -> body.put("default_sort_order", val)); defaultForumLayout.ifPresent(val -> body.put("default_forum_layout", val)); defaultThreadRateLimitPerUser.ifPresent( - val -> body.put("default_thread_rate_limit_per_user", val)); + val -> body.put("default_thread_rate_limit_per_user", val) + ); return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/channels".formatted(guildId)) - .body(body); + .post() + .path("/guilds/%s/channels".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRequest.java index 944f9a91..4e0cf2b4 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRequest.java @@ -1,30 +1,30 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.core.models.channel.Channel; -import com.javadiscord.jdi.core.models.guild.Role; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.channel.Channel; +import com.javadiscord.jdi.core.models.guild.Role; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + // Only works for bots in less than 10 guilds // (https://discord.com/developers/docs/resources/guild#create-guild) public record CreateGuildRequest( - String name, - Optional icon, - Optional verificationLevel, - Optional defaultMessageNotifications, - Optional explicitContentFilter, - Optional> roles, - Optional> channels, - Optional afkChannelId, - Optional afkTimeout, - Optional systemChannelId, - Optional systemChannelFlags) - implements DiscordRequest { + String name, + Optional icon, + Optional verificationLevel, + Optional defaultMessageNotifications, + Optional explicitContentFilter, + Optional> roles, + Optional> channels, + Optional afkChannelId, + Optional afkTimeout, + Optional systemChannelId, + Optional systemChannelFlags +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -33,7 +33,8 @@ public DiscordRequestBuilder create() { icon.ifPresent(val -> body.put("icon", val)); verificationLevel.ifPresent(val -> body.put("verification_level", val)); defaultMessageNotifications.ifPresent( - val -> body.put("default_message_notifications", val)); + val -> body.put("default_message_notifications", val) + ); explicitContentFilter.ifPresent(val -> body.put("explicit_content_filter", val)); roles.ifPresent(val -> body.put("roles", val)); channels.ifPresent(val -> body.put("channels", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRoleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRoleRequest.java index 1e229bce..12fab84d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRoleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/CreateGuildRoleRequest.java @@ -1,22 +1,22 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateGuildRoleRequest( - long guildId, - Optional name, - Optional permissions, - Optional color, - Optional hoist, - Optional icon, - Optional unicodeEmoji, - Optional mentionable) - implements DiscordRequest { + long guildId, + Optional name, + Optional permissions, + Optional color, + Optional hoist, + Optional icon, + Optional unicodeEmoji, + Optional mentionable +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildIntegrationRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildIntegrationRequest.java index 31ca76fa..65154da8 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildIntegrationRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildIntegrationRequest.java @@ -3,13 +3,15 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteGuildIntegrationRequest(long guildId, long integrationId) - implements DiscordRequest { +public record DeleteGuildIntegrationRequest( + long guildId, + long integrationId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/integrations/%s".formatted(guildId, integrationId)); + .delete() + .path("/guilds/%s/integrations/%s".formatted(guildId, integrationId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildRoleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildRoleRequest.java index dd781a15..7c486442 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildRoleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/DeleteGuildRoleRequest.java @@ -8,7 +8,7 @@ public record DeleteGuildRoleRequest(long guildId, long roleId) implements Disco @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/roles/%s".formatted(guildId, roleId)); + .delete() + .path("/guilds/%s/roles/%s".formatted(guildId, roleId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBanRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBanRequest.java index 4c8cab5e..70ba6bd2 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBanRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBanRequest.java @@ -8,7 +8,7 @@ public record GetGuildBanRequest(long guildId, long userId) implements DiscordRe @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/bans/%s".formatted(guildId, userId)); + .get() + .path("/guilds/%s/bans/%s".formatted(guildId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBansRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBansRequest.java index f9400983..cd6398b9 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBansRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildBansRequest.java @@ -1,13 +1,16 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record GetGuildBansRequest( - long guildId, Optional limit, Optional before, Optional after) - implements DiscordRequest { + long guildId, + Optional limit, + Optional before, + Optional after +) implements DiscordRequest { public GetGuildBansRequest { if (limit.isPresent() && limit.get() > 1000) { @@ -18,7 +21,7 @@ public record GetGuildBansRequest( @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().get().path("/guilds/%s/bans".formatted(guildId)); + new DiscordRequestBuilder().get().path("/guilds/%s/bans".formatted(guildId)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); before.ifPresent(val -> discordRequestBuilder.queryParam("before", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildMemberRequest.java index f0b60109..8fc4409f 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildMemberRequest.java @@ -8,7 +8,7 @@ public record GetGuildMemberRequest(long guildId, long userId) implements Discor @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/members/%s".formatted(guildId, userId)); + .get() + .path("/guilds/%s/members/%s".formatted(guildId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildPruneCountRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildPruneCountRequest.java index 15d2f59b..f707714d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildPruneCountRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildPruneCountRequest.java @@ -1,29 +1,32 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record GetGuildPruneCountRequest( - long guildId, Optional days, Optional> includeRoles) - implements DiscordRequest { + long guildId, + Optional days, + Optional> includeRoles +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().get().path("/guilds/%s/prune".formatted(guildId)); + new DiscordRequestBuilder().get().path("/guilds/%s/prune".formatted(guildId)); days.ifPresent(val -> discordRequestBuilder.queryParam("days", val)); includeRoles.ifPresent( - val -> - discordRequestBuilder.queryParam( - "include_roles", - val.stream() - .map(Object::toString) - .collect(Collectors.joining(",")))); + val -> discordRequestBuilder.queryParam( + "include_roles", + val.stream() + .map(Object::toString) + .collect(Collectors.joining(",")) + ) + ); return discordRequestBuilder; } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildRequest.java index 2d2bbe74..d9b4199d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildRequest.java @@ -1,14 +1,16 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; -public record GetGuildRequest(long guildId, Optional withCounts) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record GetGuildRequest( + long guildId, + Optional withCounts +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWelcomeScreenRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWelcomeScreenRequest.java index eca4e145..bc1df4a7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWelcomeScreenRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWelcomeScreenRequest.java @@ -8,7 +8,7 @@ public record GetGuildWelcomeScreenRequest(long guildId) implements DiscordReque @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/welcome-screen".formatted(guildId)); + .get() + .path("/guilds/%s/welcome-screen".formatted(guildId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWidgetImageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWidgetImageRequest.java index be515405..66db4b6e 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWidgetImageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/GetGuildWidgetImageRequest.java @@ -1,17 +1,19 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.Optional; + import com.javadiscord.jdi.core.models.guild.WidgetStyleOptions; import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - -public record GetGuildWidgetImageRequest(long guildId, Optional style) - implements DiscordRequest { +public record GetGuildWidgetImageRequest( + long guildId, + Optional style +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().get().path("/guilds/%s/widget.png".formatted(guildId)); + new DiscordRequestBuilder().get().path("/guilds/%s/widget.png".formatted(guildId)); style.ifPresent(val -> discordRequestBuilder.queryParam("style", val.name())); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListActiveGuildThreadsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListActiveGuildThreadsRequest.java index 095f973e..c5da0547 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListActiveGuildThreadsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListActiveGuildThreadsRequest.java @@ -8,7 +8,7 @@ public record ListActiveGuildThreadsRequest(long guildId) implements DiscordRequ @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/threads/active".formatted(guildId)); + .get() + .path("/guilds/%s/threads/active".formatted(guildId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListGuildMembersRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListGuildMembersRequest.java index d044b7a0..a918532a 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListGuildMembersRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ListGuildMembersRequest.java @@ -1,17 +1,20 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - -public record ListGuildMembersRequest(long guildId, Optional limit, Optional after) - implements DiscordRequest { +public record ListGuildMembersRequest( + long guildId, + Optional limit, + Optional after +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().get().path("/guilds/%s/members".formatted(guildId)); + new DiscordRequestBuilder().get().path("/guilds/%s/members".formatted(guildId)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); after.ifPresent(val -> discordRequestBuilder.queryParam("after", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentMemberRequest.java index 6e2c2bca..235402ef 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentMemberRequest.java @@ -1,14 +1,16 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; -public record ModifyCurrentMemberRequest(long guildId, Optional nick) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record ModifyCurrentMemberRequest( + long guildId, + Optional nick +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -16,8 +18,8 @@ public DiscordRequestBuilder create() { nick.ifPresent(val -> body.put("nick", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/members/@me".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/members/@me".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserNickRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserNickRequest.java index 18bb677a..44898562 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserNickRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserNickRequest.java @@ -1,16 +1,18 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + /** Deprecated in favor of ModifyCurrentMemberRequest */ @Deprecated -public record ModifyCurrentUserNickRequest(long guildId, Optional nick) - implements DiscordRequest { +public record ModifyCurrentUserNickRequest( + long guildId, + Optional nick +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -18,8 +20,8 @@ public DiscordRequestBuilder create() { nick.ifPresent(val -> body.put("nick", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/members/@me/nick".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/members/@me/nick".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserVoiceStateRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserVoiceStateRequest.java index c006e38e..58f9882d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserVoiceStateRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyCurrentUserVoiceStateRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyCurrentUserVoiceStateRequest( - long guildId, - Optional channelId, - Optional suppress, - Optional requestToSpeakTimestamp) - implements DiscordRequest { + long guildId, + Optional channelId, + Optional suppress, + Optional requestToSpeakTimestamp +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -23,8 +23,8 @@ public DiscordRequestBuilder create() { requestToSpeakTimestamp.ifPresent(val -> body.put("request_to_speak_timestamp", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/voice-states/@me".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/voice-states/@me".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildChannelPositionsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildChannelPositionsRequest.java index 7f79be16..56751113 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildChannelPositionsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildChannelPositionsRequest.java @@ -1,12 +1,14 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.*; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.*; - public record ModifyGuildChannelPositionsRequest( - long guildId, List channels) implements DiscordRequest { + long guildId, + List channels +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -22,14 +24,15 @@ public DiscordRequestBuilder create() { } return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/channels".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/channels".formatted(guildId)) + .body(body); } public record ModifyChannelPositionData( - long id, - Optional position, - Optional lockPositions, - Optional parentId) {} + long id, + Optional position, + Optional lockPositions, + Optional parentId + ) {} } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMFALevelRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMFALevelRequest.java index 13be576d..4f201e98 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMFALevelRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMFALevelRequest.java @@ -1,18 +1,18 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.Map; + import com.javadiscord.jdi.core.models.guild.MFALevel; import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Map; - public record ModifyGuildMFALevelRequest(long guildId, MFALevel level) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/mfa".formatted(guildId)) - .body(Map.of("level", level)); + .post() + .path("/guilds/%s/mfa".formatted(guildId)) + .body(Map.of("level", level)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMemberRequest.java index 91a5a730..d68e3d7f 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildMemberRequest.java @@ -1,25 +1,25 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.time.OffsetDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildMemberRequest( - long guildId, - long userId, - Optional nick, - Optional> roles, - Optional mute, - Optional deafen, - Optional channelId, - Optional communicationDisabledUntil, - Optional flags) - implements DiscordRequest { + long guildId, + long userId, + Optional nick, + Optional> roles, + Optional mute, + Optional deafen, + Optional channelId, + Optional communicationDisabledUntil, + Optional flags +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -33,8 +33,8 @@ public DiscordRequestBuilder create() { flags.ifPresent(val -> body.put("flags", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/members/%s".formatted(guildId, userId)) - .body(body); + .patch() + .path("/guilds/%s/members/%s".formatted(guildId, userId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildOnboardingRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildOnboardingRequest.java index 83ecbce6..86e56ff7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildOnboardingRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildOnboardingRequest.java @@ -1,31 +1,33 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.core.models.guild.OnboardingMode; import com.javadiscord.jdi.core.models.guild.OnboardingPrompt; import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.List; -import java.util.Map; - public record ModifyGuildOnboardingRequest( - long guildId, - List prompts, - List defaultChannelIds, - boolean enabled, - OnboardingMode mode) - implements DiscordRequest { + long guildId, + List prompts, + List defaultChannelIds, + boolean enabled, + OnboardingMode mode +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .put() - .path("/guilds/%s/onboarding") - .body( - Map.of( - "prompts", prompts, - "default_channel_ids", defaultChannelIds, - "enabled", enabled, - "mode", mode)); + .put() + .path("/guilds/%s/onboarding") + .body( + Map.of( + "prompts", prompts, + "default_channel_ids", defaultChannelIds, + "enabled", enabled, + "mode", mode + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRequest.java index 9e245490..ea5c8e93 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRequest.java @@ -1,37 +1,37 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.core.models.guild.GuildFeature; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.guild.GuildFeature; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildRequest( - long guildId, - Optional name, - Optional verificationLevel, - Optional defaultMessageNotifications, - Optional explicitContentFilter, - Optional afkChannelId, - Optional afkTimeout, - Optional icon, - Optional ownerId, - Optional splash, - Optional discoverySplash, - Optional banner, - Optional systemChannelId, - Optional systemChannelFlags, - Optional rulesChannelId, - Optional publicUpdatesChannelId, - Optional preferredLocale, - Optional> features, - Optional description, - Optional premiumProgressBarEnabled, - Optional safetyAlertsChannelId) - implements DiscordRequest { + long guildId, + Optional name, + Optional verificationLevel, + Optional defaultMessageNotifications, + Optional explicitContentFilter, + Optional afkChannelId, + Optional afkTimeout, + Optional icon, + Optional ownerId, + Optional splash, + Optional discoverySplash, + Optional banner, + Optional systemChannelId, + Optional systemChannelFlags, + Optional rulesChannelId, + Optional publicUpdatesChannelId, + Optional preferredLocale, + Optional> features, + Optional description, + Optional premiumProgressBarEnabled, + Optional safetyAlertsChannelId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -39,7 +39,8 @@ public DiscordRequestBuilder create() { name.ifPresent(val -> body.put("name", val)); verificationLevel.ifPresent(val -> body.put("verification_level", val)); defaultMessageNotifications.ifPresent( - val -> body.put("default_message_notifications", val)); + val -> body.put("default_message_notifications", val) + ); explicitContentFilter.ifPresent(val -> body.put("explicit_content_filter", val)); afkChannelId.ifPresent(val -> body.put("afk_channel_id", val)); afkTimeout.ifPresent(val -> body.put("afk_timeout", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRolePositionsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRolePositionsRequest.java index ee4b37c7..196c6ba0 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRolePositionsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRolePositionsRequest.java @@ -1,12 +1,14 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.*; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.*; - -public record ModifyGuildRolePositionsRequest(long guildId, List roles) - implements DiscordRequest { +public record ModifyGuildRolePositionsRequest( + long guildId, + List roles +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -20,9 +22,9 @@ public DiscordRequestBuilder create() { } return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/roles".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/roles".formatted(guildId)) + .body(body); } public record ModifyGuildRolePositionData(long id, Optional position) {} diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRoleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRoleRequest.java index 11787526..731d4399 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRoleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildRoleRequest.java @@ -1,23 +1,23 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildRoleRequest( - long guildId, - long roleId, - Optional name, - Optional permissions, - Optional color, - Optional hoist, - Optional icon, - Optional unicodeEmoji, - Optional mentionable) - implements DiscordRequest { + long guildId, + long roleId, + Optional name, + Optional permissions, + Optional color, + Optional hoist, + Optional icon, + Optional unicodeEmoji, + Optional mentionable +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -30,8 +30,8 @@ public DiscordRequestBuilder create() { mentionable.ifPresent(val -> body.put("mentionable", val)); return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/roles/%s".formatted(guildId, roleId)) - .body(body); + .post() + .path("/guilds/%s/roles/%s".formatted(guildId, roleId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWelcomeScreenRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWelcomeScreenRequest.java index ed802659..ba88d2dd 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWelcomeScreenRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWelcomeScreenRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.core.models.guild.WelcomeScreenChannel; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.guild.WelcomeScreenChannel; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildWelcomeScreenRequest( - long guildId, - Optional enabled, - Optional welcomeChannels, - Optional description) - implements DiscordRequest { + long guildId, + Optional enabled, + Optional welcomeChannels, + Optional description +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -23,8 +23,8 @@ public DiscordRequestBuilder create() { description.ifPresent(val -> body.put("description", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/welcome-screen".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/welcome-screen".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWidgetRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWidgetRequest.java index 6fe2f6ef..f0779dc7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWidgetRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyGuildWidgetRequest.java @@ -1,15 +1,17 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildWidgetRequest( - long guildId, Optional enabled, Optional channelId) - implements DiscordRequest { + long guildId, + Optional enabled, + Optional channelId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -18,8 +20,8 @@ public DiscordRequestBuilder create() { channelId.ifPresent(val -> body.put("channel_id", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/widget".formatted(guildId)) - .body(body); + .patch() + .path("/guilds/%s/widget".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyUserVoiceStateRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyUserVoiceStateRequest.java index f9be810f..a585f7bb 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyUserVoiceStateRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/ModifyUserVoiceStateRequest.java @@ -1,15 +1,18 @@ package com.javadiscord.jdi.internal.api.guild; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyUserVoiceStateRequest( - long guildId, long userId, Optional channelId, Optional suppress) - implements DiscordRequest { + long guildId, + long userId, + Optional channelId, + Optional suppress +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -18,8 +21,8 @@ public DiscordRequestBuilder create() { suppress.ifPresent(val -> body.put("suppress", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/voice-states/%s".formatted(guildId, userId)) - .body(body); + .patch() + .path("/guilds/%s/voice-states/%s".formatted(guildId, userId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildBanRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildBanRequest.java index a460e247..1152a921 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildBanRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildBanRequest.java @@ -8,7 +8,7 @@ public record RemoveGuildBanRequest(long guildId, long userId) implements Discor @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/bans/%s".formatted(guildId, userId)); + .delete() + .path("/guilds/%s/bans/%s".formatted(guildId, userId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildMemberRoleRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildMemberRoleRequest.java index 5dc2b38f..123147a3 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildMemberRoleRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/RemoveGuildMemberRoleRequest.java @@ -3,13 +3,16 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record RemoveGuildMemberRoleRequest(long guildId, long userId, long roleId) - implements DiscordRequest { +public record RemoveGuildMemberRoleRequest( + long guildId, + long userId, + long roleId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/members/%s/roles/%s".formatted(guildId, userId, roleId)); + .delete() + .path("/guilds/%s/members/%s/roles/%s".formatted(guildId, userId, roleId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/SearchGuildMembersRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/SearchGuildMembersRequest.java index 9f918cd4..c677afbd 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild/SearchGuildMembersRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild/SearchGuildMembersRequest.java @@ -1,12 +1,15 @@ package com.javadiscord.jdi.internal.api.guild; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record SearchGuildMembersRequest( - long guildId, Optional query, Optional limit) implements DiscordRequest { + long guildId, + Optional query, + Optional limit +) implements DiscordRequest { public SearchGuildMembersRequest { if (limit.isPresent()) { @@ -20,9 +23,9 @@ public record SearchGuildMembersRequest( @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path("/guilds/%s/members/search".formatted(guildId)); + new DiscordRequestBuilder() + .get() + .path("/guilds/%s/members/search".formatted(guildId)); query.ifPresent(val -> discordRequestBuilder.queryParam("query", val)); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/CreateScheduledEventRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/CreateScheduledEventRequest.java index ecd4070a..5c16b5da 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/CreateScheduledEventRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/CreateScheduledEventRequest.java @@ -1,31 +1,34 @@ package com.javadiscord.jdi.internal.api.guild_scheduled_event; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.javadiscord.jdi.core.models.guild.EntityMetadata; -import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEntityType; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.guild.EntityMetadata; +import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEntityType; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +import com.fasterxml.jackson.annotation.JsonFormat; + public record CreateScheduledEventRequest( - long guildId, - Optional channelId, - Optional entityMetadata, - String name, - int privacyLevel, // 2 is only option atm - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - OffsetDateTime scheduledStartTime, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - Optional scheduledEndTime, - Optional description, - ScheduledEntityType entityType, - Optional image) - implements DiscordRequest { + long guildId, + Optional channelId, + Optional entityMetadata, + String name, + int privacyLevel, // 2 is only option atm + @JsonFormat( + shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX" + ) OffsetDateTime scheduledStartTime, + @JsonFormat( + shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX" + ) Optional scheduledEndTime, + Optional description, + ScheduledEntityType entityType, + Optional image +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -35,19 +38,21 @@ public DiscordRequestBuilder create() { body.put("name", name); body.put("privacy_level", privacyLevel); body.put( - "scheduled_start_time", - scheduledStartTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)); + "scheduled_start_time", + scheduledStartTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME) + ); scheduledEndTime.ifPresent( - val -> - body.put( - "scheduled_end_time", - val.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))); + val -> body.put( + "scheduled_end_time", + val.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME) + ) + ); description.ifPresent(val -> body.put("description", val)); body.put("entity_type", entityType.ordinal() + 1); image.ifPresent(val -> body.put("image", val)); return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/scheduled-events".formatted(guildId)) - .body(body); + .post() + .path("/guilds/%s/scheduled-events".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/DeleteScheduledEventRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/DeleteScheduledEventRequest.java index 1673c365..d25e3044 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/DeleteScheduledEventRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/DeleteScheduledEventRequest.java @@ -3,12 +3,14 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record DeleteScheduledEventRequest(long guildId, long scheduledEventId) - implements DiscordRequest { +public record DeleteScheduledEventRequest( + long guildId, + long scheduledEventId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)); + .delete() + .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventRequest.java index 0ee71806..7b417cb0 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventRequest.java @@ -1,23 +1,25 @@ package com.javadiscord.jdi.internal.api.guild_scheduled_event; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record GetScheduledEventRequest( - long guildId, long scheduledEventId, Optional withUserCount) - implements DiscordRequest { + long guildId, + long scheduledEventId, + Optional withUserCount +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); withUserCount.ifPresent(val -> body.put("with_user_count", val)); return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)) - .body(body); + .get() + .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventUsersRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventUsersRequest.java index a184d203..3a292637 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventUsersRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/GetScheduledEventUsersRequest.java @@ -1,18 +1,18 @@ package com.javadiscord.jdi.internal.api.guild_scheduled_event; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record GetScheduledEventUsersRequest( - long guildId, - long scheduledEventId, - Optional limit, - Optional withMember, - Optional before, - Optional after) - implements DiscordRequest { + long guildId, + long scheduledEventId, + Optional limit, + Optional withMember, + Optional before, + Optional after +) implements DiscordRequest { public GetScheduledEventUsersRequest { if (before.isPresent() && after.isPresent()) { @@ -27,11 +27,12 @@ public record GetScheduledEventUsersRequest( @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path( - "/guilds/%s/scheduled-events/%s/users" - .formatted(guildId, scheduledEventId)); + new DiscordRequestBuilder() + .get() + .path( + "/guilds/%s/scheduled-events/%s/users" + .formatted(guildId, scheduledEventId) + ); limit.ifPresent(val -> discordRequestBuilder.queryParam("limit", val)); withMember.ifPresent(val -> discordRequestBuilder.queryParam("with_member", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ListScheduledEventsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ListScheduledEventsRequest.java index d950c207..a5e2fa77 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ListScheduledEventsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ListScheduledEventsRequest.java @@ -1,21 +1,23 @@ package com.javadiscord.jdi.internal.api.guild_scheduled_event; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; -public record ListScheduledEventsRequest(long guildId, Optional withUserCount) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record ListScheduledEventsRequest( + long guildId, + Optional withUserCount +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); withUserCount.ifPresent(val -> body.put("with_user_count", val)); return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/scheduled-events".formatted(guildId)) - .body(body); + .get() + .path("/guilds/%s/scheduled-events".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ModifyScheduledEventRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ModifyScheduledEventRequest.java index f3cc0555..8e4dd41f 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ModifyScheduledEventRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/guild_scheduled_event/ModifyScheduledEventRequest.java @@ -1,27 +1,27 @@ package com.javadiscord.jdi.internal.api.guild_scheduled_event; -import com.javadiscord.jdi.core.models.guild.EntityMetadata; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.guild.EntityMetadata; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyScheduledEventRequest( - long guildId, - long scheduledEventId, - Optional channelId, - Optional entityMetadata, - Optional name, - Optional privacyLevel, - Optional scheduledStartTime, - Optional scheduledEndTime, - Optional description, - Optional entityType, - Optional status, - Optional image) - implements DiscordRequest { + long guildId, + long scheduledEventId, + Optional channelId, + Optional entityMetadata, + Optional name, + Optional privacyLevel, + Optional scheduledStartTime, + Optional scheduledEndTime, + Optional description, + Optional entityType, + Optional status, + Optional image +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); @@ -32,8 +32,9 @@ public DiscordRequestBuilder create() { if (entityType.isPresent() && entityType.get() == 3) { if (entityMetadata.isEmpty() || scheduledEndTime.isEmpty()) { throw new IllegalArgumentException( - "When entityType is EXTERNAL, both entityMetadata and scheduledEndTime must" - + " be provided"); + "When entityType is EXTERNAL, both entityMetadata and scheduledEndTime must" + + " be provided" + ); } body.put("channel_id", null); @@ -51,8 +52,8 @@ public DiscordRequestBuilder create() { status.ifPresent(val -> body.put("status", val)); image.ifPresent(val -> body.put("image", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)) - .body(body); + .patch() + .path("/guilds/%s/scheduled-events/%s".formatted(guildId, scheduledEventId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/invite/GetInviteRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/invite/GetInviteRequest.java index 321de4fe..a2debd93 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/invite/GetInviteRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/invite/GetInviteRequest.java @@ -1,18 +1,18 @@ package com.javadiscord.jdi.internal.api.invite; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record GetInviteRequest( - String inviteCode, - Optional withCounts, - Optional withExpiration, - Optional guildScheduledEventId) - implements DiscordRequest { + String inviteCode, + Optional withCounts, + Optional withExpiration, + Optional guildScheduledEventId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); @@ -21,8 +21,8 @@ public DiscordRequestBuilder create() { guildScheduledEventId.ifPresent(val -> body.put("guild_scheduled_event_id", val)); return new DiscordRequestBuilder() - .get() - .path("/invites/%s".formatted(inviteCode)) - .body(body); + .get() + .path("/invites/%s".formatted(inviteCode)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/poll/EndPollRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/poll/EndPollRequest.java index 0acf9d51..6d81613f 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/poll/EndPollRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/poll/EndPollRequest.java @@ -8,7 +8,7 @@ public record EndPollRequest(long channelId, long messageId) implements DiscordR @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .path("/channels/%s/polls/%s/expire".formatted(channelId, messageId)) - .post(); + .path("/channels/%s/polls/%s/expire".formatted(channelId, messageId)) + .post(); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/poll/GetAnswerVotersRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/poll/GetAnswerVotersRequest.java index bb151a8a..6a40c4b1 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/poll/GetAnswerVotersRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/poll/GetAnswerVotersRequest.java @@ -1,17 +1,17 @@ package com.javadiscord.jdi.internal.api.poll; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record GetAnswerVotersRequest( - long channelId, - long messageId, - long answerId, - Optional after, - Optional limit) - implements DiscordRequest { + long channelId, + long messageId, + long answerId, + Optional after, + Optional limit +) implements DiscordRequest { public GetAnswerVotersRequest { if (limit.isPresent() && (limit.get() > 100 || limit.get() < 0)) { @@ -22,11 +22,12 @@ public record GetAnswerVotersRequest( @Override public DiscordRequestBuilder create() { DiscordRequestBuilder builder = - new DiscordRequestBuilder() - .path( - "/channels/%s/polls/%s/answers/%s" - .formatted(channelId, messageId, answerId)) - .get(); + new DiscordRequestBuilder() + .path( + "/channels/%s/polls/%s/answers/%s" + .formatted(channelId, messageId, answerId) + ) + .get(); after.ifPresent(val -> builder.queryParam("after", val)); limit.ifPresent(val -> builder.queryParam("limit", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/CreateStageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/CreateStageRequest.java index 4b9090f0..8b2495ed 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/CreateStageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/CreateStageRequest.java @@ -1,20 +1,20 @@ package com.javadiscord.jdi.internal.api.stage; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateStageRequest( - long channelId, - String topic, - int privacyLevel, - Optional sendStartNotification, - Optional guildScheduledEventId, - Optional auditReason) - implements DiscordRequest { + long channelId, + String topic, + int privacyLevel, + Optional sendStartNotification, + Optional guildScheduledEventId, + Optional auditReason +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/DeleteStageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/DeleteStageRequest.java index 41c2c1a6..13336337 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/DeleteStageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/DeleteStageRequest.java @@ -7,7 +7,7 @@ public record DeleteStageRequest(long channelId) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/stage-instances/%s".formatted(channelId)); + .delete() + .path("/stage-instances/%s".formatted(channelId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/ModifyStageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/ModifyStageRequest.java index d132c10a..e7beaf82 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/stage/ModifyStageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/stage/ModifyStageRequest.java @@ -1,23 +1,25 @@ package com.javadiscord.jdi.internal.api.stage; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyStageRequest( - long channelId, Optional topic, Optional privacyLevel) - implements DiscordRequest { + long channelId, + Optional topic, + Optional privacyLevel +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); topic.ifPresent(val -> body.put("topic", val)); privacyLevel.ifPresent(val -> body.put("privacy_level", privacyLevel)); return new DiscordRequestBuilder() - .patch() - .path("/stage-instances/%s".formatted(channelId)) - .body(body); + .patch() + .path("/stage-instances/%s".formatted(channelId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/CreateGuildStickerRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/CreateGuildStickerRequest.java index f206e35d..15b4e33e 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/CreateGuildStickerRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/CreateGuildStickerRequest.java @@ -1,34 +1,39 @@ package com.javadiscord.jdi.internal.api.sticker; -import com.github.mizosoft.methanol.MultipartBodyPublisher; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.io.FileNotFoundException; import java.net.http.HttpRequest; import java.nio.file.Path; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +import com.github.mizosoft.methanol.MultipartBodyPublisher; + public record CreateGuildStickerRequest( - long guildId, String name, String description, String tags, Path filePath) - implements DiscordRequest { + long guildId, + String name, + String description, + String tags, + Path filePath +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { HttpRequest.BodyPublisher body; try { body = - MultipartBodyPublisher.newBuilder() - .textPart("name", name) - .textPart("description", description) - .textPart("tags", tags) - .filePart("file", filePath) - .build(); + MultipartBodyPublisher.newBuilder() + .textPart("name", name) + .textPart("description", description) + .textPart("tags", tags) + .filePart("file", filePath) + .build(); } catch (FileNotFoundException e) { throw new RuntimeException(e); } return new DiscordRequestBuilder() - .post() - .path("/guilds/%s/stickers".formatted(guildId)) - .body(body); + .post() + .path("/guilds/%s/stickers".formatted(guildId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/DeleteGuildStickerRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/DeleteGuildStickerRequest.java index 422f1ff3..0421cb98 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/DeleteGuildStickerRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/DeleteGuildStickerRequest.java @@ -8,7 +8,7 @@ public record DeleteGuildStickerRequest(long guildId, long stickerId) implements @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .delete() - .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)); + .delete() + .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/GetGuildStickerRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/GetGuildStickerRequest.java index 96cd8bc0..f60f1d48 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/GetGuildStickerRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/GetGuildStickerRequest.java @@ -8,7 +8,7 @@ public record GetGuildStickerRequest(long guildId, long stickerId) implements Di @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)); + .get() + .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/ModifyGuildStickerRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/ModifyGuildStickerRequest.java index b2b1a79a..7a950c0e 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/ModifyGuildStickerRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/sticker/ModifyGuildStickerRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.sticker; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyGuildStickerRequest( - long guildId, - long stickerId, - Optional name, - Optional description, - Optional tags) - implements DiscordRequest { + long guildId, + long stickerId, + Optional name, + Optional description, + Optional tags +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -23,8 +23,8 @@ public DiscordRequestBuilder create() { tags.ifPresent(val -> body.put("tags", val)); return new DiscordRequestBuilder() - .patch() - .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)) - .body(body); + .patch() + .path("/guilds/%s/stickers/%s".formatted(guildId, stickerId)) + .body(body); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateDMRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateDMRequest.java index 0d7357b5..499f8831 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateDMRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateDMRequest.java @@ -1,16 +1,16 @@ package com.javadiscord.jdi.internal.api.user; +import java.util.Map; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Map; - public record CreateDMRequest(long recipientId) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/users/@me/channels") - .body(Map.of("recipient_id", recipientId)); + .post() + .path("/users/@me/channels") + .body(Map.of("recipient_id", recipientId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateGroupDMRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateGroupDMRequest.java index 6eeb64e8..c7e315b8 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateGroupDMRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/CreateGroupDMRequest.java @@ -1,21 +1,25 @@ package com.javadiscord.jdi.internal.api.user; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.List; import java.util.Map; -public record CreateGroupDMRequest(List accessTokens, Map nicks) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record CreateGroupDMRequest( + List accessTokens, + Map nicks +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .post() - .path("/users/@me/channels") - .body( - Map.of( - "access_tokens", accessTokens, - "nicks", nicks)); + .post() + .path("/users/@me/channels") + .body( + Map.of( + "access_tokens", accessTokens, + "nicks", nicks + ) + ); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserApplicationRoleConnectionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserApplicationRoleConnectionRequest.java index 37b4e469..fd96d08d 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserApplicationRoleConnectionRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserApplicationRoleConnectionRequest.java @@ -3,12 +3,13 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record GetCurrentUserApplicationRoleConnectionRequest(long applicationId) - implements DiscordRequest { +public record GetCurrentUserApplicationRoleConnectionRequest( + long applicationId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/users/@me/applications/%d/role-connection".formatted(applicationId)); + .get() + .path("/users/@me/applications/%d/role-connection".formatted(applicationId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildMemberRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildMemberRequest.java index 38cbc20e..5c1afc41 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildMemberRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildMemberRequest.java @@ -7,7 +7,7 @@ public record GetCurrentUserGuildMemberRequest(long guildId) implements DiscordR @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/users/@me/guilds/%d/member".formatted(guildId)); + .get() + .path("/users/@me/guilds/%d/member".formatted(guildId)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildsRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildsRequest.java index 990a5b29..64c7e3eb 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildsRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/GetCurrentUserGuildsRequest.java @@ -1,18 +1,18 @@ package com.javadiscord.jdi.internal.api.user; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record GetCurrentUserGuildsRequest( - Optional before, - Optional after, - Optional limit, - Optional withCounts) - implements DiscordRequest { + Optional before, + Optional after, + Optional limit, + Optional withCounts +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map body = new HashMap<>(); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/ModifyCurrentUserRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/ModifyCurrentUserRequest.java index 2ed84277..9c1f9a55 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/ModifyCurrentUserRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/ModifyCurrentUserRequest.java @@ -1,14 +1,16 @@ package com.javadiscord.jdi.internal.api.user; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; -public record ModifyCurrentUserRequest(String username, Optional avatarImage) - implements DiscordRequest { +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +public record ModifyCurrentUserRequest( + String username, + Optional avatarImage +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map payload = new HashMap<>(); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/user/UpdateCurrentUserApplicationRoleConnectionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/user/UpdateCurrentUserApplicationRoleConnectionRequest.java index b1f36e3d..14a32baa 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/user/UpdateCurrentUserApplicationRoleConnectionRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/user/UpdateCurrentUserApplicationRoleConnectionRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.user; -import com.javadiscord.jdi.core.models.application.ApplicationRoleConnectionMetadata; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.core.models.application.ApplicationRoleConnectionMetadata; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record UpdateCurrentUserApplicationRoleConnectionRequest( - Long applicationId, - Optional platformName, - Optional platformUsername, - Optional metadata) - implements DiscordRequest { + Long applicationId, + Optional platformName, + Optional platformUsername, + Optional metadata +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { Map payload = new HashMap<>(); @@ -22,8 +22,8 @@ public DiscordRequestBuilder create() { metadata.ifPresent(val -> payload.put("metadata", metadata)); return new DiscordRequestBuilder() - .path("/users/@me/applications/%d/role-connection".formatted(applicationId)) - .put() - .body(payload); + .path("/users/@me/applications/%d/role-connection".formatted(applicationId)) + .put() + .body(payload); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/CreateWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/CreateWebhookRequest.java index 16ab90f2..4796b0fe 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/CreateWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/CreateWebhookRequest.java @@ -1,15 +1,18 @@ package com.javadiscord.jdi.internal.api.webhook; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record CreateWebhookRequest( - long channelId, String name, Optional avatar, Optional reason) - implements DiscordRequest { + long channelId, + String name, + Optional avatar, + Optional reason +) implements DiscordRequest { public CreateWebhookRequest { if (name.length() > 80 || name.isEmpty()) @@ -18,11 +21,14 @@ public record CreateWebhookRequest( // Must follow Discord's naming guidelines String[] disallowedSubstrings = {"clyde", "discord", "@", "#", ":", "```"}; for (String s : disallowedSubstrings) { - if (name.toLowerCase() - .contains(s.toLowerCase())) { // Crude way of checking case insensitivity + if ( + name.toLowerCase() + .contains(s.toLowerCase()) + ) { // Crude way of checking case insensitivity throw new IllegalArgumentException( - "Cannot include one of the following characters: clyde, discord, @, #, :," - + " ```"); + "Cannot include one of the following characters: clyde, discord, @, #, :," + + " ```" + ); } } } @@ -34,10 +40,10 @@ public DiscordRequestBuilder create() { avatar.ifPresent(val -> body.put("avatar", val)); DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .post() - .path("/channels/%s/webhooks".formatted(channelId)) - .body(body); + new DiscordRequestBuilder() + .post() + .path("/channels/%s/webhooks".formatted(channelId)) + .body(body); reason.ifPresent(reason -> discordRequestBuilder.putHeader("X-Audit-Log-Reason", reason)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookMessageRequest.java index ae10493b..7ccfe429 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookMessageRequest.java @@ -1,21 +1,25 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record DeleteWebhookMessageRequest( - long webhookId, String webhookToken, long messageId, Optional threadId) - implements DiscordRequest { + long webhookId, + String webhookToken, + long messageId, + Optional threadId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .delete() - .path( - "/webhooks/%s/%s/messages/%s" - .formatted(webhookId, webhookToken, messageId)); + new DiscordRequestBuilder() + .delete() + .path( + "/webhooks/%s/%s/messages/%s" + .formatted(webhookId, webhookToken, messageId) + ); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookRequest.java index ccbaa534..24d53b1b 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookRequest.java @@ -1,17 +1,19 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - -public record DeleteWebhookRequest(long webhookId, Optional reason) - implements DiscordRequest { +public record DeleteWebhookRequest( + long webhookId, + Optional reason +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder().delete().path("/webhooks/%s".formatted(webhookId)); + new DiscordRequestBuilder().delete().path("/webhooks/%s".formatted(webhookId)); reason.ifPresent(reason -> discordRequestBuilder.putHeader("X-Audit-Log-Reason", reason)); return discordRequestBuilder; diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookWithTokenRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookWithTokenRequest.java index 52726461..d5d6fbf8 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookWithTokenRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/DeleteWebhookWithTokenRequest.java @@ -1,19 +1,22 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record DeleteWebhookWithTokenRequest( - long webhookId, String webhookToken, Optional reason) implements DiscordRequest { + long webhookId, + String webhookToken, + Optional reason +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .delete() - .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)); + new DiscordRequestBuilder() + .delete() + .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)); reason.ifPresent(reason -> discordRequestBuilder.putHeader("X-Audit-Log-Reason", reason)); return discordRequestBuilder; diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/EditWebhookMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/EditWebhookMessageRequest.java index 14366637..97b91948 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/EditWebhookMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/EditWebhookMessageRequest.java @@ -1,6 +1,12 @@ package com.javadiscord.jdi.internal.api.webhook; -import com.github.mizosoft.methanol.MultipartBodyPublisher; +import java.io.FileNotFoundException; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import com.javadiscord.jdi.core.models.channel.AllowedMentions; import com.javadiscord.jdi.core.models.message.Component; import com.javadiscord.jdi.core.models.message.MessageAttachment; @@ -8,25 +14,20 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.io.FileNotFoundException; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import com.github.mizosoft.methanol.MultipartBodyPublisher; public record EditWebhookMessageRequest( - long webhookId, - String webhookToken, - long messageId, - Optional threadId, - Optional content, - Optional> embeds, - Optional allowedMentions, - Optional> components, - Optional> files, - Optional> attachments) - implements DiscordRequest { + long webhookId, + String webhookToken, + long messageId, + Optional threadId, + Optional content, + Optional> embeds, + Optional allowedMentions, + Optional> components, + Optional> files, + Optional> attachments +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -42,22 +43,23 @@ public DiscordRequestBuilder create() { bodyBuilder.textPart("payload_json", body); files.ifPresent( - paths -> { - for (int i = 0; i < paths.size(); i++) { - try { - bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); - } catch (FileNotFoundException ignored) { - } - } - }); + paths -> { + for (int i = 0; i < paths.size(); i++) { + try { + bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); + } catch (FileNotFoundException ignored) {} + } + } + ); DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .patch() - .path( - "/webhooks/%s/%s/messages/%s" - .formatted(webhookId, webhookToken, messageId)) - .multipartBody(bodyBuilder.build()); + new DiscordRequestBuilder() + .patch() + .path( + "/webhooks/%s/%s/messages/%s" + .formatted(webhookId, webhookToken, messageId) + ) + .multipartBody(bodyBuilder.build()); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); return discordRequestBuilder; diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteGithubCompatibleWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteGithubCompatibleWebhookRequest.java index 6eaa7497..25189d86 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteGithubCompatibleWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteGithubCompatibleWebhookRequest.java @@ -1,19 +1,22 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record ExecuteGithubCompatibleWebhookRequest( - long webhookId, String webhookToken, Optional threadId, Optional waits) - implements DiscordRequest { + long webhookId, + String webhookToken, + Optional threadId, + Optional waits +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .post() - .path("/webhooks/%s/%s/github".formatted(webhookId, webhookToken)); + new DiscordRequestBuilder() + .post() + .path("/webhooks/%s/%s/github".formatted(webhookId, webhookToken)); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); waits.ifPresent(val -> discordRequestBuilder.queryParam("wait", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteSlackCompatibleWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteSlackCompatibleWebhookRequest.java index fdb25ee0..346e5ee7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteSlackCompatibleWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteSlackCompatibleWebhookRequest.java @@ -1,19 +1,22 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record ExecuteSlackCompatibleWebhookRequest( - long webhookId, String webhookToken, Optional threadId, Optional waits) - implements DiscordRequest { + long webhookId, + String webhookToken, + Optional threadId, + Optional waits +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .post() - .path("/webhooks/%s/%s/slack".formatted(webhookId, webhookToken)); + new DiscordRequestBuilder() + .post() + .path("/webhooks/%s/%s/slack".formatted(webhookId, webhookToken)); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); waits.ifPresent(val -> discordRequestBuilder.queryParam("wait", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteWebhookRequest.java index 5a1f7737..72f541b6 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ExecuteWebhookRequest.java @@ -1,13 +1,5 @@ package com.javadiscord.jdi.internal.api.webhook; -import com.github.mizosoft.methanol.MultipartBodyPublisher; -import com.javadiscord.jdi.core.models.channel.AllowedMentions; -import com.javadiscord.jdi.core.models.message.MessageAttachment; -import com.javadiscord.jdi.core.models.message.embed.Embed; -import com.javadiscord.jdi.core.models.poll.Poll; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.io.FileNotFoundException; import java.nio.file.Path; import java.util.HashMap; @@ -16,30 +8,40 @@ import java.util.Optional; import java.util.stream.Stream; +import com.javadiscord.jdi.core.models.channel.AllowedMentions; +import com.javadiscord.jdi.core.models.message.MessageAttachment; +import com.javadiscord.jdi.core.models.message.embed.Embed; +import com.javadiscord.jdi.core.models.poll.Poll; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + +import com.github.mizosoft.methanol.MultipartBodyPublisher; + public record ExecuteWebhookRequest( - long webhookId, - String webhookToken, - Optional waits, - Optional threadId, - Optional content, - Optional username, - Optional avatarUrl, - Optional tts, - Optional> embeds, - Optional allowedMentions, - Optional> components, - Optional> files, - Optional> attachments, - Optional flags, - Optional threadName, - Optional> appliedTags, - Optional poll) - implements DiscordRequest { + long webhookId, + String webhookToken, + Optional waits, + Optional threadId, + Optional content, + Optional username, + Optional avatarUrl, + Optional tts, + Optional> embeds, + Optional allowedMentions, + Optional> components, + Optional> files, + Optional> attachments, + Optional flags, + Optional threadName, + Optional> appliedTags, + Optional poll +) implements DiscordRequest { public ExecuteWebhookRequest { if (Stream.of(content, embeds, components, files, poll).noneMatch(Optional::isPresent)) { throw new IllegalArgumentException( - "At least one of content, embeds, components, files, poll should be present"); + "At least one of content, embeds, components, files, poll should be present" + ); } } @@ -64,20 +66,20 @@ public DiscordRequestBuilder create() { bodyBuilder.textPart("payload_json", body); files.ifPresent( - paths -> { - for (int i = 0; i < paths.size(); i++) { - try { - bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); - } catch (FileNotFoundException ignored) { - } - } - }); + paths -> { + for (int i = 0; i < paths.size(); i++) { + try { + bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i)); + } catch (FileNotFoundException ignored) {} + } + } + ); DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .post() - .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)) - .multipartBody(bodyBuilder.build()); + new DiscordRequestBuilder() + .post() + .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)) + .multipartBody(bodyBuilder.build()); waits.ifPresent(val -> discordRequestBuilder.queryParam("wait", val)); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookMessageRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookMessageRequest.java index 00cc9713..b571463f 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookMessageRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookMessageRequest.java @@ -1,21 +1,25 @@ package com.javadiscord.jdi.internal.api.webhook; +import java.util.Optional; + import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -import java.util.Optional; - public record GetWebhookMessageRequest( - long webhookId, String webhookToken, long messageId, Optional threadId) - implements DiscordRequest { + long webhookId, + String webhookToken, + long messageId, + Optional threadId +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .get() - .path( - "/webhooks/%s/%s/messages/%s" - .formatted(webhookId, webhookToken, messageId)); + new DiscordRequestBuilder() + .get() + .path( + "/webhooks/%s/%s/messages/%s" + .formatted(webhookId, webhookToken, messageId) + ); threadId.ifPresent(val -> discordRequestBuilder.queryParam("thread_id", val)); diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookWithTokenRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookWithTokenRequest.java index 2c02022f..f40824ca 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookWithTokenRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/GetWebhookWithTokenRequest.java @@ -3,13 +3,15 @@ import com.javadiscord.jdi.internal.api.DiscordRequest; import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; -public record GetWebhookWithTokenRequest(long webhookId, String webhookToken) - implements DiscordRequest { +public record GetWebhookWithTokenRequest( + long webhookId, + String webhookToken +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { return new DiscordRequestBuilder() - .get() - .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)); + .get() + .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)); } } diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookRequest.java index bd28823f..2aa6008e 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.webhook; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyWebhookRequest( - String webhookId, - Optional name, - Optional avatar, - Optional channelId, - Optional reason) - implements DiscordRequest { + String webhookId, + Optional name, + Optional avatar, + Optional channelId, + Optional reason +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -23,10 +23,10 @@ public DiscordRequestBuilder create() { channelId.ifPresent(val -> body.put("channel_id", val)); DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .patch() - .path("/webhooks/%s".formatted(webhookId)) - .body(body); + new DiscordRequestBuilder() + .patch() + .path("/webhooks/%s".formatted(webhookId)) + .body(body); reason.ifPresent(reason -> discordRequestBuilder.putHeader("X-Audit-Log-Reason", reason)); return discordRequestBuilder; diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookWithTokenRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookWithTokenRequest.java index ce171e41..29d8be45 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookWithTokenRequest.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/webhook/ModifyWebhookWithTokenRequest.java @@ -1,19 +1,19 @@ package com.javadiscord.jdi.internal.api.webhook; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestBuilder; + public record ModifyWebhookWithTokenRequest( - long webhookId, - String webhookToken, - Optional name, - Optional avatar, - Optional reason) - implements DiscordRequest { + long webhookId, + String webhookToken, + Optional name, + Optional avatar, + Optional reason +) implements DiscordRequest { @Override public DiscordRequestBuilder create() { @@ -22,10 +22,10 @@ public DiscordRequestBuilder create() { avatar.ifPresent(val -> body.put("avatar", val)); DiscordRequestBuilder discordRequestBuilder = - new DiscordRequestBuilder() - .patch() - .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)) - .body(body); + new DiscordRequestBuilder() + .patch() + .path("/webhooks/%s/%s".formatted(webhookId, webhookToken)) + .body(body); reason.ifPresent(reason -> discordRequestBuilder.putHeader("X-Audit-Log-Reason", reason)); return discordRequestBuilder; diff --git a/build.gradle b/build.gradle index 2cb85eda..01993fde 100644 --- a/build.gradle +++ b/build.gradle @@ -16,17 +16,12 @@ subprojects { spotless { java { - importOrder() - googleJavaFormat() - .aosp() - .reflowLongStrings() - .formatJavadoc(true) - .reorderImports(true) - .groupArtifact('com.google.googlejavaformat:google-java-format') + target('**/java/**/*.java') trimTrailingWhitespace() - indentWithSpaces() - endWithNewline() - } + removeUnusedImports() + // '\\#' = static imports, '' = everything else + importOrder('\\#', 'java', 'javax', 'com.javadiscord', '') + eclipse().configFile("${rootProject.rootDir}/spotless.xml")} } group = 'com.javadiscord' @@ -99,4 +94,4 @@ tasks.register('bumpMajorVersion') { file('gradle.properties').text = "version=$newVersion" println "Version bumped to: $newVersion" } -} \ No newline at end of file +} diff --git a/cache/src/main/java/com/javadiscord/jdi/internal/cache/CacheInterface.java b/cache/src/main/java/com/javadiscord/jdi/internal/cache/CacheInterface.java index 1a5144a8..c72588d6 100644 --- a/cache/src/main/java/com/javadiscord/jdi/internal/cache/CacheInterface.java +++ b/cache/src/main/java/com/javadiscord/jdi/internal/cache/CacheInterface.java @@ -35,37 +35,39 @@ default T update(T original, T updated) { currentValues[i] = field.get(original); } - return (T) - constructor.newInstance( - Stream.of(constructor.getParameters()) - .map( - parameter -> { - try { - Field field = - recordClass.getDeclaredField( - parameter.getName()); - field.setAccessible(true); - Object value = field.get(updated); - if (value != null) { - return value; - } - return currentValues[ - (int) - Stream.of( - constructor - .getParameters()) - .filter( - p -> - p - == parameter) - .count() - - 1]; - } catch (IllegalAccessException - | NoSuchFieldException e) { - throw new RuntimeException(e); - } - }) - .toArray()); + return (T) constructor.newInstance( + Stream.of(constructor.getParameters()) + .map( + parameter -> { + try { + Field field = + recordClass.getDeclaredField( + parameter.getName() + ); + field.setAccessible(true); + Object value = field.get(updated); + if (value != null) { + return value; + } + return currentValues[(int) Stream.of( + constructor + .getParameters() + ) + .filter( + p -> p == parameter + ) + .count() + - 1]; + } catch ( + IllegalAccessException + | NoSuchFieldException e + ) { + throw new RuntimeException(e); + } + } + ) + .toArray() + ); } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(e); } diff --git a/core/src/main/java/com/javadiscord/jdi/core/Discord.java b/core/src/main/java/com/javadiscord/jdi/core/Discord.java index 45991b69..4185e688 100644 --- a/core/src/main/java/com/javadiscord/jdi/core/Discord.java +++ b/core/src/main/java/com/javadiscord/jdi/core/Discord.java @@ -1,17 +1,5 @@ package com.javadiscord.jdi.core; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.javadiscord.jdi.internal.api.DiscordRequest; -import com.javadiscord.jdi.internal.api.DiscordRequestDispatcher; -import com.javadiscord.jdi.internal.api.DiscordResponseFuture; -import com.javadiscord.jdi.internal.cache.Cache; -import com.javadiscord.jdi.internal.cache.CacheType; -import com.javadiscord.jdi.internal.gateway.*; -import com.javadiscord.jdi.internal.gateway.identify.IdentifyRequest; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -26,6 +14,18 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import com.javadiscord.jdi.internal.api.DiscordRequest; +import com.javadiscord.jdi.internal.api.DiscordRequestDispatcher; +import com.javadiscord.jdi.internal.api.DiscordResponseFuture; +import com.javadiscord.jdi.internal.cache.Cache; +import com.javadiscord.jdi.internal.cache.CacheType; +import com.javadiscord.jdi.internal.gateway.*; +import com.javadiscord.jdi.internal.gateway.identify.IdentifyRequest; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class Discord { private static final Logger LOGGER = LogManager.getLogger(); private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(); @@ -33,9 +33,9 @@ public class Discord { private static final String WEBSITE = "https://javadiscord.com/"; private static final String BASE_URL = - System.getProperty("DISCORD_BASE_URL") != null - ? System.getProperty("DISCORD_BASE_URL") - : "https://discord.com/api"; + System.getProperty("DISCORD_BASE_URL") != null + ? System.getProperty("DISCORD_BASE_URL") + : "https://discord.com/api"; private final String botToken; private final IdentifyRequest identifyRequest; @@ -51,40 +51,42 @@ public class Discord { public Discord(String botToken) { this( - botToken, - IdentifyRequest.builder() - .token(botToken) - .os(WEBSITE) - .browser(WEBSITE) - .device(WEBSITE) - .compress(false) - .largeThreshold(250) - .shard(new int[] {0, 1}) - .activityName("") - .activityType(0) - .presenceStatus("online") - .afk(false) - .intents(GatewayIntent.allIntents()) - .build()); + botToken, + IdentifyRequest.builder() + .token(botToken) + .os(WEBSITE) + .browser(WEBSITE) + .device(WEBSITE) + .compress(false) + .largeThreshold(250) + .shard(new int[] {0, 1}) + .activityName("") + .activityType(0) + .presenceStatus("online") + .afk(false) + .intents(GatewayIntent.allIntents()) + .build() + ); } public Discord(String botToken, List intents) { this( - botToken, - IdentifyRequest.builder() - .token(botToken) - .os(WEBSITE) - .browser(WEBSITE) - .device(WEBSITE) - .compress(false) - .largeThreshold(250) - .shard(new int[] {0, 1}) - .activityName("") - .activityType(0) - .presenceStatus("online") - .afk(false) - .intents(GatewayIntent.valueOf(intents)) - .build()); + botToken, + IdentifyRequest.builder() + .token(botToken) + .os(WEBSITE) + .browser(WEBSITE) + .device(WEBSITE) + .compress(false) + .largeThreshold(250) + .shard(new int[] {0, 1}) + .activityName("") + .activityType(0) + .presenceStatus("online") + .afk(false) + .intents(GatewayIntent.valueOf(intents)) + .build() + ); } public Discord(String botToken, IdentifyRequest identifyRequest) { @@ -96,7 +98,7 @@ public Discord(String botToken, IdentifyRequest identifyRequest, Cache cache) { this.discordRequestDispatcher = new DiscordRequestDispatcher(botToken); this.gateway = getGatewayURL(botToken); this.gatewaySetting = - new GatewaySetting().setEncoding(GatewayEncoding.JSON).setApiVersion(10); + new GatewaySetting().setEncoding(GatewayEncoding.JSON).setApiVersion(10); this.identifyRequest = identifyRequest; this.cache = cache; if (annotationLibPresent()) { @@ -127,27 +129,30 @@ private void loadAnnotations() { } } } - } catch (ClassNotFoundException - | InstantiationException - | IllegalAccessException - | InvocationTargetException ignore) { + } catch ( + ClassNotFoundException + | InstantiationException + | IllegalAccessException + | InvocationTargetException ignore + ) { /* Ignore */ } } public void start() { this.webSocketManager = - new WebSocketManager( - new GatewaySetting().setApiVersion(10).setEncoding(GatewayEncoding.JSON), - identifyRequest, - cache); + new WebSocketManager( + new GatewaySetting().setApiVersion(10).setEncoding(GatewayEncoding.JSON), + identifyRequest, + cache + ); WebSocketManagerProxy webSocketManagerProxy = - new WebSocketManagerProxy(this.webSocketManager); + new WebSocketManagerProxy(this.webSocketManager); ConnectionDetails connectionDetails = - new ConnectionDetails(gateway.url(), botToken, gatewaySetting); + new ConnectionDetails(gateway.url(), botToken, gatewaySetting); ConnectionMediator connectionMediator = - new ConnectionMediator(connectionDetails, webSocketManagerProxy); + new ConnectionMediator(connectionDetails, webSocketManagerProxy); connectionMediator.addObserver(new GatewayEventListenerAnnotations(this)); connectionMediator.addObserver(new GatewayEventListener(this)); webSocketManagerProxy.start(connectionMediator); @@ -168,8 +173,9 @@ public void stop() { EXECUTOR.shutdownNow(); if (!EXECUTOR.awaitTermination(30, TimeUnit.SECONDS)) { LOGGER.warn( - "Executor failed to shutdown within the specified time limit, some" - + " tasks may still be running"); + "Executor failed to shutdown within the specified time limit, some" + + " tasks may still be running" + ); } } } catch (InterruptedException ie) { @@ -194,13 +200,13 @@ public DiscordResponseFuture sendRequest(DiscordRequest request) { private static Gateway getGatewayURL(String authentication) { try (HttpClient httpClient = HttpClient.newBuilder().build()) { HttpRequest request = - HttpRequest.newBuilder() - .uri(URI.create(BASE_URL + "/gateway/bot")) - .header("Authorization", "Bot " + authentication) - .GET() - .build(); + HttpRequest.newBuilder() + .uri(URI.create(BASE_URL + "/gateway/bot")) + .header("Authorization", "Bot " + authentication) + .GET() + .build(); HttpResponse response = - httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + httpClient.send(request, HttpResponse.BodyHandlers.ofString()); if (response.statusCode() == 401) { throw new RuntimeException("Invalid bot token provided"); diff --git a/core/src/main/java/com/javadiscord/jdi/core/EventListener.java b/core/src/main/java/com/javadiscord/jdi/core/EventListener.java index d4f1e6a9..816144ee 100644 --- a/core/src/main/java/com/javadiscord/jdi/core/EventListener.java +++ b/core/src/main/java/com/javadiscord/jdi/core/EventListener.java @@ -42,7 +42,9 @@ default void onUserUpdate(User user, Guild guild) {} default void onMessageReactionsRemoved(MessageReactionsRemoved reactionsRemoved, Guild guild) {} default void onMessageReactionRemovedAll( - MessageReactionsRemoved reactionsRemoved, Guild guild) {} + MessageReactionsRemoved reactionsRemoved, + Guild guild + ) {} default void onScheduledEventUpdate(ScheduledEvent scheduledEvent, Guild guild) {} @@ -59,7 +61,9 @@ default void onChannelDelete(Channel channel, Guild guild) {} default void onEntitlementCreate(Entitlement entitlement, Guild guild) {} default void onAutoModerationRuleExecution( - AutoModerationRule autoModerationRule, Guild guild) {} + AutoModerationRule autoModerationRule, + Guild guild + ) {} default void onMessageUpdate(Message message, Guild guild) {} diff --git a/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListener.java b/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListener.java index be67a10d..34cd513d 100644 --- a/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListener.java +++ b/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListener.java @@ -1,5 +1,7 @@ package com.javadiscord.jdi.core; +import java.lang.reflect.Field; + import com.javadiscord.jdi.core.models.application.Application; import com.javadiscord.jdi.core.models.audit_log.AuditLogEntry; import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationRule; @@ -26,8 +28,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.lang.reflect.Field; - public class GatewayEventListener implements GatewayObserver { private static final Logger LOGGER = LogManager.getLogger(); private final Discord discord; @@ -39,9 +39,10 @@ public GatewayEventListener(Discord discord) { static Guild getGuild(Discord discord, Object event) { if (event instanceof com.javadiscord.jdi.core.models.guild.Guild) { return new Guild( - (com.javadiscord.jdi.core.models.guild.Guild) event, - discord.getCache(), - discord); + (com.javadiscord.jdi.core.models.guild.Guild) event, + discord.getCache(), + discord + ); } Cache cache = discord.getCache(); @@ -58,11 +59,11 @@ static Guild getGuild(Discord discord, Object event) { } com.javadiscord.jdi.core.models.guild.Guild model = - (com.javadiscord.jdi.core.models.guild.Guild) - cache.getCacheForGuild(guildId) - .get( - guildId, - com.javadiscord.jdi.core.models.guild.Guild.class); + (com.javadiscord.jdi.core.models.guild.Guild) cache.getCacheForGuild(guildId) + .get( + guildId, + com.javadiscord.jdi.core.models.guild.Guild.class + ); guild = new Guild(model, cache, discord); } catch (NoSuchFieldException | IllegalAccessException e) { LOGGER.debug("{} did not come with a guildId field", event.getClass().getSimpleName()); @@ -110,52 +111,53 @@ public void receive(EventType eventType, Object event) { case CHANNEL_PINS_UPDATE -> listener.onChannelPinUpdate((MessagePin) event, guild); case GUILD_MEMBERS_CHUNK -> listener.onMemberChunk(event, guild); case MESSAGE_DELETE_BULK -> - listener.onMessageBulkDelete((MessageBulkDelete) event, guild); + listener.onMessageBulkDelete((MessageBulkDelete) event, guild); case VOICE_SERVER_UPDATE -> - listener.onVoiceServerUpdate((VoiceServer) event, guild); + listener.onVoiceServerUpdate((VoiceServer) event, guild); case MESSAGE_REACTION_ADD -> - listener.onMessageReactionAdd((MessageReaction) event, guild); + listener.onMessageReactionAdd((MessageReaction) event, guild); case THREAD_MEMBER_UPDATE -> - listener.onThreadMemberUpdate((ThreadMember) event, guild); + listener.onThreadMemberUpdate((ThreadMember) event, guild); case GUILD_STICKERS_UPDATE -> - listener.onStickerUpdate((StickerUpdate) event, guild); + listener.onStickerUpdate((StickerUpdate) event, guild); case STAGE_INSTANCE_CREATE -> listener.onStageCreate((Stage) event, guild); case STAGE_INSTANCE_DELETE -> listener.onStageDelete((Stage) event, guild); case STAGE_INSTANCE_UPDATE -> listener.onStageUpdate((Stage) event, guild); case THREAD_MEMBERS_UPDATE -> - listener.onThreadMembersUpdate((ThreadMember) event, guild); + listener.onThreadMembersUpdate((ThreadMember) event, guild); case MESSAGE_REACTION_REMOVE -> - listener.onMessageReactionsRemoved((MessageReactionsRemoved) event, guild); + listener.onMessageReactionsRemoved((MessageReactionsRemoved) event, guild); case GUILD_INTEGRATIONS_UPDATE -> - listener.onGuildIntegrationUpdate((Integration) event, guild); + listener.onGuildIntegrationUpdate((Integration) event, guild); case AUTO_MODERATION_RULE_CREATE -> - listener.onAutoModerationRuleCreate((AutoModerationRule) event, guild); + listener.onAutoModerationRuleCreate((AutoModerationRule) event, guild); case AUTO_MODERATION_RULE_DELETE -> - listener.onAutoModerationRuleDelete((AutoModerationRule) event, guild); + listener.onAutoModerationRuleDelete((AutoModerationRule) event, guild); case AUTO_MODERATION_RULE_UPDATE -> - listener.onAutoModerationRuleUpdate((AutoModerationRule) event, guild); + listener.onAutoModerationRuleUpdate((AutoModerationRule) event, guild); case MESSAGE_REACTION_REMOVE_ALL -> - listener.onMessageReactionRemovedAll( - (MessageReactionsRemoved) event, guild); + listener.onMessageReactionRemovedAll( + (MessageReactionsRemoved) event, guild + ); case GUILD_SCHEDULED_EVENT_CREATE -> - listener.onScheduledEventCreate((ScheduledEvent) event, guild); + listener.onScheduledEventCreate((ScheduledEvent) event, guild); case GUILD_SCHEDULED_EVENT_DELETE -> - listener.onScheduledEventDelete((ScheduledEvent) event, guild); + listener.onScheduledEventDelete((ScheduledEvent) event, guild); case GUILD_SCHEDULED_EVENT_UPDATE -> - listener.onScheduledEventUpdate((ScheduledEvent) event, guild); + listener.onScheduledEventUpdate((ScheduledEvent) event, guild); case MESSAGE_REACTION_REMOVE_EMOJI -> - listener.onReactionRemove((MessageReaction) event, guild); + listener.onReactionRemove((MessageReaction) event, guild); case GUILD_SCHEDULED_EVENT_USER_ADD -> - listener.onScheduledEventUserAdd((EventUser) event, guild); + listener.onScheduledEventUserAdd((EventUser) event, guild); case AUTO_MODERATION_ACTION_EXECUTION -> - listener.onAutoModerationRuleExecution((AutoModerationRule) event, guild); + listener.onAutoModerationRuleExecution((AutoModerationRule) event, guild); case GUILD_SCHEDULED_EVENT_USER_REMOVE -> - listener.onScheduledEventUserRemove((EventUser) event, guild); + listener.onScheduledEventUserRemove((EventUser) event, guild); case GUILD_EMOJIS_UPDATE -> listener.onEmojiUpdate((Emoji) event, guild); case GUILD_AUDIT_LOG_ENTRY_CREATE -> - listener.onAuditLogEntryCreate((AuditLogEntry) event, guild); + listener.onAuditLogEntryCreate((AuditLogEntry) event, guild); case APPLICATION_COMMAND_PERMISSIONS_UPDATE -> - listener.onApplicationPermissionCommandUpdate((Application) event, guild); + listener.onApplicationPermissionCommandUpdate((Application) event, guild); default -> LOGGER.trace("Unexpected value {}", eventType); } } diff --git a/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListenerAnnotations.java b/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListenerAnnotations.java index 0adee74f..5c2fcf44 100644 --- a/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListenerAnnotations.java +++ b/core/src/main/java/com/javadiscord/jdi/core/GatewayEventListenerAnnotations.java @@ -1,11 +1,5 @@ package com.javadiscord.jdi.core; -import com.javadiscord.jdi.internal.gateway.handlers.events.EventType; -import com.javadiscord.jdi.internal.gateway.handlers.events.codec.GatewayObserver; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Parameter; @@ -14,144 +8,201 @@ import java.util.List; import java.util.Map; +import com.javadiscord.jdi.internal.gateway.handlers.events.EventType; +import com.javadiscord.jdi.internal.gateway.handlers.events.codec.GatewayObserver; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class GatewayEventListenerAnnotations implements GatewayObserver { private static final Logger LOGGER = LogManager.getLogger(); public static final Map EVENT_TYPE_ANNOTATIONS = new HashMap<>(); static { EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_CREATE, "com.javadiscord.jdi.core.annotations.GuildCreate"); + EventType.GUILD_CREATE, "com.javadiscord.jdi.core.annotations.GuildCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_DELETE, "com.javadiscord.jdi.core.annotations.GuildDelete"); + EventType.GUILD_DELETE, "com.javadiscord.jdi.core.annotations.GuildDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_UPDATE, "com.javadiscord.jdi.core.annotations.GuildUpdateEvent"); + EventType.GUILD_UPDATE, "com.javadiscord.jdi.core.annotations.GuildUpdateEvent" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.CHANNEL_CREATE, "com.javadiscord.jdi.core.annotations.ChannelCreate"); + EventType.CHANNEL_CREATE, "com.javadiscord.jdi.core.annotations.ChannelCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_CREATE, "com.javadiscord.jdi.core.annotations.MessageCreate"); + EventType.MESSAGE_CREATE, "com.javadiscord.jdi.core.annotations.MessageCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_DELETE, "com.javadiscord.jdi.core.annotations.MessageDelete"); + EventType.MESSAGE_DELETE, "com.javadiscord.jdi.core.annotations.MessageDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_UPDATE, "com.javadiscord.jdi.core.annotations.MessageUpdate"); + EventType.MESSAGE_UPDATE, "com.javadiscord.jdi.core.annotations.MessageUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_REACTION_REMOVE, - "com.javadiscord.jdi.core.annotations.ReactionRemove"); + EventType.MESSAGE_REACTION_REMOVE, + "com.javadiscord.jdi.core.annotations.ReactionRemove" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_REACTION_REMOVE_EMOJI, - "com.javadiscord.jdi.core.annotations.ReactionRemove"); + EventType.MESSAGE_REACTION_REMOVE_EMOJI, + "com.javadiscord.jdi.core.annotations.ReactionRemove" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.TYPING_START, "com.javadiscord.jdi.core.annotations.TypingStart"); + EventType.TYPING_START, "com.javadiscord.jdi.core.annotations.TypingStart" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.CHANNEL_PINS_UPDATE, - "com.javadiscord.jdi.core.annotations.ChannelPinUpdate"); + EventType.CHANNEL_PINS_UPDATE, + "com.javadiscord.jdi.core.annotations.ChannelPinUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_ROLE_CREATE, - "com.javadiscord.jdi.core.annotations.GuildRoleCreate"); + EventType.GUILD_ROLE_CREATE, + "com.javadiscord.jdi.core.annotations.GuildRoleCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_ROLE_UPDATE, - "com.javadiscord.jdi.core.annotations.GuildRoleUpdate"); + EventType.GUILD_ROLE_UPDATE, + "com.javadiscord.jdi.core.annotations.GuildRoleUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_ROLE_DELETE, - "com.javadiscord.jdi.core.annotations.GuildRoleDelete"); + EventType.GUILD_ROLE_DELETE, + "com.javadiscord.jdi.core.annotations.GuildRoleDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_CREATE, "com.javadiscord.jdi.core.annotations.ThreadCreate"); + EventType.THREAD_CREATE, "com.javadiscord.jdi.core.annotations.ThreadCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_UPDATE, "com.javadiscord.jdi.core.annotations.ThreadUpdate"); + EventType.THREAD_UPDATE, "com.javadiscord.jdi.core.annotations.ThreadUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_DELETE, "com.javadiscord.jdi.core.annotations.ThreadDelete"); + EventType.THREAD_DELETE, "com.javadiscord.jdi.core.annotations.ThreadDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_MEMBER_UPDATE, - "com.javadiscord.jdi.core.annotations.GuildMemberUpdate"); + EventType.GUILD_MEMBER_UPDATE, + "com.javadiscord.jdi.core.annotations.GuildMemberUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_MEMBER_REMOVE, - "com.javadiscord.jdi.core.annotations.GuildMemberRemove"); + EventType.GUILD_MEMBER_REMOVE, + "com.javadiscord.jdi.core.annotations.GuildMemberRemove" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_MEMBER_ADD, "com.javadiscord.jdi.core.annotations.GuildMemberAdd"); + EventType.GUILD_MEMBER_ADD, "com.javadiscord.jdi.core.annotations.GuildMemberAdd" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.INVITE_CREATE, "com.javadiscord.jdi.core.annotations.GuildInviteCreate"); + EventType.INVITE_CREATE, "com.javadiscord.jdi.core.annotations.GuildInviteCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.INVITE_DELETE, "com.javadiscord.jdi.core.annotations.GuildInviteDelete"); + EventType.INVITE_DELETE, "com.javadiscord.jdi.core.annotations.GuildInviteDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.USER_UPDATE, "com.javadiscord.jdi.core.annotations.UserUpdate"); + EventType.USER_UPDATE, "com.javadiscord.jdi.core.annotations.UserUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_LIST_SYNC, "com.javadiscord.jdi.core.annotations.ThreadListSync"); + EventType.THREAD_LIST_SYNC, "com.javadiscord.jdi.core.annotations.ThreadListSync" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_MEMBER_UPDATE, - "com.javadiscord.jdi.core.annotations.ThreadMember"); + EventType.THREAD_MEMBER_UPDATE, + "com.javadiscord.jdi.core.annotations.ThreadMember" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.THREAD_MEMBERS_UPDATE, - "com.javadiscord.jdi.core.annotations.ThreadMemberUpdate"); + EventType.THREAD_MEMBERS_UPDATE, + "com.javadiscord.jdi.core.annotations.ThreadMemberUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_BAN_ADD, "com.javadiscord.jdi.core.annotations.GuildBan"); + EventType.GUILD_BAN_ADD, "com.javadiscord.jdi.core.annotations.GuildBan" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_BAN_REMOVE, "com.javadiscord.jdi.core.annotations.GuildBanRemove"); + EventType.GUILD_BAN_REMOVE, "com.javadiscord.jdi.core.annotations.GuildBanRemove" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.WEBHOOKS_UPDATE, "com.javadiscord.jdi.core.annotations.WebHookUpdate"); + EventType.WEBHOOKS_UPDATE, "com.javadiscord.jdi.core.annotations.WebHookUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.VOICE_STATE_UPDATE, - "com.javadiscord.jdi.core.annotations.VoiceStateUpdate"); + EventType.VOICE_STATE_UPDATE, + "com.javadiscord.jdi.core.annotations.VoiceStateUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_DELETE_BULK, - "com.javadiscord.jdi.core.annotations.MessageBulkDelete"); + EventType.MESSAGE_DELETE_BULK, + "com.javadiscord.jdi.core.annotations.MessageBulkDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.MESSAGE_REACTION_REMOVE_ALL, - "com.javadiscord.jdi.core.annotations.MessageReactionsRemoved"); + EventType.MESSAGE_REACTION_REMOVE_ALL, + "com.javadiscord.jdi.core.annotations.MessageReactionsRemoved" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.STAGE_INSTANCE_CREATE, - "com.javadiscord.jdi.core.annotations.StageCreate"); + EventType.STAGE_INSTANCE_CREATE, + "com.javadiscord.jdi.core.annotations.StageCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.STAGE_INSTANCE_UPDATE, - "com.javadiscord.jdi.core.annotations.StageUpdate"); + EventType.STAGE_INSTANCE_UPDATE, + "com.javadiscord.jdi.core.annotations.StageUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.STAGE_INSTANCE_DELETE, - "com.javadiscord.jdi.core.annotations.StageDelete"); + EventType.STAGE_INSTANCE_DELETE, + "com.javadiscord.jdi.core.annotations.StageDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.INTERACTION_CREATE, - "com.javadiscord.jdi.core.annotations.InteractionCreate"); + EventType.INTERACTION_CREATE, + "com.javadiscord.jdi.core.annotations.InteractionCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.AUTO_MODERATION_RULE_CREATE, - "com.javadiscord.jdi.core.annotations.AutoModerationRuleCreate"); + EventType.AUTO_MODERATION_RULE_CREATE, + "com.javadiscord.jdi.core.annotations.AutoModerationRuleCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.AUTO_MODERATION_RULE_UPDATE, - "com.javadiscord.jdi.core.annotations.AutoModerationRuleUpdate"); + EventType.AUTO_MODERATION_RULE_UPDATE, + "com.javadiscord.jdi.core.annotations.AutoModerationRuleUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.AUTO_MODERATION_RULE_DELETE, - "com.javadiscord.jdi.core.annotations.AutoModerationRuleDelete"); + EventType.AUTO_MODERATION_RULE_DELETE, + "com.javadiscord.jdi.core.annotations.AutoModerationRuleDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.AUTO_MODERATION_ACTION_EXECUTION, - "com.javadiscord.jdi.core.annotations.AutoModerationRuleExecution"); + EventType.AUTO_MODERATION_ACTION_EXECUTION, + "com.javadiscord.jdi.core.annotations.AutoModerationRuleExecution" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.ENTITLEMENT_CREATE, - "com.javadiscord.jdi.core.annotations.EntitlementCreate"); + EventType.ENTITLEMENT_CREATE, + "com.javadiscord.jdi.core.annotations.EntitlementCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.ENTITLEMENT_DELETE, - "com.javadiscord.jdi.core.annotations.EntitlementDelete"); + EventType.ENTITLEMENT_DELETE, + "com.javadiscord.jdi.core.annotations.EntitlementDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.ENTITLEMENT_UPDATE, - "com.javadiscord.jdi.core.annotations.EntitlementUpdate"); + EventType.ENTITLEMENT_UPDATE, + "com.javadiscord.jdi.core.annotations.EntitlementUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_SCHEDULED_EVENT_CREATE, - "com.javadiscord.jdi.core.annotations.ScheduledEventCreate"); + EventType.GUILD_SCHEDULED_EVENT_CREATE, + "com.javadiscord.jdi.core.annotations.ScheduledEventCreate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_SCHEDULED_EVENT_UPDATE, - "com.javadiscord.jdi.core.annotations.ScheduledEventUpdate"); + EventType.GUILD_SCHEDULED_EVENT_UPDATE, + "com.javadiscord.jdi.core.annotations.ScheduledEventUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_SCHEDULED_EVENT_DELETE, - "com.javadiscord.jdi.core.annotations.ScheduledEventDelete"); + EventType.GUILD_SCHEDULED_EVENT_DELETE, + "com.javadiscord.jdi.core.annotations.ScheduledEventDelete" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_SCHEDULED_EVENT_USER_REMOVE, - "com.javadiscord.jdi.core.annotations.ScheduledEventUserRemove"); + EventType.GUILD_SCHEDULED_EVENT_USER_REMOVE, + "com.javadiscord.jdi.core.annotations.ScheduledEventUserRemove" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_SCHEDULED_EVENT_USER_ADD, - "com.javadiscord.jdi.core.annotations.ScheduledEventUserAdd"); + EventType.GUILD_SCHEDULED_EVENT_USER_ADD, + "com.javadiscord.jdi.core.annotations.ScheduledEventUserAdd" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_STICKERS_UPDATE, - "com.javadiscord.jdi.core.annotations.StickerUpdate"); + EventType.GUILD_STICKERS_UPDATE, + "com.javadiscord.jdi.core.annotations.StickerUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_INTEGRATIONS_UPDATE, - "com.javadiscord.jdi.core.annotations.IntegrationUpdate"); + EventType.GUILD_INTEGRATIONS_UPDATE, + "com.javadiscord.jdi.core.annotations.IntegrationUpdate" + ); EVENT_TYPE_ANNOTATIONS.put( - EventType.GUILD_MEMBERS_CHUNK, "com.javadiscord.jdi.core.annotations.MemberChunk"); + EventType.GUILD_MEMBERS_CHUNK, "com.javadiscord.jdi.core.annotations.MemberChunk" + ); } private final Discord discord; @@ -169,8 +220,7 @@ public void receive(EventType eventType, Object event) { Class annotationClass; try { annotationClass = - (Class) - Class.forName(EVENT_TYPE_ANNOTATIONS.get(eventType)); + (Class) Class.forName(EVENT_TYPE_ANNOTATIONS.get(eventType)); } catch (ClassNotFoundException e) { LOGGER.error("Could not find annotation binding for {}", eventType); return; @@ -196,10 +246,11 @@ public void receive(EventType eventType, Object event) { try { if (paramOrder.size() != method.getParameterCount()) { throw new RuntimeException( - "Bound " - + paramOrder.size() - + " parameters but expected " - + method.getParameterCount()); + "Bound " + + paramOrder.size() + + " parameters but expected " + + method.getParameterCount() + ); } LOGGER.trace("Invoking method {} with params {}", method.getName(), paramOrder); method.invoke(listener, paramOrder.toArray()); diff --git a/core/src/main/java/com/javadiscord/jdi/core/Guild.java b/core/src/main/java/com/javadiscord/jdi/core/Guild.java index 1f88a5c9..fa4adf0d 100644 --- a/core/src/main/java/com/javadiscord/jdi/core/Guild.java +++ b/core/src/main/java/com/javadiscord/jdi/core/Guild.java @@ -31,18 +31,18 @@ public Guild(com.javadiscord.jdi.core.models.guild.Guild guild, Cache cache, Dis long guildId = guild.id(); DiscordResponseParser discordResponseParser = - new DiscordResponseParser(discord.getDiscordRequestDispatcher()); + new DiscordResponseParser(discord.getDiscordRequestDispatcher()); this.applicationRequest = new ApplicationRequest(discordResponseParser, guildId); this.applicationRoleConnectionMetaRequest = - new ApplicationRoleConnectionMetaRequest(discordResponseParser, guildId); + new ApplicationRoleConnectionMetaRequest(discordResponseParser, guildId); this.auditLogsRequest = new AuditLogsRequest(discordResponseParser, guildId); this.autoModerationRequest = new AutoModerationRequest(discordResponseParser, guildId); this.channelRequest = new ChannelRequest(discordResponseParser, guildId); this.emojiRequest = new EmojiRequest(discordResponseParser, guildId); this.guildRequest = new GuildRequest(discordResponseParser, guildId); this.guildScheduledEventRequest = - new GuildScheduledEventRequest(discordResponseParser, guildId); + new GuildScheduledEventRequest(discordResponseParser, guildId); this.inviteRequest = new InviteRequest(discordResponseParser, guildId); this.pollRequest = new PollRequest(discordResponseParser, guildId); this.stageRequest = new StageRequest(discordResponseParser, guildId); diff --git a/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleNoAnnotate.java b/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleNoAnnotate.java index c883e404..45fe4eb9 100644 --- a/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleNoAnnotate.java +++ b/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleNoAnnotate.java @@ -11,13 +11,13 @@ public class ExampleNoAnnotate implements EventListener { public void onMessageCreate(Message message, Guild guild) { System.out.println("Received a message in ExampleNoAnnotate"); guild.channel() - .createInvite(1232064259085828228L, 1000, 10, true) - .onSuccess(res -> System.out.println("Result: " + res)) - .onError(System.err::println); + .createInvite(1232064259085828228L, 1000, 10, true) + .onSuccess(res -> System.out.println("Result: " + res)) + .onError(System.err::println); guild.auditLogs() - .getAuditLogs(new GetAuditLogsBuilder()) - .onSuccess(res -> System.out.println("Result: " + res)) - .onError(System.err::println); + .getAuditLogs(new GetAuditLogsBuilder()) + .onSuccess(res -> System.out.println("Result: " + res)) + .onError(System.err::println); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionDetails.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionDetails.java index 0c7feb02..e3abafbc 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionDetails.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionDetails.java @@ -8,7 +8,8 @@ public class ConnectionDetails { private int sequence; public ConnectionDetails( - String gatewayURL, String authorization, GatewaySetting gatewaySetting) { + String gatewayURL, String authorization, GatewaySetting gatewaySetting + ) { this.gatewayURL = gatewayURL; this.authorization = authorization; this.gatewaySetting = gatewaySetting; diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionMediator.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionMediator.java index 72b714d5..da329026 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionMediator.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/ConnectionMediator.java @@ -1,17 +1,18 @@ package com.javadiscord.jdi.internal.gateway; -import com.javadiscord.jdi.internal.gateway.handlers.events.codec.GatewayObserver; - import java.util.ArrayList; import java.util.List; +import com.javadiscord.jdi.internal.gateway.handlers.events.codec.GatewayObserver; + public class ConnectionMediator { private final ConnectionDetails connectionDetails; private final WebSocketManagerProxy webSocketManagerProxy; private final List observers = new ArrayList<>(); public ConnectionMediator( - ConnectionDetails connectionDetails, WebSocketManagerProxy webSocketManagerProxy) { + ConnectionDetails connectionDetails, WebSocketManagerProxy webSocketManagerProxy + ) { this.connectionDetails = connectionDetails; this.webSocketManagerProxy = webSocketManagerProxy; } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/Gateway.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/Gateway.java index 4b1ed2d7..b1baad35 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/Gateway.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/Gateway.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Gateway( - String url, - int shards, - @JsonProperty("session_start_limit") SessionStartLimit sessionStartLimit) {} + String url, + int shards, + @JsonProperty("session_start_limit") SessionStartLimit sessionStartLimit +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/GatewayEvent.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/GatewayEvent.java index 2d30f08d..6e7f61ba 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/GatewayEvent.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/GatewayEvent.java @@ -6,7 +6,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record GatewayEvent( - @JsonProperty("op") int opcode, - @JsonProperty("d") JsonNode data, - @JsonProperty("s") int sequenceNumber, - @JsonProperty("t") String eventName) {} + @JsonProperty("op") int opcode, + @JsonProperty("d") JsonNode data, + @JsonProperty("s") int sequenceNumber, + @JsonProperty("t") String eventName +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/SessionStartLimit.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/SessionStartLimit.java index 64914050..58f3459e 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/SessionStartLimit.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/SessionStartLimit.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record SessionStartLimit( - int total, - int remaining, - @JsonProperty("reset_after") long resetAfter, - @JsonProperty("max_concurrency") int maxConcurrency) {} + int total, + int remaining, + @JsonProperty("reset_after") long resetAfter, + @JsonProperty("max_concurrency") int maxConcurrency +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketHandler.java index 43ede4dc..4aa99864 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketHandler.java @@ -1,7 +1,8 @@ package com.javadiscord.jdi.internal.gateway; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.HashMap; +import java.util.Map; + import com.javadiscord.jdi.internal.cache.Cache; import com.javadiscord.jdi.internal.gateway.handlers.GatewayOperationHandler; import com.javadiscord.jdi.internal.gateway.handlers.ReconnectGatewayOperationHandler; @@ -10,16 +11,14 @@ import com.javadiscord.jdi.internal.gateway.handlers.heartbeat.HeartbeatService; import com.javadiscord.jdi.internal.gateway.handlers.heartbeat.HelloOperationHandler; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import io.vertx.core.Handler; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.WebSocket; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.HashMap; -import java.util.Map; - public class WebSocketHandler implements Handler { private static final Logger LOGGER = LogManager.getLogger(); private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -29,9 +28,10 @@ public class WebSocketHandler implements Handler { private final Cache cache; public WebSocketHandler( - ConnectionMediator connectionMediator, - WebSocketRetryHandler retryHandler, - Cache cache) { + ConnectionMediator connectionMediator, + WebSocketRetryHandler retryHandler, + Cache cache + ) { this.connectionMediator = connectionMediator; this.retryHandler = retryHandler; this.cache = cache; @@ -42,13 +42,15 @@ private void registerHandlers() { HeartbeatService heartbeatService = new HeartbeatService(connectionMediator); OPERATION_HANDLER.put(GatewayOpcode.HELLO, new HelloOperationHandler(heartbeatService)); OPERATION_HANDLER.put( - GatewayOpcode.HEARTBEAT_ACK, new HeartbeatAckOperationHandler(heartbeatService)); + GatewayOpcode.HEARTBEAT_ACK, new HeartbeatAckOperationHandler(heartbeatService) + ); OPERATION_HANDLER.put( - GatewayOpcode.HEARTBEAT, new HeartbeatAckOperationHandler(heartbeatService)); + GatewayOpcode.HEARTBEAT, new HeartbeatAckOperationHandler(heartbeatService) + ); OPERATION_HANDLER.put(GatewayOpcode.DISPATCH, new EventCodecHandler(cache)); ReconnectGatewayOperationHandler reconnectMessageHandler = - new ReconnectGatewayOperationHandler(); + new ReconnectGatewayOperationHandler(); OPERATION_HANDLER.put(GatewayOpcode.RECONNECT, reconnectMessageHandler); OPERATION_HANDLER.put(GatewayOpcode.INVALID_SESSION, reconnectMessageHandler); } @@ -64,13 +66,13 @@ private void handleMessage(Buffer buffer) { try { GatewayEvent gatewayEvent = - OBJECT_MAPPER.readValue(buffer.toString(), GatewayEvent.class); + OBJECT_MAPPER.readValue(buffer.toString(), GatewayEvent.class); connectionMediator.getConnectionDetails().setSequence(gatewayEvent.sequenceNumber()); if (OPERATION_HANDLER.containsKey(gatewayEvent.opcode())) { GatewayOperationHandler gatewayOperationHandler = - OPERATION_HANDLER.get(gatewayEvent.opcode()); + OPERATION_HANDLER.get(gatewayEvent.opcode()); gatewayOperationHandler.handle(gatewayEvent, connectionMediator); } else { LOGGER.warn("Unknown opcode {}", gatewayEvent.opcode()); @@ -83,8 +85,9 @@ private void handleMessage(Buffer buffer) { private void handleClose(Void unused) { LOGGER.warn( - "The web socket connection to discord was closed. You will no longer receive" - + " gateway events."); + "The web socket connection to discord was closed. You will no longer receive" + + " gateway events." + ); } void handleClose(int status, String reason) { @@ -104,13 +107,15 @@ void handleClose(int status, String reason) { case GatewayCloseEventCode.INVALID_API_VERSION: case GatewayCloseEventCode.UNKNOWN_OPCODE: LOGGER.error( - "Discord has updated their API, please use the latest updates on" - + " https://javadiscord.com/"); + "Discord has updated their API, please use the latest updates on" + + " https://javadiscord.com/" + ); break; case GatewayCloseEventCode.DISALLOWED_INTENTS: LOGGER.error( - "You do not have all the required intents set on your bot. Visit" - + " https://discord.com/developers/applications/"); + "You do not have all the required intents set on your bot. Visit" + + " https://discord.com/developers/applications/" + ); break; default: LOGGER.error("Web socket close reason [{}] {}", status, reason); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketManager.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketManager.java index 8306fa2a..73586d6d 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketManager.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketManager.java @@ -1,16 +1,15 @@ package com.javadiscord.jdi.internal.gateway; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.cache.Cache; import com.javadiscord.jdi.internal.gateway.identify.IdentifyRequest; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.WebSocket; import io.vertx.core.http.WebSocketConnectOptions; import io.vertx.core.http.WebSocketFrame; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,7 +23,8 @@ public class WebSocketManager { private WebSocket webSocket; public WebSocketManager( - GatewaySetting gatewaySetting, IdentifyRequest identifyRequest, Cache cache) { + GatewaySetting gatewaySetting, IdentifyRequest identifyRequest, Cache cache + ) { this.gatewaySetting = gatewaySetting; this.identifyRequest = identifyRequest; this.vertx = Vertx.vertx(); @@ -36,43 +36,47 @@ public void start(ConnectionMediator connectionMediator) { String gatewayURL = connectionMediator.getConnectionDetails().getGatewayURL(); WebSocketConnectOptions webSocketConnectOptions = - new WebSocketConnectOptions() - .addHeader("Origin", "localhost") - .setAbsoluteURI( - "%s/?v=%d&encoding=%s" - .formatted( - gatewayURL, - gatewaySetting.getApiVersion(), - gatewaySetting.getEncoding())) - .setSsl(true); + new WebSocketConnectOptions() + .addHeader("Origin", "localhost") + .setAbsoluteURI( + "%s/?v=%d&encoding=%s" + .formatted( + gatewayURL, + gatewaySetting.getApiVersion(), + gatewaySetting.getEncoding() + ) + ) + .setSsl(true); vertx.createWebSocketClient() - .connect(webSocketConnectOptions) - .onSuccess( - webSocket -> { - LOGGER.info("Connected to Discord"); - - this.webSocket = webSocket; - - WebSocketHandler webSocketHandler = - new WebSocketHandler(connectionMediator, retryHandler, cache); - - webSocketHandler.handle(webSocket); - - webSocket.frameHandler(frame -> frameHandler(frame, webSocketHandler)); - - if (retryHandler.hasRetried()) { - retryHandler.clear(); - sendResumeEvent(webSocket, connectionMediator); - } else { - sendIdentify(webSocket, identifyRequest); - } - }) - .onFailure( - error -> { - LOGGER.warn("Failed to connect to {} {}", gatewayURL, error.getCause()); - retryHandler.retry(() -> restart(connectionMediator)); - }); + .connect(webSocketConnectOptions) + .onSuccess( + webSocket -> { + LOGGER.info("Connected to Discord"); + + this.webSocket = webSocket; + + WebSocketHandler webSocketHandler = + new WebSocketHandler(connectionMediator, retryHandler, cache); + + webSocketHandler.handle(webSocket); + + webSocket.frameHandler(frame -> frameHandler(frame, webSocketHandler)); + + if (retryHandler.hasRetried()) { + retryHandler.clear(); + sendResumeEvent(webSocket, connectionMediator); + } else { + sendIdentify(webSocket, identifyRequest); + } + } + ) + .onFailure( + error -> { + LOGGER.warn("Failed to connect to {} {}", gatewayURL, error.getCause()); + retryHandler.retry(() -> restart(connectionMediator)); + } + ); } private void frameHandler(WebSocketFrame frame, WebSocketHandler webSocketHandler) { @@ -99,7 +103,8 @@ public WebSocket getWebSocket() { private static void sendIdentify(WebSocket webSocket, IdentifyRequest identifyRequest) { try { webSocket.write( - Buffer.buffer((new ObjectMapper().writeValueAsString(identifyRequest)))); + Buffer.buffer((new ObjectMapper().writeValueAsString(identifyRequest))) + ); } catch (JsonProcessingException e) { LOGGER.error("Failed to send identify request, restarting bot"); } @@ -111,8 +116,8 @@ private void sendResumeEvent(WebSocket webSocket, ConnectionMediator connectionM int sequence = connectionMediator.getConnectionDetails().getSequence(); int opcode = GatewayOpcode.RESUME; webSocket.write( - Buffer.buffer( - """ + Buffer.buffer( + """ { "op": %d, "d": { @@ -122,6 +127,8 @@ private void sendResumeEvent(WebSocket webSocket, ConnectionMediator connectionM } } """ - .formatted(opcode, botToken, sessionId, sequence))); + .formatted(opcode, botToken, sessionId, sequence) + ) + ); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketRetryHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketRetryHandler.java index c703af67..bef425ae 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketRetryHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketRetryHandler.java @@ -1,12 +1,11 @@ package com.javadiscord.jdi.internal.gateway; -import io.vertx.core.Vertx; +import java.util.concurrent.atomic.AtomicInteger; +import io.vertx.core.Vertx; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.concurrent.atomic.AtomicInteger; - public class WebSocketRetryHandler { private static final Logger LOGGER = LogManager.getLogger(); private final Vertx vertx; diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/EventCodecHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/EventCodecHandler.java index 452e2c01..5058b8cb 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/EventCodecHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/EventCodecHandler.java @@ -1,5 +1,7 @@ package com.javadiscord.jdi.internal.gateway.handlers.events; +import java.util.*; + import com.javadiscord.jdi.internal.cache.Cache; import com.javadiscord.jdi.internal.gateway.ConnectionMediator; import com.javadiscord.jdi.internal.gateway.GatewayEvent; @@ -37,8 +39,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.*; - public class EventCodecHandler implements GatewayOperationHandler { private static final Logger LOGGER = LogManager.getLogger(); private static final Map> EVENT_DECODERS = new HashMap<>(); @@ -153,9 +153,11 @@ public class EventCodecHandler implements GatewayOperationHandler { EVENT_HANDLERS.put(EventType.MESSAGE_DELETE_BULK, new MessageBulkDeleteHandler()); EVENT_DECODERS.put( - EventType.MESSAGE_REACTION_REMOVE_ALL, new MessageReactionsRemovedDecoder()); + EventType.MESSAGE_REACTION_REMOVE_ALL, new MessageReactionsRemovedDecoder() + ); EVENT_HANDLERS.put( - EventType.MESSAGE_REACTION_REMOVE_ALL, new MessageReactionsRemovedHandler()); + EventType.MESSAGE_REACTION_REMOVE_ALL, new MessageReactionsRemovedHandler() + ); StageDecoder stageDecoder = new StageDecoder(); EVENT_DECODERS.put(EventType.STAGE_INSTANCE_CREATE, stageDecoder); @@ -174,13 +176,17 @@ public class EventCodecHandler implements GatewayOperationHandler { EVENT_DECODERS.put(EventType.AUTO_MODERATION_RULE_DELETE, autoModerationDecoder); EVENT_DECODERS.put(EventType.AUTO_MODERATION_ACTION_EXECUTION, autoModerationDecoder); EVENT_HANDLERS.put( - EventType.AUTO_MODERATION_RULE_CREATE, new AutoModerationRuleCreateHandler()); + EventType.AUTO_MODERATION_RULE_CREATE, new AutoModerationRuleCreateHandler() + ); EVENT_HANDLERS.put( - EventType.AUTO_MODERATION_RULE_UPDATE, new AutoModerationRuleUpdateHandler()); + EventType.AUTO_MODERATION_RULE_UPDATE, new AutoModerationRuleUpdateHandler() + ); EVENT_HANDLERS.put( - EventType.AUTO_MODERATION_RULE_DELETE, new AutoModerationRuleDeleteHandler()); + EventType.AUTO_MODERATION_RULE_DELETE, new AutoModerationRuleDeleteHandler() + ); EVENT_HANDLERS.put( - EventType.AUTO_MODERATION_ACTION_EXECUTION, new AutoModerationRuleDeleteHandler()); + EventType.AUTO_MODERATION_ACTION_EXECUTION, new AutoModerationRuleDeleteHandler() + ); EntitlementDecoder entitlementDecoder = new EntitlementDecoder(); EVENT_DECODERS.put(EventType.ENTITLEMENT_CREATE, entitlementDecoder); @@ -195,19 +201,24 @@ public class EventCodecHandler implements GatewayOperationHandler { EVENT_DECODERS.put(EventType.GUILD_SCHEDULED_EVENT_UPDATE, scheduledEventDecoder); EVENT_DECODERS.put(EventType.GUILD_SCHEDULED_EVENT_DELETE, scheduledEventDecoder); EVENT_HANDLERS.put( - EventType.GUILD_SCHEDULED_EVENT_CREATE, new ScheduledEventCreateHandler()); + EventType.GUILD_SCHEDULED_EVENT_CREATE, new ScheduledEventCreateHandler() + ); EVENT_HANDLERS.put( - EventType.GUILD_SCHEDULED_EVENT_UPDATE, new ScheduledEventUpdateHandler()); + EventType.GUILD_SCHEDULED_EVENT_UPDATE, new ScheduledEventUpdateHandler() + ); EVENT_HANDLERS.put( - EventType.GUILD_SCHEDULED_EVENT_DELETE, new ScheduledEventDeleteHandler()); + EventType.GUILD_SCHEDULED_EVENT_DELETE, new ScheduledEventDeleteHandler() + ); EventUserDecoder eventUserDecoder = new EventUserDecoder(); EVENT_DECODERS.put(EventType.GUILD_SCHEDULED_EVENT_USER_ADD, eventUserDecoder); EVENT_DECODERS.put(EventType.GUILD_SCHEDULED_EVENT_USER_REMOVE, eventUserDecoder); EVENT_HANDLERS.put( - EventType.GUILD_SCHEDULED_EVENT_USER_ADD, new ScheduledEventUserAddHandler()); + EventType.GUILD_SCHEDULED_EVENT_USER_ADD, new ScheduledEventUserAddHandler() + ); EVENT_HANDLERS.put( - EventType.GUILD_SCHEDULED_EVENT_USER_REMOVE, new ScheduledEventUserRemoveHandler()); + EventType.GUILD_SCHEDULED_EVENT_USER_REMOVE, new ScheduledEventUserRemoveHandler() + ); EVENT_DECODERS.put(EventType.GUILD_STICKERS_UPDATE, new StickerUpdateDecoder()); EVENT_HANDLERS.put(EventType.GUILD_STICKERS_UPDATE, new StickerUpdateHandler()); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/AutoModerationDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/AutoModerationDecoder.java index 022798b6..5977f84d 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/AutoModerationDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/AutoModerationDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationRule; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class AutoModerationDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -13,7 +14,8 @@ public class AutoModerationDecoder implements EventDecoder { public AutoModerationRule decode(GatewayEvent gatewayEvent) { try { return OBJECT_MAPPER.readValue( - gatewayEvent.data().toString(), AutoModerationRule.class); + gatewayEvent.data().toString(), AutoModerationRule.class + ); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelDecoder.java index 7a9376a0..a34b838f 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ChannelDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelPinUpdateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelPinUpdateDecoder.java index 0d3a9da4..9580bee2 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelPinUpdateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelPinUpdateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.MessagePin; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ChannelPinUpdateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EntitlementDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EntitlementDecoder.java index 1e3af833..364bc3fd 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EntitlementDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EntitlementDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.Entitlement; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class EntitlementDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EventUserDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EventUserDecoder.java index 5478b4b7..e96c72cb 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EventUserDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EventUserDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.scheduled_event.EventUser; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class EventUserDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildBanDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildBanDecoder.java index 59c5cd2c..70f53c23 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildBanDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildBanDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.GuildBan; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class GuildBanDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildDecoder.java index 9858444e..e38bc128 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.Guild; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class GuildDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildInviteDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildInviteDecoder.java index 5818391e..8de1624b 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildInviteDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildInviteDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.invite.Invite; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class GuildInviteDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildMemberDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildMemberDecoder.java index dc33a1f8..414d4dec 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildMemberDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildMemberDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.user.Member; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class GuildMemberDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildRoleDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildRoleDecoder.java index 064dc54a..54d6e98f 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildRoleDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildRoleDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.Role; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class GuildRoleDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/IntegrationUpdateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/IntegrationUpdateDecoder.java index 5d6493c0..a6c290de 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/IntegrationUpdateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/IntegrationUpdateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.IntegrationUpdate; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class IntegrationUpdateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/InteractionCreateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/InteractionCreateDecoder.java index 92930808..9f9d137d 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/InteractionCreateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/InteractionCreateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.Interaction; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class InteractionCreateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MemberChunkDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MemberChunkDecoder.java index 78c10cfc..5bac2ad2 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MemberChunkDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MemberChunkDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.guild.MemberChunk; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class MemberChunkDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageBulkDeleteDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageBulkDeleteDecoder.java index d422c549..cbb3305f 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageBulkDeleteDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageBulkDeleteDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.MessageBulkDelete; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class MessageBulkDeleteDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageDecoder.java index 4cae34b7..70562234 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.Message; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class MessageDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionDecoder.java index a37c1901..f222cfba 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.MessageReaction; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class MessageReactionDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionsRemovedDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionsRemovedDecoder.java index 93000ac3..224567f9 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionsRemovedDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/MessageReactionsRemovedDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.MessageReactionsRemoved; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class MessageReactionsRemovedDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -13,7 +14,8 @@ public class MessageReactionsRemovedDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ScheduledEventDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ScheduledEventDecoder.java index cbe27f54..93d81284 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ScheduledEventDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ScheduledEventDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEvent; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ScheduledEventDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StageDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StageDecoder.java index b05b4f93..aa1a02a1 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StageDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StageDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.stage.Stage; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class StageDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StickerUpdateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StickerUpdateDecoder.java index bb7ff241..d663f2c6 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StickerUpdateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/StickerUpdateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.message.StickerUpdate; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class StickerUpdateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadDecoder.java index 4b32e63a..8a533030 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.Thread; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ThreadDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadListSyncDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadListSyncDecoder.java index 68878a9e..3276a7c0 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadListSyncDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadListSyncDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.ThreadSync; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ThreadListSyncDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberDecoder.java index 5e7b4dbb..c7913a68 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.ThreadMember; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ThreadMemberDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberUpdateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberUpdateDecoder.java index d99fe7a5..a822d8fe 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberUpdateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ThreadMemberUpdateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.ThreadMemberUpdate; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ThreadMemberUpdateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -13,7 +14,8 @@ public class ThreadMemberUpdateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/UserDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/UserDecoder.java index c751cf1b..281b1d06 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/UserDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/UserDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.user.User; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class UserDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceServerDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceServerDecoder.java index 0e44a7cc..da353049 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceServerDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceServerDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.voice.VoiceServer; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class VoiceServerDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceStateDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceStateDecoder.java index 27215d7b..5523876d 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceStateDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/VoiceStateDecoder.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.core.models.voice.VoiceState; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class VoiceStateDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java index 48563f63..d09a2f26 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java @@ -1,10 +1,11 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.javadiscord.jdi.internal.gateway.GatewayEvent; import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class WebhookDecoder implements EventDecoder { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleCreateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleCreateHandler.java index f3204ba4..41f86b97 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleCreateHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleCreateHandler.java @@ -8,7 +8,10 @@ public class AutoModerationRuleCreateHandler implements EventHandler { @Override public void handle( - AutoModerationRule event, ConnectionMediator connectionMediator, Cache cache) { + AutoModerationRule event, + ConnectionMediator connectionMediator, + Cache cache + ) { cache.getCacheForGuild(event.guildId()).add(event.id(), event); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleDeleteHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleDeleteHandler.java index 4c8c28bd..60a3c319 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleDeleteHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleDeleteHandler.java @@ -9,7 +9,10 @@ public class AutoModerationRuleDeleteHandler implements EventHandler { @Override public void handle( - AutoModerationRule event, ConnectionMediator connectionMediator, Cache cache) { + AutoModerationRule event, + ConnectionMediator connectionMediator, + Cache cache + ) { CacheInterface cacheInterface = cache.getCacheForGuild(event.guildId()); if (cacheInterface.isCached(event.id(), event.getClass())) { cacheInterface.remove(event.id(), event.getClass()); diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleUpdateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleUpdateHandler.java index e24a4661..84dd2b82 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleUpdateHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/automod/AutoModerationRuleUpdateHandler.java @@ -8,7 +8,10 @@ public class AutoModerationRuleUpdateHandler implements EventHandler { @Override public void handle( - AutoModerationRule event, ConnectionMediator connectionMediator, Cache cache) { + AutoModerationRule event, + ConnectionMediator connectionMediator, + Cache cache + ) { cache.getCacheForGuild(event.guildId()).update(event.id(), event); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/integration/IntegrationUpdateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/integration/IntegrationUpdateHandler.java index ca940813..efff36d5 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/integration/IntegrationUpdateHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/integration/IntegrationUpdateHandler.java @@ -8,5 +8,8 @@ public class IntegrationUpdateHandler implements EventHandler { @Override public void handle( - IntegrationUpdate event, ConnectionMediator connectionMediator, Cache cache) {} + IntegrationUpdate event, + ConnectionMediator connectionMediator, + Cache cache + ) {} } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageBulkDeleteHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageBulkDeleteHandler.java index e45baf96..f536dadd 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageBulkDeleteHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageBulkDeleteHandler.java @@ -8,7 +8,10 @@ public class MessageBulkDeleteHandler implements EventHandler { @Override public void handle( - MessageBulkDelete event, ConnectionMediator connectionMediator, Cache cache) { + MessageBulkDelete event, + ConnectionMediator connectionMediator, + Cache cache + ) { for (long messageId : event.ids()) { cache.getCacheForGuild(event.guildId()).remove(messageId, event.getClass()); } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageReactionsRemovedHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageReactionsRemovedHandler.java index 57234265..a105c062 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageReactionsRemovedHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageReactionsRemovedHandler.java @@ -9,12 +9,14 @@ public class MessageReactionsRemovedHandler implements EventHandler { @Override public void handle( - MessageReactionsRemoved event, ConnectionMediator connectionMediator, Cache cache) { + MessageReactionsRemoved event, + ConnectionMediator connectionMediator, + Cache cache + ) { if (cache.getCacheForGuild(event.guildId()).isCached(event.messageId(), Message.class)) { Message message = - (Message) - cache.getCacheForGuild(event.guildId()) - .get(event.messageId(), Message.class); + (Message) cache.getCacheForGuild(event.guildId()) + .get(event.messageId(), Message.class); message.messageReactions().clear(); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/thread/ThreadMemberUpdateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/thread/ThreadMemberUpdateHandler.java index 0d372c4b..617fb428 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/thread/ThreadMemberUpdateHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/thread/ThreadMemberUpdateHandler.java @@ -8,5 +8,8 @@ public class ThreadMemberUpdateHandler implements EventHandler { @Override public void handle( - ThreadMemberUpdate event, ConnectionMediator connectionMediator, Cache cache) {} + ThreadMemberUpdate event, + ConnectionMediator connectionMediator, + Cache cache + ) {} } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/user/UserUpdateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/user/UserUpdateHandler.java index c92043db..cc3844b0 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/user/UserUpdateHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/user/UserUpdateHandler.java @@ -11,11 +11,12 @@ public class UserUpdateHandler implements EventHandler { @Override public void handle(User event, ConnectionMediator connectionMediator, Cache cache) { cache.getCachedGuilds() - .forEach( - (guildId, cacheInterface) -> { - if (cacheInterface.isCached(event.id(), User.class)) { - cacheInterface.update(event.id(), event); - } - }); + .forEach( + (guildId, cacheInterface) -> { + if (cacheInterface.isCached(event.id(), User.class)) { + cacheInterface.update(event.id(), event); + } + } + ); } } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java index 69e2e92b..e69c8fe2 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java @@ -1,22 +1,24 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel; +import com.javadiscord.jdi.core.models.channel.ThreadMetadata; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.channel.ThreadMetadata; @JsonIgnoreProperties(ignoreUnknown = true) public record Thread( - @JsonProperty("type") int type, - @JsonProperty("total_message_sent") int totalMessageSent, - @JsonProperty("thread_metadata") ThreadMetadata threadMetadata, - @JsonProperty("rate_limit_per_user") int rateLimitPerUser, - @JsonProperty("parent_id") String parentId, - @JsonProperty("owner_id") String ownerId, - @JsonProperty("newly_created") boolean newlyCreated, - @JsonProperty("name") String name, - @JsonProperty("message_count") int messageCount, - @JsonProperty("member_count") int memberCount, - @JsonProperty("last_message_id") String lastMessageId, - @JsonProperty("id") long id, - @JsonProperty("guild_id") long guildId, - @JsonProperty("flags") int flags) {} + @JsonProperty("type") int type, + @JsonProperty("total_message_sent") int totalMessageSent, + @JsonProperty("thread_metadata") ThreadMetadata threadMetadata, + @JsonProperty("rate_limit_per_user") int rateLimitPerUser, + @JsonProperty("parent_id") String parentId, + @JsonProperty("owner_id") String ownerId, + @JsonProperty("newly_created") boolean newlyCreated, + @JsonProperty("name") String name, + @JsonProperty("message_count") int messageCount, + @JsonProperty("member_count") int memberCount, + @JsonProperty("last_message_id") String lastMessageId, + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, + @JsonProperty("flags") int flags +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMember.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMember.java index 9a86d698..b33aa76b 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMember.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMember.java @@ -1,14 +1,15 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record ThreadMember( - @JsonProperty("id") long id, - @JsonProperty("guild_id") long guildId, - @JsonProperty("member_count") int memberCount, - @JsonProperty("added_members") List addedMembers, - @JsonProperty("removed_member_ids") List removedMemberIds) {} + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, + @JsonProperty("member_count") int memberCount, + @JsonProperty("added_members") List addedMembers, + @JsonProperty("removed_member_ids") List removedMemberIds +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMemberUpdate.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMemberUpdate.java index 41e05923..ba38fc74 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMemberUpdate.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadMemberUpdate.java @@ -5,5 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ThreadMemberUpdate( - @JsonProperty("guild_id") String guildId, - @JsonProperty("thread_member") ThreadMember threadMember) {} + @JsonProperty("guild_id") String guildId, + @JsonProperty("thread_member") ThreadMember threadMember +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadSync.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadSync.java index 3bb69a43..65ea0d1d 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadSync.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/ThreadSync.java @@ -1,15 +1,17 @@ package com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.user.Member; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record ThreadSync( - @JsonProperty("guild_id") String guildId, - @JsonProperty("channel_ids") List channelIds, - List threads, - List members) {} + @JsonProperty("guild_id") String guildId, + @JsonProperty("channel_ids") List channelIds, + List threads, + List members +) {} diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HeartbeatService.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HeartbeatService.java index 3c5218b9..26da537f 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HeartbeatService.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HeartbeatService.java @@ -1,23 +1,22 @@ package com.javadiscord.jdi.internal.gateway.handlers.heartbeat; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + import com.javadiscord.jdi.internal.gateway.ConnectionMediator; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.WebSocket; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - public class HeartbeatService { private static final Logger LOGGER = LogManager.getLogger(); private static final ScheduledExecutorService EXECUTOR_SERVICE = - Executors.newScheduledThreadPool(2); + Executors.newScheduledThreadPool(2); private final ConnectionMediator connectionMediator; private final AtomicBoolean receivedHeartbeatAck; private final AtomicInteger missedHeartbeatAck; @@ -30,13 +29,15 @@ public HeartbeatService(ConnectionMediator connectionMediator) { public void startHeartbeat(WebSocket webSocket, int interval) { EXECUTOR_SERVICE.scheduleAtFixedRate( - () -> sendHeartbeat(webSocket), 0, interval, TimeUnit.MILLISECONDS); + () -> sendHeartbeat(webSocket), 0, interval, TimeUnit.MILLISECONDS + ); EXECUTOR_SERVICE.scheduleAtFixedRate( - () -> checkHeartbeatAckReceived(webSocket), - interval, - interval + 1000, - TimeUnit.MILLISECONDS); + () -> checkHeartbeatAckReceived(webSocket), + interval, + interval + 1000, + TimeUnit.MILLISECONDS + ); } private void checkHeartbeatAckReceived(WebSocket webSocket) { @@ -47,21 +48,25 @@ private void checkHeartbeatAckReceived(WebSocket webSocket) { } if (missedHeartbeatAck.get() >= 3) { LOGGER.warn( - "Discord missed 3 heartbeat acknowledgements, restarting due to \"zombied\"" - + " connection"); + "Discord missed 3 heartbeat acknowledgements, restarting due to \"zombied\"" + + " connection" + ); connectionMediator.getWebSocketManagerProxy().restart(connectionMediator); } } public void sendHeartbeat(WebSocket webSocket) { webSocket.write( - Buffer.buffer() - .appendString( - "{ \"op\": 1, \"d\": \"%s\" }" - .formatted( - connectionMediator - .getConnectionDetails() - .getSequence()))); + Buffer.buffer() + .appendString( + "{ \"op\": 1, \"d\": \"%s\" }" + .formatted( + connectionMediator + .getConnectionDetails() + .getSequence() + ) + ) + ); receivedHeartbeatAck.set(false); } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HelloOperationHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HelloOperationHandler.java index 6ebfcd2b..241149ed 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HelloOperationHandler.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HelloOperationHandler.java @@ -1,14 +1,14 @@ package com.javadiscord.jdi.internal.gateway.handlers.heartbeat; +import com.javadiscord.jdi.internal.gateway.ConnectionMediator; +import com.javadiscord.jdi.internal.gateway.GatewayEvent; +import com.javadiscord.jdi.internal.gateway.handlers.GatewayOperationHandler; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.javadiscord.jdi.internal.gateway.ConnectionMediator; -import com.javadiscord.jdi.internal.gateway.GatewayEvent; -import com.javadiscord.jdi.internal.gateway.handlers.GatewayOperationHandler; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,10 +29,11 @@ public void handle(GatewayEvent event, ConnectionMediator connectionMediator) { JsonNode jsonData = event.data(); try { HeartbeatData heartbeatData = - OBJECT_MAPPER.readValue(jsonData.toString(), HeartbeatData.class); + OBJECT_MAPPER.readValue(jsonData.toString(), HeartbeatData.class); heartbeatService.startHeartbeat( - connectionMediator.getWebSocketManagerProxy().getWebSocket(), - heartbeatData.interval); + connectionMediator.getWebSocketManagerProxy().getWebSocket(), + heartbeatData.interval + ); } catch (JsonProcessingException e) { LOGGER.error("Failed to parse Heartbeat data", e); } diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/Data.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/Data.java index 1d4bb1bd..7cf68ede 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/Data.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/Data.java @@ -12,13 +12,14 @@ public class Data { public Data() {} public Data( - String token, - Properties properties, - boolean compress, - int large_threshold, - int[] shard, - Presence presence, - int intents) { + String token, + Properties properties, + boolean compress, + int large_threshold, + int[] shard, + Presence presence, + int intents + ) { this.token = token; this.properties = properties; this.compress = compress; diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/IdentifyRequest.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/IdentifyRequest.java index b249aa89..6f414db8 100644 --- a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/IdentifyRequest.java +++ b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/identify/IdentifyRequest.java @@ -1,8 +1,9 @@ package com.javadiscord.jdi.internal.gateway.identify; -import com.fasterxml.jackson.annotation.JsonInclude; import com.javadiscord.jdi.internal.gateway.GatewayOpcode; +import com.fasterxml.jackson.annotation.JsonInclude; + @JsonInclude(JsonInclude.Include.NON_NULL) public class IdentifyRequest { private final int op = GatewayOpcode.IDENTIFY; @@ -100,17 +101,19 @@ public IdentifyRequestBuilder intents(int intents) { public IdentifyRequest build() { Data data = - new Data( - token, - new Properties(os, browser, device), - compress, - large_threshold, - shard, - new Presence( - new Activities(activityName, activityType), - presenceStatus, - afk), - intents); + new Data( + token, + new Properties(os, browser, device), + compress, + large_threshold, + shard, + new Presence( + new Activities(activityName, activityType), + presenceStatus, + afk + ), + intents + ); return new IdentifyRequest(data); } } diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/application/Application.java b/models/src/main/java/com/javadiscord/jdi/core/models/application/Application.java index f53532ed..a9b6f543 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/application/Application.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/application/Application.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.core.models.application; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.guild.Guild; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /* * https://discord.com/developers/docs/resources/application#application-object-application-structure @@ -16,28 +17,29 @@ */ @JsonIgnoreProperties(ignoreUnknown = true) public record Application( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("icon") String icon, - @JsonProperty("description") String description, - @JsonProperty("rpc_origins") List rpcOrigins, - @JsonProperty("bot_public") boolean botPublic, - @JsonProperty("bot_require_code_grant") boolean botRequireCodeGrant, - @JsonProperty("bot") User bot, - @JsonProperty("terms_of_service_url") String termsOfServiceUrl, - @JsonProperty("privacy_policy_url") String privacyPolicyUrl, - @JsonProperty("owner") User owner, - @JsonProperty("verify_key") String verifyKey, - @JsonProperty("guild_id") String guildId, - @JsonProperty("guild") Guild guild, - @JsonProperty("primary_sku_id") String primarySkuId, - @JsonProperty("slug") String slug, - @JsonProperty("cover_image") String coverImage, - @JsonProperty("flags") int flags, - @JsonProperty("approximate_guild_count") int approximateGuildCount, - @JsonProperty("redirect_uris") List redirectUris, - @JsonProperty("interactions_endpoint_url") String interactionsEndpointUrl, - @JsonProperty("role_connections_verification_url") String roleConnectionsVerificationUrl, - @JsonProperty("tags") List tags, - @JsonProperty("install_params") ApplicationInstallParams installParams, - @JsonProperty("custom_install_url") String customInstallUrl) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("icon") String icon, + @JsonProperty("description") String description, + @JsonProperty("rpc_origins") List rpcOrigins, + @JsonProperty("bot_public") boolean botPublic, + @JsonProperty("bot_require_code_grant") boolean botRequireCodeGrant, + @JsonProperty("bot") User bot, + @JsonProperty("terms_of_service_url") String termsOfServiceUrl, + @JsonProperty("privacy_policy_url") String privacyPolicyUrl, + @JsonProperty("owner") User owner, + @JsonProperty("verify_key") String verifyKey, + @JsonProperty("guild_id") String guildId, + @JsonProperty("guild") Guild guild, + @JsonProperty("primary_sku_id") String primarySkuId, + @JsonProperty("slug") String slug, + @JsonProperty("cover_image") String coverImage, + @JsonProperty("flags") int flags, + @JsonProperty("approximate_guild_count") int approximateGuildCount, + @JsonProperty("redirect_uris") List redirectUris, + @JsonProperty("interactions_endpoint_url") String interactionsEndpointUrl, + @JsonProperty("role_connections_verification_url") String roleConnectionsVerificationUrl, + @JsonProperty("tags") List tags, + @JsonProperty("install_params") ApplicationInstallParams installParams, + @JsonProperty("custom_install_url") String customInstallUrl +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java index 2361580d..45a6556c 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java @@ -1,14 +1,15 @@ package com.javadiscord.jdi.core.models.application; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record ApplicationCommandOption( - @JsonProperty("name") String name, - @JsonProperty("type") int type, - @JsonProperty("value") Object value, - @JsonProperty("options") List options, - @JsonProperty("focused") boolean focused) {} + @JsonProperty("name") String name, + @JsonProperty("type") int type, + @JsonProperty("value") Object value, + @JsonProperty("options") List options, + @JsonProperty("focused") boolean focused +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationInstallParams.java b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationInstallParams.java index 6e39cdad..6bc85868 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationInstallParams.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationInstallParams.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.core.models.application; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record ApplicationInstallParams( - @JsonProperty("scopes") List scopes, - @JsonProperty("permissions") String permission) {} + @JsonProperty("scopes") List scopes, + @JsonProperty("permissions") String permission +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationRoleConnectionMetadata.java b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationRoleConnectionMetadata.java index 2c2da8fa..f6e63df0 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationRoleConnectionMetadata.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationRoleConnectionMetadata.java @@ -1,15 +1,16 @@ package com.javadiscord.jdi.core.models.application; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - @JsonIgnoreProperties(ignoreUnknown = true) public record ApplicationRoleConnectionMetadata( - @JsonProperty("type") ApplicationRoleConnectionMetadataType type, - @JsonProperty("key") String key, - @JsonProperty("name") String name, - @JsonProperty("name_localizations") Map nameLocalizations, - @JsonProperty("description") String description, - @JsonProperty("description_localizations") Map descriptionLocalizations) {} + @JsonProperty("type") ApplicationRoleConnectionMetadataType type, + @JsonProperty("key") String key, + @JsonProperty("name") String name, + @JsonProperty("name_localizations") Map nameLocalizations, + @JsonProperty("description") String description, + @JsonProperty("description_localizations") Map descriptionLocalizations +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogEntry.java b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogEntry.java index 7b7c6194..9e4c0186 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogEntry.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogEntry.java @@ -6,9 +6,10 @@ // missing auditLogChanges @JsonIgnoreProperties(ignoreUnknown = true) public record AuditLogEntry( - @JsonProperty("target_id") long targetId, - @JsonProperty("user_id") long userId, - @JsonProperty("id") long id, - @JsonProperty("action_type") AuditLogEvent actionType, - @JsonProperty("options") OptionalAuditEntryInfo auditEntryInfo, - @JsonProperty("reason") String reason) {} + @JsonProperty("target_id") long targetId, + @JsonProperty("user_id") long userId, + @JsonProperty("id") long id, + @JsonProperty("action_type") AuditLogEvent actionType, + @JsonProperty("options") OptionalAuditEntryInfo auditEntryInfo, + @JsonProperty("reason") String reason +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogObject.java b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogObject.java index b2a94cd9..9f009338 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogObject.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/AuditLogObject.java @@ -1,13 +1,14 @@ package com.javadiscord.jdi.core.models.audit_log; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.auto_moderation.AutoModerationRule; import com.javadiscord.jdi.core.models.guild.Integration; import com.javadiscord.jdi.core.models.scheduled_event.ScheduledEvent; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /* * https://discord.com/developers/docs/resources/audit-log#audit-log-object @@ -18,8 +19,9 @@ */ @JsonIgnoreProperties(ignoreUnknown = true) public record AuditLogObject( - @JsonProperty("audit_log_entries") List auditLogEntries, - @JsonProperty("auto_moderation_rules") List autoModerationRules, - @JsonProperty("guild_scheduled_events") List scheduledEvents, - @JsonProperty("integrations") List integrations, - @JsonProperty("users") List users) {} + @JsonProperty("audit_log_entries") List auditLogEntries, + @JsonProperty("auto_moderation_rules") List autoModerationRules, + @JsonProperty("guild_scheduled_events") List scheduledEvents, + @JsonProperty("integrations") List integrations, + @JsonProperty("users") List users +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/OptionalAuditEntryInfo.java b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/OptionalAuditEntryInfo.java index 57c1a0a1..762c9327 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/OptionalAuditEntryInfo.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/audit_log/OptionalAuditEntryInfo.java @@ -7,15 +7,16 @@ // read above to see when fields will be here @JsonIgnoreProperties(ignoreUnknown = true) public record OptionalAuditEntryInfo( - @JsonProperty("application_id") long applicationId, - @JsonProperty("auto_moderation_rule_name") String autoModerationRuleName, - @JsonProperty("auto_moderation_rule_trigger_type") String autoModerationRuleTriggerType, - @JsonProperty("channel_id") long channelId, - @JsonProperty("count") String count, - @JsonProperty("delete_member_days") String deleteMemberDays, - @JsonProperty("id") long snowflake, - @JsonProperty("members_removed") String membersRemoved, - @JsonProperty("message_id") long messageId, - @JsonProperty("role_name") String roleName, - @JsonProperty("type") String type, - @JsonProperty("integration_type") String integrationType) {} + @JsonProperty("application_id") long applicationId, + @JsonProperty("auto_moderation_rule_name") String autoModerationRuleName, + @JsonProperty("auto_moderation_rule_trigger_type") String autoModerationRuleTriggerType, + @JsonProperty("channel_id") long channelId, + @JsonProperty("count") String count, + @JsonProperty("delete_member_days") String deleteMemberDays, + @JsonProperty("id") long snowflake, + @JsonProperty("members_removed") String membersRemoved, + @JsonProperty("message_id") long messageId, + @JsonProperty("role_name") String roleName, + @JsonProperty("type") String type, + @JsonProperty("integration_type") String integrationType +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationAction.java b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationAction.java index 46bedbd0..c6cb0e4b 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationAction.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationAction.java @@ -5,5 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record AutoModerationAction( - @JsonProperty("type") AutoModerationActionType type, - @JsonProperty("metadata") AutoModerationActionMetadata metadata) {} + @JsonProperty("type") AutoModerationActionType type, + @JsonProperty("metadata") AutoModerationActionMetadata metadata +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationActionMetadata.java b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationActionMetadata.java index bd28ee8e..8ee610f7 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationActionMetadata.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationActionMetadata.java @@ -6,6 +6,7 @@ // https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata read this to see when fields will be present @JsonIgnoreProperties(ignoreUnknown = true) public record AutoModerationActionMetadata( - @JsonProperty("channel_id") long channelId, - @JsonProperty("duration_seconds") int durationSecond, - @JsonProperty("custom_message") String customMessage) {} + @JsonProperty("channel_id") long channelId, + @JsonProperty("duration_seconds") int durationSecond, + @JsonProperty("custom_message") String customMessage +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationRule.java b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationRule.java index 27ae30d8..feabd951 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationRule.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationRule.java @@ -1,20 +1,21 @@ package com.javadiscord.jdi.core.models.auto_moderation; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record AutoModerationRule( - @JsonProperty("id") long id, - @JsonProperty("guild_id") long guildId, - @JsonProperty("name") String name, - @JsonProperty("creator_id") long creatorId, - @JsonProperty("event_type") AutoModerationEventType eventType, - @JsonProperty("trigger_type") AutoModerationTriggerType triggerType, - @JsonProperty("trigger_metadata") AutoModerationTriggerMetadata triggerMetadata, - @JsonProperty("actions") List actions, - @JsonProperty("enabled") boolean enabled, - @JsonProperty("exempt_roles") List exemptRoles, - @JsonProperty("exempt_channels") List exemptChannels) {} + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, + @JsonProperty("name") String name, + @JsonProperty("creator_id") long creatorId, + @JsonProperty("event_type") AutoModerationEventType eventType, + @JsonProperty("trigger_type") AutoModerationTriggerType triggerType, + @JsonProperty("trigger_metadata") AutoModerationTriggerMetadata triggerMetadata, + @JsonProperty("actions") List actions, + @JsonProperty("enabled") boolean enabled, + @JsonProperty("exempt_roles") List exemptRoles, + @JsonProperty("exempt_channels") List exemptChannels +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationTriggerMetadata.java b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationTriggerMetadata.java index 00064ea2..a69eb246 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationTriggerMetadata.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/auto_moderation/AutoModerationTriggerMetadata.java @@ -1,15 +1,16 @@ package com.javadiscord.jdi.core.models.auto_moderation; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record AutoModerationTriggerMetadata( - @JsonProperty("keyword_filter") List keywordFilter, - @JsonProperty("regex_patterns") List regexPatterns, - @JsonProperty("presets") List presets, - @JsonProperty("allow_list") List allowList, - @JsonProperty("mention_total_limit") int totalMentionLimit, - @JsonProperty("mention_raid_protection_enabled") boolean mentionRaidProtectionEnabled) {} + @JsonProperty("keyword_filter") List keywordFilter, + @JsonProperty("regex_patterns") List regexPatterns, + @JsonProperty("presets") List presets, + @JsonProperty("allow_list") List allowList, + @JsonProperty("mention_total_limit") int totalMentionLimit, + @JsonProperty("mention_raid_protection_enabled") boolean mentionRaidProtectionEnabled +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/AllowedMentions.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/AllowedMentions.java index 849c2c47..cc167432 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/AllowedMentions.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/AllowedMentions.java @@ -1,13 +1,14 @@ package com.javadiscord.jdi.core.models.channel; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record AllowedMentions( - @JsonProperty("parse") List parse, - @JsonProperty("roles") List roles, - @JsonProperty("users") List users, - @JsonProperty("replied_user") boolean repliedUser) {} + @JsonProperty("parse") List parse, + @JsonProperty("roles") List roles, + @JsonProperty("users") List users, + @JsonProperty("replied_user") boolean repliedUser +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Attachment.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Attachment.java index 884a8e34..d9bb3289 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Attachment.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Attachment.java @@ -5,16 +5,17 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Attachment( - @JsonProperty("id") long id, - @JsonProperty("filename") String filename, - @JsonProperty("description") String description, - @JsonProperty("content_type") String contentType, - @JsonProperty("size") int size, - @JsonProperty("url") String url, - @JsonProperty("proxy_url") String proxyUrl, - @JsonProperty("height") int height, - @JsonProperty("width") int width, - @JsonProperty("ephemeral") boolean ephemeral, - @JsonProperty("duration_secs") float durationSecs, - @JsonProperty("waveform") String waveform, - @JsonProperty("flags") int flags) {} + @JsonProperty("id") long id, + @JsonProperty("filename") String filename, + @JsonProperty("description") String description, + @JsonProperty("content_type") String contentType, + @JsonProperty("size") int size, + @JsonProperty("url") String url, + @JsonProperty("proxy_url") String proxyUrl, + @JsonProperty("height") int height, + @JsonProperty("width") int width, + @JsonProperty("ephemeral") boolean ephemeral, + @JsonProperty("duration_secs") float durationSecs, + @JsonProperty("waveform") String waveform, + @JsonProperty("flags") int flags +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Channel.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Channel.java index 42b6dd9b..a358e2c4 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Channel.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Channel.java @@ -1,45 +1,47 @@ package com.javadiscord.jdi.core.models.channel; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record Channel( - @JsonProperty("id") long id, - @JsonProperty("type") ChannelType type, - @JsonProperty("guild_id") long guildId, - @JsonProperty("position") int position, - @JsonProperty("permission_overwrites") List permissionOverwrites, - @JsonProperty("name") String name, - @JsonProperty("topic") String topic, - @JsonProperty("nsfw") boolean nsfw, - @JsonProperty("last_message_id") long lastMessageId, - @JsonProperty("bitrate") int bitrate, - @JsonProperty("user_limit") int userLimit, - @JsonProperty("rate_limit_per_user") int rateLimitPerUser, - @JsonProperty("recipients") List recipients, - @JsonProperty("icon") String icon, - @JsonProperty("owner_id") long ownerId, - @JsonProperty("application_id") long applicationId, - @JsonProperty("managed") boolean managed, - @JsonProperty("parent_id") long parentId, - @JsonProperty("last_pin_timestamp") long lastPinTimestamp, - @JsonProperty("rtc_region") String rtcRegion, - @JsonProperty("video_quality_mode") VideoQualityMode videoQualityMode, - @JsonProperty("message_count") int messageCount, - @JsonProperty("member_count") int memberCount, - @JsonProperty("thread_metadata") ThreadMetadata threadMetadata, - @JsonProperty("member") ThreadMember member, - @JsonProperty("default_auto_archive_duration") int defaultAutoArchiveDuration, - @JsonProperty("permissions") String permissions, - @JsonProperty("flags") int flags, - @JsonProperty("total_message_sent") int threadMessageSent, - @JsonProperty("available_tags") List availableTags, - @JsonProperty("applied_tags") List appliedTags, - @JsonProperty("default_reaction_emoji") DefaultReaction defaultReactionEmoji, - @JsonProperty("default_thread_rate_limit_per_user") int defaultThreadRateLimitPerUser, - @JsonProperty("default_sort_order") SortOrderType defaultSortOrder, - @JsonProperty("default_forum_layout") ForumLayoutType defaultForumLayout) {} + @JsonProperty("id") long id, + @JsonProperty("type") ChannelType type, + @JsonProperty("guild_id") long guildId, + @JsonProperty("position") int position, + @JsonProperty("permission_overwrites") List permissionOverwrites, + @JsonProperty("name") String name, + @JsonProperty("topic") String topic, + @JsonProperty("nsfw") boolean nsfw, + @JsonProperty("last_message_id") long lastMessageId, + @JsonProperty("bitrate") int bitrate, + @JsonProperty("user_limit") int userLimit, + @JsonProperty("rate_limit_per_user") int rateLimitPerUser, + @JsonProperty("recipients") List recipients, + @JsonProperty("icon") String icon, + @JsonProperty("owner_id") long ownerId, + @JsonProperty("application_id") long applicationId, + @JsonProperty("managed") boolean managed, + @JsonProperty("parent_id") long parentId, + @JsonProperty("last_pin_timestamp") long lastPinTimestamp, + @JsonProperty("rtc_region") String rtcRegion, + @JsonProperty("video_quality_mode") VideoQualityMode videoQualityMode, + @JsonProperty("message_count") int messageCount, + @JsonProperty("member_count") int memberCount, + @JsonProperty("thread_metadata") ThreadMetadata threadMetadata, + @JsonProperty("member") ThreadMember member, + @JsonProperty("default_auto_archive_duration") int defaultAutoArchiveDuration, + @JsonProperty("permissions") String permissions, + @JsonProperty("flags") int flags, + @JsonProperty("total_message_sent") int threadMessageSent, + @JsonProperty("available_tags") List availableTags, + @JsonProperty("applied_tags") List appliedTags, + @JsonProperty("default_reaction_emoji") DefaultReaction defaultReactionEmoji, + @JsonProperty("default_thread_rate_limit_per_user") int defaultThreadRateLimitPerUser, + @JsonProperty("default_sort_order") SortOrderType defaultSortOrder, + @JsonProperty("default_forum_layout") ForumLayoutType defaultForumLayout +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ChannelMention.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ChannelMention.java index ce4abc5f..c97329b4 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ChannelMention.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ChannelMention.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ChannelMention( - @JsonProperty("id") long id, - @JsonProperty("guild_id") String guildId, - @JsonProperty("type") int type, - @JsonProperty("name") String name) {} + @JsonProperty("id") long id, + @JsonProperty("guild_id") String guildId, + @JsonProperty("type") int type, + @JsonProperty("name") String name +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/DefaultReaction.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/DefaultReaction.java index 6888182a..d45c83ae 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/DefaultReaction.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/DefaultReaction.java @@ -5,4 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record DefaultReaction( - @JsonProperty("emoji_id") long emojiId, @JsonProperty("emoji_name") String emojiName) {} + @JsonProperty("emoji_id") long emojiId, + @JsonProperty("emoji_name") String emojiName +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumAndMediaThreadMessageParams.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumAndMediaThreadMessageParams.java index 1a5c5433..c24be696 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumAndMediaThreadMessageParams.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumAndMediaThreadMessageParams.java @@ -1,17 +1,19 @@ package com.javadiscord.jdi.core.models.channel; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.message.embed.Embed; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record ForumAndMediaThreadMessageParams( - @JsonProperty("content") String content, - @JsonProperty("embeds") List embeds, - @JsonProperty("allowed_mentions") AllowedMentions allowedMentions, - @JsonProperty("components") List components, - @JsonProperty("sticker_ids") List stickerIds, - @JsonProperty("attachments") List attachments, - @JsonProperty("flags") int flags) {} + @JsonProperty("content") String content, + @JsonProperty("embeds") List embeds, + @JsonProperty("allowed_mentions") AllowedMentions allowedMentions, + @JsonProperty("components") List components, + @JsonProperty("sticker_ids") List stickerIds, + @JsonProperty("attachments") List attachments, + @JsonProperty("flags") int flags +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumTag.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumTag.java index 438b37d3..ce612316 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumTag.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ForumTag.java @@ -5,8 +5,9 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ForumTag( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("moderated") boolean moderated, - @JsonProperty("emoji_id") long emojiId, - @JsonProperty("emoji_name") String emojiName) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("moderated") boolean moderated, + @JsonProperty("emoji_id") long emojiId, + @JsonProperty("emoji_name") String emojiName +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Overwrite.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Overwrite.java index 7b27201d..b70f60f2 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/Overwrite.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/Overwrite.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Overwrite( - @JsonProperty("id") long id, - @JsonProperty("type") int type, - @JsonProperty("allow") String allow, - @JsonProperty("deny") String deny) {} + @JsonProperty("id") long id, + @JsonProperty("type") int type, + @JsonProperty("allow") String allow, + @JsonProperty("deny") String deny +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMember.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMember.java index a05a5d34..e6ac211d 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMember.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMember.java @@ -1,18 +1,20 @@ package com.javadiscord.jdi.core.models.channel; +import java.time.OffsetDateTime; + +import com.javadiscord.jdi.core.models.guild.GuildMember; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.guild.GuildMember; - -import java.time.OffsetDateTime; @JsonIgnoreProperties(ignoreUnknown = true) public record ThreadMember( - @JsonProperty("id") long threadId, - @JsonProperty("user_id") long userId, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("join_timestamp") - OffsetDateTime joinTime, - @JsonProperty("flags") int flags, - @JsonProperty("member") GuildMember guildMember) {} + @JsonProperty("id") long threadId, + @JsonProperty("user_id") long userId, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "join_timestamp" + ) OffsetDateTime joinTime, + @JsonProperty("flags") int flags, + @JsonProperty("member") GuildMember guildMember +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMetadata.java b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMetadata.java index 934e3ce9..85a6b815 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMetadata.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/channel/ThreadMetadata.java @@ -5,9 +5,10 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ThreadMetadata( - @JsonProperty("archived") boolean archived, - @JsonProperty("auto_archive_duration") int autoArchiveDuration, - @JsonProperty("archive_timestamp") long archiveTimestamp, - @JsonProperty("locked") boolean locked, - @JsonProperty("invitable") boolean invitable, - @JsonProperty("create_timestamp") String createTimestamp) {} + @JsonProperty("archived") boolean archived, + @JsonProperty("auto_archive_duration") int autoArchiveDuration, + @JsonProperty("archive_timestamp") long archiveTimestamp, + @JsonProperty("locked") boolean locked, + @JsonProperty("invitable") boolean invitable, + @JsonProperty("create_timestamp") String createTimestamp +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/emoji/Emoji.java b/models/src/main/java/com/javadiscord/jdi/core/models/emoji/Emoji.java index ecbac0b6..e3633fdc 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/emoji/Emoji.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/emoji/Emoji.java @@ -1,19 +1,21 @@ package com.javadiscord.jdi.core.models.emoji; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.guild.Role; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record Emoji( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("roles") List roles, - @JsonProperty("user") User user, - @JsonProperty("require_colons") boolean requiresColons, - @JsonProperty("managed") boolean managed, - @JsonProperty("animated") boolean animated, - @JsonProperty("available") boolean available) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("roles") List roles, + @JsonProperty("user") User user, + @JsonProperty("require_colons") boolean requiresColons, + @JsonProperty("managed") boolean managed, + @JsonProperty("animated") boolean animated, + @JsonProperty("available") boolean available +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Entitlement.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Entitlement.java index daebbb75..092297dc 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Entitlement.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Entitlement.java @@ -5,12 +5,13 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Entitlement( - @JsonProperty("id") long id, - @JsonProperty("sku_id") long skuId, - @JsonProperty("application_id") long applicationId, - @JsonProperty("user_id") long userId, - @JsonProperty("type") int type, - @JsonProperty("deleted") boolean deleted, - @JsonProperty("starts_at") String startsAt, - @JsonProperty("ends_at") String endsAt, - @JsonProperty("guild_id") long guildId) {} + @JsonProperty("id") long id, + @JsonProperty("sku_id") long skuId, + @JsonProperty("application_id") long applicationId, + @JsonProperty("user_id") long userId, + @JsonProperty("type") int type, + @JsonProperty("deleted") boolean deleted, + @JsonProperty("starts_at") String startsAt, + @JsonProperty("ends_at") String endsAt, + @JsonProperty("guild_id") long guildId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Guild.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Guild.java index 64862692..135e2527 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Guild.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Guild.java @@ -1,55 +1,58 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.emoji.Emoji; import com.javadiscord.jdi.core.models.message.Sticker; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record Guild( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("icon") String icon, - @JsonProperty("icon_hash") String iconHash, - @JsonProperty("splash") String splash, - @JsonProperty("discovery_splash") String discoverySplash, - @JsonProperty("owner") boolean owner, - @JsonProperty("owner_id") long ownerId, - @JsonProperty("permissions") String permissions, - @JsonProperty("region") String region, - @JsonProperty("afk_channel_id") long afkChannelId, - @JsonProperty("afk_timeout") int afkTimeout, - @JsonProperty("widget_enabled") boolean widgetEnabled, - @JsonProperty("widget_channel_id") long widgetChannelId, - @JsonProperty("verification_level") int verificationLevel, - @JsonProperty("default_message_notifications") - DefaultMessageNotificationLevel defaultMessageNotifications, - @JsonProperty("explicit_content_filter") ExplicitContentFilterLevel explicitContentFilter, - @JsonProperty("roles") List roles, - @JsonProperty("emojis") List emojis, - @JsonProperty("features") List features, - @JsonProperty("mfa_level") MFALevel mfaLevel, - @JsonProperty("application_id") long applicationId, - @JsonProperty("system_channel_id") long systemChannelId, - @JsonProperty("system_channel_flags") int systemChannelFlags, - @JsonProperty("rules_channel_id") long rulesChannelId, - @JsonProperty("max_presences") int maxPresences, - @JsonProperty("max_members") int maxMembers, - @JsonProperty("vanity_url_code") String vanityUrlCode, - @JsonProperty("description") String description, - @JsonProperty("banner") String banner, - @JsonProperty("premium_tier") PremiumTier premiumTier, - @JsonProperty("premium_subscription_count") int premiumSubscriptionCount, - @JsonProperty("preferred_locale") String preferredLocale, - @JsonProperty("public_updates_channel_id") long publicUpdatesChannelId, - @JsonProperty("max_video_channel_users") int maxVideoChannelUsers, - @JsonProperty("max_stage_video_channel_users") int maxStageVideoChannelUsers, - @JsonProperty("approximate_member_count") int approximateMemberCount, - @JsonProperty("approximate_presence_count") int approximatePresenceCount, - @JsonProperty("welcome_screen") WelcomeScreen welcomeScreen, - @JsonProperty("nsfw_level") GuildNSFWLevel nsfwLevel, - @JsonProperty("stickers") List stickers, - @JsonProperty("premium_progress_bar_enabled") boolean premiumProgressBarEnabled, - @JsonProperty("safety_alerts_channel_id") long safetyAlertsChannelId) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("icon") String icon, + @JsonProperty("icon_hash") String iconHash, + @JsonProperty("splash") String splash, + @JsonProperty("discovery_splash") String discoverySplash, + @JsonProperty("owner") boolean owner, + @JsonProperty("owner_id") long ownerId, + @JsonProperty("permissions") String permissions, + @JsonProperty("region") String region, + @JsonProperty("afk_channel_id") long afkChannelId, + @JsonProperty("afk_timeout") int afkTimeout, + @JsonProperty("widget_enabled") boolean widgetEnabled, + @JsonProperty("widget_channel_id") long widgetChannelId, + @JsonProperty("verification_level") int verificationLevel, + @JsonProperty( + "default_message_notifications" + ) DefaultMessageNotificationLevel defaultMessageNotifications, + @JsonProperty("explicit_content_filter") ExplicitContentFilterLevel explicitContentFilter, + @JsonProperty("roles") List roles, + @JsonProperty("emojis") List emojis, + @JsonProperty("features") List features, + @JsonProperty("mfa_level") MFALevel mfaLevel, + @JsonProperty("application_id") long applicationId, + @JsonProperty("system_channel_id") long systemChannelId, + @JsonProperty("system_channel_flags") int systemChannelFlags, + @JsonProperty("rules_channel_id") long rulesChannelId, + @JsonProperty("max_presences") int maxPresences, + @JsonProperty("max_members") int maxMembers, + @JsonProperty("vanity_url_code") String vanityUrlCode, + @JsonProperty("description") String description, + @JsonProperty("banner") String banner, + @JsonProperty("premium_tier") PremiumTier premiumTier, + @JsonProperty("premium_subscription_count") int premiumSubscriptionCount, + @JsonProperty("preferred_locale") String preferredLocale, + @JsonProperty("public_updates_channel_id") long publicUpdatesChannelId, + @JsonProperty("max_video_channel_users") int maxVideoChannelUsers, + @JsonProperty("max_stage_video_channel_users") int maxStageVideoChannelUsers, + @JsonProperty("approximate_member_count") int approximateMemberCount, + @JsonProperty("approximate_presence_count") int approximatePresenceCount, + @JsonProperty("welcome_screen") WelcomeScreen welcomeScreen, + @JsonProperty("nsfw_level") GuildNSFWLevel nsfwLevel, + @JsonProperty("stickers") List stickers, + @JsonProperty("premium_progress_bar_enabled") boolean premiumProgressBarEnabled, + @JsonProperty("safety_alerts_channel_id") long safetyAlertsChannelId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildBan.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildBan.java index 37e1faaa..2d97964a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildBan.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildBan.java @@ -1,8 +1,9 @@ package com.javadiscord.jdi.core.models.guild; +import com.javadiscord.jdi.core.models.user.User; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.User; @JsonIgnoreProperties(ignoreUnknown = true) public record GuildBan(@JsonProperty("guild_id") String guildId, @JsonProperty("user") User user) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildMember.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildMember.java index 06077944..4d9d9175 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildMember.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/GuildMember.java @@ -1,30 +1,32 @@ package com.javadiscord.jdi.core.models.guild; +import java.time.OffsetDateTime; +import java.util.List; + +import com.javadiscord.jdi.core.models.user.User; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.User; - -import java.time.OffsetDateTime; -import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) public record GuildMember( - @JsonProperty("user") User user, - @JsonProperty("nick") String nick, - @JsonProperty("avatar") String avatar, - @JsonProperty("roles") List roles, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("joined_at") - OffsetDateTime joinedAt, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("premium_since") - OffsetDateTime premiumSince, - @JsonProperty("deaf") boolean deaf, - @JsonProperty("mute") boolean mute, - @JsonProperty("flags") int flags, - @JsonProperty("pending") boolean pending, - @JsonProperty("permissions") String permissions, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("communication_disabled_until") - OffsetDateTime communicationDisabledUntil) {} + @JsonProperty("user") User user, + @JsonProperty("nick") String nick, + @JsonProperty("avatar") String avatar, + @JsonProperty("roles") List roles, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "joined_at" + ) OffsetDateTime joinedAt, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "premium_since" + ) OffsetDateTime premiumSince, + @JsonProperty("deaf") boolean deaf, + @JsonProperty("mute") boolean mute, + @JsonProperty("flags") int flags, + @JsonProperty("pending") boolean pending, + @JsonProperty("permissions") String permissions, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "communication_disabled_until" + ) OffsetDateTime communicationDisabledUntil +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Integration.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Integration.java index c9553461..9b1b7e42 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Integration.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Integration.java @@ -1,30 +1,32 @@ package com.javadiscord.jdi.core.models.guild; +import java.time.OffsetDateTime; + +import com.javadiscord.jdi.core.models.user.User; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.User; - -import java.time.OffsetDateTime; // TODO: finish implementation // https://discord.com/developers/docs/resources/guild#integration-object @JsonIgnoreProperties(ignoreUnknown = true) public record Integration( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("type") String type, - @JsonProperty("enabled") boolean enabled, - @JsonProperty("syncing") boolean syncing, - @JsonProperty("role_id") long roleId, - @JsonProperty("enable_emoticons") boolean enableEmoticons, - @JsonProperty("expire_behaviour") IntegrationExpireBehaviour expireBehaviour, - @JsonProperty("expire_grace_period") int expireGracePeriod, - @JsonProperty("user") User user, - @JsonProperty("account") IntegrationAccount account, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("synced_at") - OffsetDateTime syncedAt, - @JsonProperty("subscriber_count") int subscriberCount, - @JsonProperty("revoked") boolean revoked, - @JsonProperty("application") IntegrationApplication application) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("type") String type, + @JsonProperty("enabled") boolean enabled, + @JsonProperty("syncing") boolean syncing, + @JsonProperty("role_id") long roleId, + @JsonProperty("enable_emoticons") boolean enableEmoticons, + @JsonProperty("expire_behaviour") IntegrationExpireBehaviour expireBehaviour, + @JsonProperty("expire_grace_period") int expireGracePeriod, + @JsonProperty("user") User user, + @JsonProperty("account") IntegrationAccount account, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "synced_at" + ) OffsetDateTime syncedAt, + @JsonProperty("subscriber_count") int subscriberCount, + @JsonProperty("revoked") boolean revoked, + @JsonProperty("application") IntegrationApplication application +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/IntegrationApplication.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/IntegrationApplication.java index 9b7086d1..b9808670 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/IntegrationApplication.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/IntegrationApplication.java @@ -1,13 +1,15 @@ package com.javadiscord.jdi.core.models.guild; +import com.javadiscord.jdi.core.models.user.User; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.User; @JsonIgnoreProperties(ignoreUnknown = true) public record IntegrationApplication( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("icon") String icon, - @JsonProperty("description") String description, - @JsonProperty("bot") User bot) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("icon") String icon, + @JsonProperty("description") String description, + @JsonProperty("bot") User bot +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Interaction.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Interaction.java index 6d0c8d69..943cee8a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Interaction.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Interaction.java @@ -1,34 +1,35 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonAlias; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.message.Message; import com.javadiscord.jdi.core.models.user.Member; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record Interaction( - @JsonProperty("id") long id, - @JsonProperty("application_id") long applicationId, - @JsonProperty("type") String type, - @JsonProperty("data") InteractionData data, - @JsonProperty("guild_id") long guildId, - @JsonProperty("channel") Channel channel, - @JsonProperty("channel_id") long channelId, - @JsonProperty("member") Member member, - @JsonProperty("user") User user, - @JsonProperty("token") String token, - @JsonProperty("version") int version, - @JsonProperty("message") Message message, - @JsonProperty("app_permissions") String appPermissions, - @JsonProperty("locale") String locale, - @JsonProperty("guild_locale") String guildLocale, - @JsonProperty("entitlements") List entitlements, - @JsonAlias("authorizing_integration_owners") - Map authorizingIntegrationOwners, - @JsonProperty("context") String context) {} + @JsonProperty("id") long id, + @JsonProperty("application_id") long applicationId, + @JsonProperty("type") String type, + @JsonProperty("data") InteractionData data, + @JsonProperty("guild_id") long guildId, + @JsonProperty("channel") Channel channel, + @JsonProperty("channel_id") long channelId, + @JsonProperty("member") Member member, + @JsonProperty("user") User user, + @JsonProperty("token") String token, + @JsonProperty("version") int version, + @JsonProperty("message") Message message, + @JsonProperty("app_permissions") String appPermissions, + @JsonProperty("locale") String locale, + @JsonProperty("guild_locale") String guildLocale, + @JsonProperty("entitlements") List entitlements, + @JsonAlias("authorizing_integration_owners") Map authorizingIntegrationOwners, + @JsonProperty("context") String context +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/InteractionData.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/InteractionData.java index cbf6c24d..1d9861af 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/InteractionData.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/InteractionData.java @@ -1,15 +1,17 @@ package com.javadiscord.jdi.core.models.guild; +import com.javadiscord.jdi.core.models.application.ApplicationCommandOption; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.application.ApplicationCommandOption; @JsonIgnoreProperties(ignoreUnknown = true) public record InteractionData( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("type") int type, - @JsonProperty("resolved") ResolvedData resolved, - @JsonProperty("options") ApplicationCommandOption[] options, - @JsonProperty("guild_id") Long guildId, - @JsonProperty("target_id") Long targetId) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("type") int type, + @JsonProperty("resolved") ResolvedData resolved, + @JsonProperty("options") ApplicationCommandOption[] options, + @JsonProperty("guild_id") Long guildId, + @JsonProperty("target_id") Long targetId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/MemberChunk.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/MemberChunk.java index 9cafcf53..44dfa135 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/MemberChunk.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/MemberChunk.java @@ -1,18 +1,20 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.identify.Presence; import com.javadiscord.jdi.core.models.user.Member; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record MemberChunk( - @JsonProperty("guild_id") long guildId, - @JsonProperty("members") List members, - @JsonProperty("chunk_index") int chunkIndex, - @JsonProperty("chunk_count") int chunkCount, - @JsonProperty("not_found") List notFound, - @JsonProperty("presences") List presences, - @JsonProperty("nonce") String nonce) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("members") List members, + @JsonProperty("chunk_index") int chunkIndex, + @JsonProperty("chunk_count") int chunkCount, + @JsonProperty("not_found") List notFound, + @JsonProperty("presences") List presences, + @JsonProperty("nonce") String nonce +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Onboarding.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Onboarding.java index 53cd3e41..1b67d1a7 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Onboarding.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Onboarding.java @@ -1,14 +1,15 @@ package com.javadiscord.jdi.core.models.guild; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record Onboarding( - @JsonProperty("guild_id") long guildId, - @JsonProperty("prompts") List prompts, - @JsonProperty("default_channel_ids") List defaultChannelIds, - @JsonProperty("enabled") boolean enabled, - @JsonProperty("mode") OnboardingMode mode) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("prompts") List prompts, + @JsonProperty("default_channel_ids") List defaultChannelIds, + @JsonProperty("enabled") boolean enabled, + @JsonProperty("mode") OnboardingMode mode +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPrompt.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPrompt.java index 68e26b1f..9ab85dc2 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPrompt.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPrompt.java @@ -1,16 +1,17 @@ package com.javadiscord.jdi.core.models.guild; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record OnboardingPrompt( - @JsonProperty("id") long id, - @JsonProperty("type") OnboardingPromptType type, - @JsonProperty("options") List options, - @JsonProperty("title") String title, - @JsonProperty("single_select") boolean singleSelect, - @JsonProperty("required") boolean required, - @JsonProperty("in_onboarding") boolean inOnboarding) {} + @JsonProperty("id") long id, + @JsonProperty("type") OnboardingPromptType type, + @JsonProperty("options") List options, + @JsonProperty("title") String title, + @JsonProperty("single_select") boolean singleSelect, + @JsonProperty("required") boolean required, + @JsonProperty("in_onboarding") boolean inOnboarding +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPromptOption.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPromptOption.java index ed6c7b69..7ddd0dcc 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPromptOption.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/OnboardingPromptOption.java @@ -1,19 +1,21 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.emoji.Emoji; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record OnboardingPromptOption( - @JsonProperty("id") long id, - @JsonProperty("channel_ids") List channelIds, - @JsonProperty("role_ids") List roleIds, - @JsonProperty("emoji") Emoji emoji, - @JsonProperty("emoji_id") long emojiId, - @JsonProperty("emoji_name") String emojiName, - @JsonProperty("emoji_animated") boolean emojiAnimated, - @JsonProperty("title") String title, - @JsonProperty("description") String description) {} + @JsonProperty("id") long id, + @JsonProperty("channel_ids") List channelIds, + @JsonProperty("role_ids") List roleIds, + @JsonProperty("emoji") Emoji emoji, + @JsonProperty("emoji_id") long emojiId, + @JsonProperty("emoji_name") String emojiName, + @JsonProperty("emoji_animated") boolean emojiAnimated, + @JsonProperty("title") String title, + @JsonProperty("description") String description +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/ResolvedData.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/ResolvedData.java index 8232d6cf..356ff4e0 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/ResolvedData.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/ResolvedData.java @@ -1,20 +1,22 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.message.Message; import com.javadiscord.jdi.core.models.message.MessageAttachment; import com.javadiscord.jdi.core.models.user.Member; import com.javadiscord.jdi.core.models.user.User; -import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record ResolvedData( - @JsonProperty("users") Map users, - @JsonProperty("members") Map members, - @JsonProperty("roles") Map roles, - @JsonProperty("channels") Map channels, - @JsonProperty("messages") Map messages, - @JsonProperty("attachments") Map attachments) {} + @JsonProperty("users") Map users, + @JsonProperty("members") Map members, + @JsonProperty("roles") Map roles, + @JsonProperty("channels") Map channels, + @JsonProperty("messages") Map messages, + @JsonProperty("attachments") Map attachments +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Role.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Role.java index 39232c0c..ce7679f5 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Role.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Role.java @@ -5,16 +5,17 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Role( - @JsonProperty("guild_id") long guildId, - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("color") String color, - @JsonProperty("hoist") boolean hoist, - @JsonProperty("icon") String icon, - @JsonProperty("unicode_emoji") String unicodeEmoji, - @JsonProperty("position") int position, - @JsonProperty("permissions") String permissions, - @JsonProperty("managed") boolean managed, - @JsonProperty("mentionable") boolean mentionable, - @JsonProperty("tags") Tags tags, - @JsonProperty("flags") int flags) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("color") String color, + @JsonProperty("hoist") boolean hoist, + @JsonProperty("icon") String icon, + @JsonProperty("unicode_emoji") String unicodeEmoji, + @JsonProperty("position") int position, + @JsonProperty("permissions") String permissions, + @JsonProperty("managed") boolean managed, + @JsonProperty("mentionable") boolean mentionable, + @JsonProperty("tags") Tags tags, + @JsonProperty("flags") int flags +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/RoleSubscriptionData.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/RoleSubscriptionData.java index 40b43a24..def0cc0a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/RoleSubscriptionData.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/RoleSubscriptionData.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record RoleSubscriptionData( - @JsonProperty("role_subscription_listing_id") long roleSubscriptionListingId, - @JsonProperty("tier_name") String tierName, - @JsonProperty("total_months_subscribed") int totalMonthsSubscribed, - @JsonProperty("is_renewal") boolean isRenewal) {} + @JsonProperty("role_subscription_listing_id") long roleSubscriptionListingId, + @JsonProperty("tier_name") String tierName, + @JsonProperty("total_months_subscribed") int totalMonthsSubscribed, + @JsonProperty("is_renewal") boolean isRenewal +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Tags.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Tags.java index 699f9cbd..7129cfd8 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/Tags.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/Tags.java @@ -5,9 +5,10 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Tags( - @JsonProperty("bot_id") long botId, - @JsonProperty("integration_id") long integrationId, - @JsonProperty("premium_subscriber") boolean premiumSubscriber, - @JsonProperty("subscription_listing_id") long subscriptionListingId, - @JsonProperty("available_for_purchase") boolean availableForPurchase, - @JsonProperty("guild_connections") boolean guildConnections) {} + @JsonProperty("bot_id") long botId, + @JsonProperty("integration_id") long integrationId, + @JsonProperty("premium_subscriber") boolean premiumSubscriber, + @JsonProperty("subscription_listing_id") long subscriptionListingId, + @JsonProperty("available_for_purchase") boolean availableForPurchase, + @JsonProperty("guild_connections") boolean guildConnections +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreen.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreen.java index 8fc65606..bba4252f 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreen.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreen.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.core.models.guild; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record WelcomeScreen( - @JsonProperty("description") String description, - @JsonProperty("welcome_channels") List welcomeScreenChannels) {} + @JsonProperty("description") String description, + @JsonProperty("welcome_channels") List welcomeScreenChannels +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreenChannel.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreenChannel.java index 41752387..596d0528 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreenChannel.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WelcomeScreenChannel.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record WelcomeScreenChannel( - @JsonProperty("channel_id") long channelId, - @JsonProperty("description") String description, - @JsonProperty("emoji_id") long emojiId, - @JsonProperty("emoji_name") String emojiName) {} + @JsonProperty("channel_id") long channelId, + @JsonProperty("description") String description, + @JsonProperty("emoji_id") long emojiId, + @JsonProperty("emoji_name") String emojiName +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetObject.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetObject.java index e7180ba0..be08c805 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetObject.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetObject.java @@ -1,17 +1,19 @@ package com.javadiscord.jdi.core.models.guild; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record WidgetObject( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("instant_invite") String instantInvite, - @JsonProperty("channels") List channels, - @JsonProperty("members") List members, - @JsonProperty("presence_count") int presenceCount) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("instant_invite") String instantInvite, + @JsonProperty("channels") List channels, + @JsonProperty("members") List members, + @JsonProperty("presence_count") int presenceCount +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetSettingsObject.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetSettingsObject.java index bc5eba2f..24fb779c 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetSettingsObject.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild/WidgetSettingsObject.java @@ -5,4 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record WidgetSettingsObject( - @JsonProperty("enabled") boolean enabled, @JsonProperty("channel_id") long channelId) {} + @JsonProperty("enabled") boolean enabled, + @JsonProperty("channel_id") long channelId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/guild_template/GuildTemplate.java b/models/src/main/java/com/javadiscord/jdi/core/models/guild_template/GuildTemplate.java index 72c2874c..f0399fe3 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/guild_template/GuildTemplate.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/guild_template/GuildTemplate.java @@ -1,27 +1,29 @@ package com.javadiscord.jdi.core.models.guild_template; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.time.OffsetDateTime; + import com.javadiscord.jdi.core.models.guild.Guild; import com.javadiscord.jdi.core.models.user.User; -import java.time.OffsetDateTime; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record GuildTemplate( - @JsonProperty("code") String code, - @JsonProperty("name") String name, - @JsonProperty("description") String description, - @JsonProperty("usage_count") int usageCount, - @JsonProperty("creator_id") long creatorId, - @JsonProperty("creator") User creator, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("created_at") - OffsetDateTime createdAt, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("updated_at") - OffsetDateTime updatedAt, - @JsonProperty("source_guild_id") long sourceGuildId, - @JsonProperty("serialized_source_guild") Guild sourceGuild, - @JsonProperty("is_dirty") boolean isDirty) {} + @JsonProperty("code") String code, + @JsonProperty("name") String name, + @JsonProperty("description") String description, + @JsonProperty("usage_count") int usageCount, + @JsonProperty("creator_id") long creatorId, + @JsonProperty("creator") User creator, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "created_at" + ) OffsetDateTime createdAt, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "updated_at" + ) OffsetDateTime updatedAt, + @JsonProperty("source_guild_id") long sourceGuildId, + @JsonProperty("serialized_source_guild") Guild sourceGuild, + @JsonProperty("is_dirty") boolean isDirty +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/identify/Data.java b/models/src/main/java/com/javadiscord/jdi/core/models/identify/Data.java index 622ec0cf..9958f9ef 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/identify/Data.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/identify/Data.java @@ -12,13 +12,14 @@ public class Data { public Data() {} public Data( - String token, - Properties properties, - boolean compress, - int large_threshold, - int[] shard, - Presence presence, - int intents) { + String token, + Properties properties, + boolean compress, + int large_threshold, + int[] shard, + Presence presence, + int intents + ) { this.token = token; this.properties = properties; this.compress = compress; diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/invite/Invite.java b/models/src/main/java/com/javadiscord/jdi/core/models/invite/Invite.java index caf3c34f..df684acc 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/invite/Invite.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/invite/Invite.java @@ -1,21 +1,23 @@ package com.javadiscord.jdi.core.models.invite; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import com.javadiscord.jdi.core.models.application.Application; import com.javadiscord.jdi.core.models.user.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + @JsonIgnoreProperties(ignoreUnknown = true) public record Invite( - @JsonProperty("channel_id") long channelId, - @JsonProperty("code") String code, - @JsonProperty("created_at") String createdAt, - @JsonProperty("guild_id") long guildId, - @JsonProperty("inviter") User inviter, - @JsonProperty("max_age") int maxAge, - @JsonProperty("max_uses") int maxUses, - @JsonProperty("target_type") InviteTargetType targetType, - @JsonProperty("target_user") User targetUser, - @JsonProperty("target_application") Application targetApplication, - @JsonProperty("temporary") boolean temporary, - @JsonProperty("uses") int uses) {} + @JsonProperty("channel_id") long channelId, + @JsonProperty("code") String code, + @JsonProperty("created_at") String createdAt, + @JsonProperty("guild_id") long guildId, + @JsonProperty("inviter") User inviter, + @JsonProperty("max_age") int maxAge, + @JsonProperty("max_uses") int maxUses, + @JsonProperty("target_type") InviteTargetType targetType, + @JsonProperty("target_user") User targetUser, + @JsonProperty("target_application") Application targetApplication, + @JsonProperty("temporary") boolean temporary, + @JsonProperty("uses") int uses +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java index e16f425a..7debd554 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java @@ -1,7 +1,7 @@ package com.javadiscord.jdi.core.models.message; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.channel.ChannelMention; import com.javadiscord.jdi.core.models.guild.ResolvedData; @@ -10,41 +10,43 @@ import com.javadiscord.jdi.core.models.ready.Application; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record Message( - @JsonProperty("guild_id") long guildId, - @JsonProperty("id") long id, - @JsonProperty("channel_id") long channelId, - @JsonProperty("author") User author, - @JsonProperty("content") String content, - @JsonProperty("timestamp") String timestamp, - @JsonProperty("edited_timestamp") String editedTimestamp, - @JsonProperty("tts") boolean tts, - @JsonProperty("mention_everyone") boolean mentionEveryone, - @JsonProperty("mentions") List mentions, - @JsonProperty("mention_roles") List mentionRoles, - @JsonProperty("mention_channels") List mentionChannels, - @JsonProperty("attachments") List messageAttachments, - @JsonProperty("embeds") List embeds, - @JsonProperty("reactions") List messageReactions, - @JsonProperty("nonce") Object nonce, - @JsonProperty("pinned") boolean pinned, - @JsonProperty("webhook_id") long webhookId, - @JsonProperty("type") MessageType type, - @JsonProperty("activity") MessageActivity activity, - @JsonProperty("application") Application application, - @JsonProperty("application_id") String applicationId, - @JsonProperty("message_reference") MessageReference messageReference, - @JsonProperty("flags") int flags, - @JsonProperty("referenced_message") Message referencedMessage, - @JsonProperty("interaction_metadata") MessageInteractionMetadata interactionMetadata, - @JsonProperty("interaction") MessageInteraction interaction, - @JsonProperty("thread") Channel thread, - @JsonProperty("components") List components, - @JsonProperty("sticker_items") List stickerItems, - @JsonProperty("stickers") List stickers, - @JsonProperty("position") int position, - @JsonProperty("role_subscription_data") RoleSubscriptionData roleSubscriptionData, - @JsonProperty("resolved") ResolvedData resolved) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("id") long id, + @JsonProperty("channel_id") long channelId, + @JsonProperty("author") User author, + @JsonProperty("content") String content, + @JsonProperty("timestamp") String timestamp, + @JsonProperty("edited_timestamp") String editedTimestamp, + @JsonProperty("tts") boolean tts, + @JsonProperty("mention_everyone") boolean mentionEveryone, + @JsonProperty("mentions") List mentions, + @JsonProperty("mention_roles") List mentionRoles, + @JsonProperty("mention_channels") List mentionChannels, + @JsonProperty("attachments") List messageAttachments, + @JsonProperty("embeds") List embeds, + @JsonProperty("reactions") List messageReactions, + @JsonProperty("nonce") Object nonce, + @JsonProperty("pinned") boolean pinned, + @JsonProperty("webhook_id") long webhookId, + @JsonProperty("type") MessageType type, + @JsonProperty("activity") MessageActivity activity, + @JsonProperty("application") Application application, + @JsonProperty("application_id") String applicationId, + @JsonProperty("message_reference") MessageReference messageReference, + @JsonProperty("flags") int flags, + @JsonProperty("referenced_message") Message referencedMessage, + @JsonProperty("interaction_metadata") MessageInteractionMetadata interactionMetadata, + @JsonProperty("interaction") MessageInteraction interaction, + @JsonProperty("thread") Channel thread, + @JsonProperty("components") List components, + @JsonProperty("sticker_items") List stickerItems, + @JsonProperty("stickers") List stickers, + @JsonProperty("position") int position, + @JsonProperty("role_subscription_data") RoleSubscriptionData roleSubscriptionData, + @JsonProperty("resolved") ResolvedData resolved +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageActivity.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageActivity.java index 72d51d65..1108589b 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageActivity.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageActivity.java @@ -5,4 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageActivity( - @JsonProperty("type") MessageActivityType type, @JsonProperty("party_id") String partyId) {} + @JsonProperty("type") MessageActivityType type, + @JsonProperty("party_id") String partyId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageAttachment.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageAttachment.java index 844396e7..df327939 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageAttachment.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageAttachment.java @@ -5,16 +5,17 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageAttachment( - @JsonProperty("id") String id, - @JsonProperty("filename") String filename, - @JsonProperty("description") String description, - @JsonProperty("content_type") String contentType, - @JsonProperty("size") int size, - @JsonProperty("url") String url, - @JsonProperty("proxy_url") String proxyUrl, - @JsonProperty("height") int height, - @JsonProperty("width") int width, - @JsonProperty("ephemeral") boolean ephemeral, - @JsonProperty("duration_secs") float durationSecs, - @JsonProperty("waveform") String waveform, - @JsonProperty("flags") int flags) {} + @JsonProperty("id") String id, + @JsonProperty("filename") String filename, + @JsonProperty("description") String description, + @JsonProperty("content_type") String contentType, + @JsonProperty("size") int size, + @JsonProperty("url") String url, + @JsonProperty("proxy_url") String proxyUrl, + @JsonProperty("height") int height, + @JsonProperty("width") int width, + @JsonProperty("ephemeral") boolean ephemeral, + @JsonProperty("duration_secs") float durationSecs, + @JsonProperty("waveform") String waveform, + @JsonProperty("flags") int flags +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageBulkDelete.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageBulkDelete.java index 13b6cbfa..16581b02 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageBulkDelete.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageBulkDelete.java @@ -1,12 +1,13 @@ package com.javadiscord.jdi.core.models.message; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record MessageBulkDelete( - @JsonProperty("ids") List ids, - @JsonProperty("channel_id") long channelId, - @JsonProperty("guild_id") long guildId) {} + @JsonProperty("ids") List ids, + @JsonProperty("channel_id") long channelId, + @JsonProperty("guild_id") long guildId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteraction.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteraction.java index 6d504f1d..580d7b0f 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteraction.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteraction.java @@ -1,14 +1,16 @@ package com.javadiscord.jdi.core.models.message; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import com.javadiscord.jdi.core.models.user.Member; import com.javadiscord.jdi.core.models.user.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + @JsonIgnoreProperties(ignoreUnknown = true) public record MessageInteraction( - @JsonProperty("id") long id, - @JsonProperty("type") int type, - @JsonProperty("name") String name, - @JsonProperty("user") User user, - @JsonProperty("member") Member member) {} + @JsonProperty("id") long id, + @JsonProperty("type") int type, + @JsonProperty("name") String name, + @JsonProperty("user") User user, + @JsonProperty("member") Member member +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteractionMetadata.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteractionMetadata.java index fd3a5e3c..649778ed 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteractionMetadata.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageInteractionMetadata.java @@ -1,18 +1,21 @@ package com.javadiscord.jdi.core.models.message; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - @JsonIgnoreProperties(ignoreUnknown = true) public record MessageInteractionMetadata( - @JsonProperty("id") long id, - @JsonProperty("type") int type, - @JsonProperty("user_id") String userId, - @JsonProperty("authorizing_integration_owners") - Map authorizingIntegrationOwners, - @JsonProperty("original_response_message_id") String originalResponseMessageId, - @JsonProperty("interacted_message_id") String interactedMessageId, - @JsonProperty("triggering_interaction_metadata") - MessageInteractionMetadata triggeringInteractionMetadata) {} + @JsonProperty("id") long id, + @JsonProperty("type") int type, + @JsonProperty("user_id") String userId, + @JsonProperty( + "authorizing_integration_owners" + ) Map authorizingIntegrationOwners, + @JsonProperty("original_response_message_id") String originalResponseMessageId, + @JsonProperty("interacted_message_id") String interactedMessageId, + @JsonProperty( + "triggering_interaction_metadata" + ) MessageInteractionMetadata triggeringInteractionMetadata +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessagePin.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessagePin.java index 7acecfd8..962c02f2 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessagePin.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessagePin.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessagePin( - @JsonProperty("last_pin_timestamp") String lastPinTimestamp, - @JsonProperty("channel_id") String channelId, - @JsonProperty("guild_id") String guildId) {} + @JsonProperty("last_pin_timestamp") String lastPinTimestamp, + @JsonProperty("channel_id") String channelId, + @JsonProperty("guild_id") String guildId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReaction.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReaction.java index 4ce2aa54..4493880b 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReaction.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReaction.java @@ -1,16 +1,18 @@ package com.javadiscord.jdi.core.models.message; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.emoji.Emoji; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record MessageReaction( - @JsonProperty("count") int count, - @JsonProperty("count_details") ReactionCountDetails countDetails, - @JsonProperty("me") boolean me, - @JsonProperty("me_burst") boolean meBurst, - @JsonProperty("emoji") Emoji emoji, - @JsonProperty("burst_colors") List burstColors) {} + @JsonProperty("count") int count, + @JsonProperty("count_details") ReactionCountDetails countDetails, + @JsonProperty("me") boolean me, + @JsonProperty("me_burst") boolean meBurst, + @JsonProperty("emoji") Emoji emoji, + @JsonProperty("burst_colors") List burstColors +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReactionsRemoved.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReactionsRemoved.java index 058bf10f..5a218d5f 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReactionsRemoved.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReactionsRemoved.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageReactionsRemoved( - @JsonProperty("message_id") long messageId, - @JsonProperty("channel_id") long channelId, - @JsonProperty("guild_id") long guildId) {} + @JsonProperty("message_id") long messageId, + @JsonProperty("channel_id") long channelId, + @JsonProperty("guild_id") long guildId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReference.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReference.java index c3ff9465..39fab099 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReference.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/MessageReference.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageReference( - @JsonProperty("messageId") String messageId, - @JsonProperty("channel_id") String channelId, - @JsonProperty("guild_id") String guildId, - @JsonProperty("fail_if_not_exists") boolean failIfNotExists) {} + @JsonProperty("messageId") String messageId, + @JsonProperty("channel_id") String channelId, + @JsonProperty("guild_id") String guildId, + @JsonProperty("fail_if_not_exists") boolean failIfNotExists +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/ReactionCountDetails.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/ReactionCountDetails.java index e10e9071..63320abd 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/ReactionCountDetails.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/ReactionCountDetails.java @@ -5,4 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ReactionCountDetails( - @JsonProperty("burst") int burst, @JsonProperty("normal") int normal) {} + @JsonProperty("burst") int burst, + @JsonProperty("normal") int normal +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/Sticker.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/Sticker.java index 10f9723e..e4e00e7d 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/Sticker.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/Sticker.java @@ -1,20 +1,22 @@ package com.javadiscord.jdi.core.models.message; +import com.javadiscord.jdi.core.models.user.User; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.User; @JsonIgnoreProperties(ignoreUnknown = true) public record Sticker( - @JsonProperty("id") long id, - @JsonProperty("pack_id") long packId, - @JsonProperty("name") String name, - @JsonProperty("description") String description, - @JsonProperty("tags") String tags, - @JsonProperty("asset") String asset, - @JsonProperty("type") StickerType type, - @JsonProperty("format_type") StickerFormatType formatType, - @JsonProperty("available") boolean available, - @JsonProperty("guild_id") long guildId, - @JsonProperty("user") User user, - @JsonProperty("sort_value") int sortValue) {} + @JsonProperty("id") long id, + @JsonProperty("pack_id") long packId, + @JsonProperty("name") String name, + @JsonProperty("description") String description, + @JsonProperty("tags") String tags, + @JsonProperty("asset") String asset, + @JsonProperty("type") StickerType type, + @JsonProperty("format_type") StickerFormatType formatType, + @JsonProperty("available") boolean available, + @JsonProperty("guild_id") long guildId, + @JsonProperty("user") User user, + @JsonProperty("sort_value") int sortValue +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerItem.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerItem.java index e58aa333..1a9500de 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerItem.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerItem.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record StickerItem( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("format_type") int formatType) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("format_type") int formatType +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerPack.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerPack.java index b17cfd51..62ae990e 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerPack.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerPack.java @@ -1,16 +1,17 @@ package com.javadiscord.jdi.core.models.message; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record StickerPack( - @JsonProperty("id") long id, - @JsonProperty("stickers") List stickers, - @JsonProperty("name") String name, - @JsonProperty("sky_id") long skuId, - @JsonProperty("cover_sticker_id") long coverStickerId, - @JsonProperty("description") String description, - @JsonProperty("banner_asset_id") long bannerAssetId) {} + @JsonProperty("id") long id, + @JsonProperty("stickers") List stickers, + @JsonProperty("name") String name, + @JsonProperty("sky_id") long skuId, + @JsonProperty("cover_sticker_id") long coverStickerId, + @JsonProperty("description") String description, + @JsonProperty("banner_asset_id") long bannerAssetId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerUpdate.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerUpdate.java index de957d5b..e9be206b 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerUpdate.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/StickerUpdate.java @@ -1,10 +1,12 @@ package com.javadiscord.jdi.core.models.message; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record StickerUpdate( - @JsonProperty("guildId") long guildId, @JsonProperty("stickers") List stickers) {} + @JsonProperty("guildId") long guildId, + @JsonProperty("stickers") List stickers +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/TypingStart.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/TypingStart.java index 3c73d3c2..22b7727c 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/TypingStart.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/TypingStart.java @@ -1,13 +1,15 @@ package com.javadiscord.jdi.core.models.message; +import com.javadiscord.jdi.core.models.user.Member; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.Member; @JsonIgnoreProperties(ignoreUnknown = true) public record TypingStart( - @JsonProperty("channel_id") long channelId, - @JsonProperty("guild_id") long guildId, - @JsonProperty("user_id") long userId, - @JsonProperty("timestamp") int timestamp, - @JsonProperty("member") Member member) {} + @JsonProperty("channel_id") long channelId, + @JsonProperty("guild_id") long guildId, + @JsonProperty("user_id") long userId, + @JsonProperty("timestamp") int timestamp, + @JsonProperty("member") Member member +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/Embed.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/Embed.java index c06d39df..d05c607b 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/Embed.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/Embed.java @@ -1,26 +1,27 @@ package com.javadiscord.jdi.core.models.message.embed; +import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Date; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record Embed( - @JsonProperty("title") String title, - @JsonProperty("type") String type, - @JsonProperty("description") String description, - @JsonProperty("url") String url, - @JsonProperty("timestamp") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - Date timestamp, - @JsonProperty("color") Integer color, - @JsonProperty("footer") EmbedFooter footer, - @JsonProperty("image") EmbedImage image, - @JsonProperty("thumbnail") EmbedThumbnail thumbnail, - @JsonProperty("video") EmbedVideo video, - @JsonProperty("provider") EmbedProvider provider, - @JsonProperty("author") EmbedAuthor author, - @JsonProperty("fields") List fields) {} + @JsonProperty("title") String title, + @JsonProperty("type") String type, + @JsonProperty("description") String description, + @JsonProperty("url") String url, + @JsonProperty("timestamp") @JsonFormat( + shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX" + ) Date timestamp, + @JsonProperty("color") Integer color, + @JsonProperty("footer") EmbedFooter footer, + @JsonProperty("image") EmbedImage image, + @JsonProperty("thumbnail") EmbedThumbnail thumbnail, + @JsonProperty("video") EmbedVideo video, + @JsonProperty("provider") EmbedProvider provider, + @JsonProperty("author") EmbedAuthor author, + @JsonProperty("fields") List fields +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedAuthor.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedAuthor.java index 8ca10f58..b9b7e766 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedAuthor.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedAuthor.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedAuthor( - @JsonProperty("name") String name, - @JsonProperty("url") String url, - @JsonProperty("icon_url") String iconUrl, - @JsonProperty("proxy_icon_url") String proxyIconUrl) {} + @JsonProperty("name") String name, + @JsonProperty("url") String url, + @JsonProperty("icon_url") String iconUrl, + @JsonProperty("proxy_icon_url") String proxyIconUrl +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedField.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedField.java index 649feb87..db4295b9 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedField.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedField.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedField( - @JsonProperty("name") String name, - @JsonProperty("value") String value, - @JsonProperty("inline") boolean inline) {} + @JsonProperty("name") String name, + @JsonProperty("value") String value, + @JsonProperty("inline") boolean inline +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedFooter.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedFooter.java index bea8a650..563267b1 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedFooter.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedFooter.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedFooter( - @JsonProperty("text") String text, - @JsonProperty("icon_url") String iconUrl, - @JsonProperty("proxy_icon_url") String proxyIconUrl) {} + @JsonProperty("text") String text, + @JsonProperty("icon_url") String iconUrl, + @JsonProperty("proxy_icon_url") String proxyIconUrl +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedImage.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedImage.java index 7cfaab5e..e9ce41db 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedImage.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedImage.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedImage( - @JsonProperty("url") String url, - @JsonProperty("proxy_url") String proxyUrl, - @JsonProperty("height") Integer height, - @JsonProperty("width") Integer width) {} + @JsonProperty("url") String url, + @JsonProperty("proxy_url") String proxyUrl, + @JsonProperty("height") Integer height, + @JsonProperty("width") Integer width +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedThumbnail.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedThumbnail.java index 45ffbd75..3484a79d 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedThumbnail.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedThumbnail.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedThumbnail( - @JsonProperty("url") String url, - @JsonProperty("proxy_url") String proxyUrl, - @JsonProperty("height") Integer height, - @JsonProperty("width") Integer width) {} + @JsonProperty("url") String url, + @JsonProperty("proxy_url") String proxyUrl, + @JsonProperty("height") Integer height, + @JsonProperty("width") Integer width +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedVideo.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedVideo.java index 78f807b8..e86f0a8f 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedVideo.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/message/embed/EmbedVideo.java @@ -5,7 +5,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record EmbedVideo( - @JsonProperty("url") String url, - @JsonProperty("proxy_url") String proxyUrl, - @JsonProperty("height") Integer height, - @JsonProperty("width") Integer width) {} + @JsonProperty("url") String url, + @JsonProperty("proxy_url") String proxyUrl, + @JsonProperty("height") Integer height, + @JsonProperty("width") Integer width +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/poll/Poll.java b/models/src/main/java/com/javadiscord/jdi/core/models/poll/Poll.java index f9982bd2..79663b4d 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/poll/Poll.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/poll/Poll.java @@ -1,19 +1,20 @@ package com.javadiscord.jdi.core.models.poll; +import java.time.OffsetDateTime; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.OffsetDateTime; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record Poll( - @JsonProperty("question") PollMedia question, - @JsonProperty("answers") List answers, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") - @JsonProperty("expiry") - OffsetDateTime expiry, - @JsonProperty("allow_multiselect") boolean allowMultiSelect, - @JsonProperty("layout_type") PollLayoutType layoutType, - @JsonProperty("results") PollResults results) {} + @JsonProperty("question") PollMedia question, + @JsonProperty("answers") List answers, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX") @JsonProperty( + "expiry" + ) OffsetDateTime expiry, + @JsonProperty("allow_multiselect") boolean allowMultiSelect, + @JsonProperty("layout_type") PollLayoutType layoutType, + @JsonProperty("results") PollResults results +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswer.java b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswer.java index 44d5a7ad..a8767174 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswer.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswer.java @@ -5,4 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record PollAnswer( - @JsonProperty("answer_id") int answerId, @JsonProperty("poll_media") PollMedia pollMedia) {} + @JsonProperty("answer_id") int answerId, + @JsonProperty("poll_media") PollMedia pollMedia +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswerCount.java b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswerCount.java index 2f4ee358..af972a4a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswerCount.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollAnswerCount.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record PollAnswerCount( - @JsonProperty("id") int id, - @JsonProperty("count") int count, - @JsonProperty("me_voted") boolean meVoted) {} + @JsonProperty("id") int id, + @JsonProperty("count") int count, + @JsonProperty("me_voted") boolean meVoted +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollMedia.java b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollMedia.java index f89ade6e..e4653127 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollMedia.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollMedia.java @@ -1,8 +1,9 @@ package com.javadiscord.jdi.core.models.poll; +import com.javadiscord.jdi.core.models.emoji.Emoji; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.emoji.Emoji; @JsonIgnoreProperties(ignoreUnknown = true) public record PollMedia(@JsonProperty("text") String text, @JsonProperty("emoji") Emoji emoji) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollResults.java b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollResults.java index 6efbfc05..afdb924c 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollResults.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/poll/PollResults.java @@ -1,11 +1,12 @@ package com.javadiscord.jdi.core.models.poll; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record PollResults( - @JsonProperty("is_finalized") boolean isFinalized, - @JsonProperty("answer_counts") List answerCounts) {} + @JsonProperty("is_finalized") boolean isFinalized, + @JsonProperty("answer_counts") List answerCounts +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/ready/ReadyEvent.java b/models/src/main/java/com/javadiscord/jdi/core/models/ready/ReadyEvent.java index 397355d6..ee8194a6 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/ready/ReadyEvent.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/ready/ReadyEvent.java @@ -1,26 +1,28 @@ package com.javadiscord.jdi.core.models.ready; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import com.javadiscord.jdi.core.models.guild.Guild; import com.javadiscord.jdi.core.models.user.User; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record ReadyEvent( - @JsonProperty("v") int version, - @JsonProperty("user_settings") UserSetting userSettings, - User user, - int[] shard, - @JsonProperty("session_type") String sessionType, - @JsonProperty("session_id") String sessionId, - @JsonProperty("resume_gateway_url") String resumeGatewayURL, - String[] relationships, - String[] private_channels, - String[] presences, - List guilds, - @JsonProperty("guild_join_requests") String[] guildJoinRequests, - @JsonProperty("geo_ordered_rtc_regions") String[] geoOrderedRtcRegions, - Auth auth, - Application application) {} + @JsonProperty("v") int version, + @JsonProperty("user_settings") UserSetting userSettings, + User user, + int[] shard, + @JsonProperty("session_type") String sessionType, + @JsonProperty("session_id") String sessionId, + @JsonProperty("resume_gateway_url") String resumeGatewayURL, + String[] relationships, + String[] private_channels, + String[] presences, + List guilds, + @JsonProperty("guild_join_requests") String[] guildJoinRequests, + @JsonProperty("geo_ordered_rtc_regions") String[] geoOrderedRtcRegions, + Auth auth, + Application application +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/EventUser.java b/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/EventUser.java index 26fd7838..a5467def 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/EventUser.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/EventUser.java @@ -1,12 +1,14 @@ package com.javadiscord.jdi.core.models.scheduled_event; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import com.javadiscord.jdi.core.models.user.Member; import com.javadiscord.jdi.core.models.user.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + @JsonIgnoreProperties(ignoreUnknown = true) public record EventUser( - @JsonProperty("guild_scheduled_event_id") long guildScheduledEventId, - User user, - Member member) {} + @JsonProperty("guild_scheduled_event_id") long guildScheduledEventId, + User user, + Member member +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/ScheduledEvent.java b/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/ScheduledEvent.java index cb673bde..c94e402e 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/ScheduledEvent.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/scheduled_event/ScheduledEvent.java @@ -1,26 +1,28 @@ package com.javadiscord.jdi.core.models.scheduled_event; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import com.javadiscord.jdi.core.models.guild.EntityMetadata; import com.javadiscord.jdi.core.models.guild.PrivacyLevel; import com.javadiscord.jdi.core.models.user.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + @JsonIgnoreProperties(ignoreUnknown = true) public record ScheduledEvent( - @JsonProperty("id") long id, - @JsonProperty("guild_id") long guildId, - @JsonProperty("channel_id") long channelId, - @JsonProperty("creator_id") long creatorId, - @JsonProperty("name") String name, - @JsonProperty("description") String description, - @JsonProperty("scheduled_start_time") String scheduledStartTime, - @JsonProperty("scheduled_end_time") String scheduledEndTime, - @JsonProperty("privacy_level") PrivacyLevel privacyLevel, - @JsonProperty("status") EventStatus status, - @JsonProperty("entity_type") ScheduledEntityType entityType, - @JsonProperty("entity_id") Long entityId, - @JsonProperty("entity_metadata") EntityMetadata entityMetadata, - @JsonProperty("creator") User creator, - @JsonProperty("user_count") int userCount, - @JsonProperty("image") String image) {} + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, + @JsonProperty("channel_id") long channelId, + @JsonProperty("creator_id") long creatorId, + @JsonProperty("name") String name, + @JsonProperty("description") String description, + @JsonProperty("scheduled_start_time") String scheduledStartTime, + @JsonProperty("scheduled_end_time") String scheduledEndTime, + @JsonProperty("privacy_level") PrivacyLevel privacyLevel, + @JsonProperty("status") EventStatus status, + @JsonProperty("entity_type") ScheduledEntityType entityType, + @JsonProperty("entity_id") Long entityId, + @JsonProperty("entity_metadata") EntityMetadata entityMetadata, + @JsonProperty("creator") User creator, + @JsonProperty("user_count") int userCount, + @JsonProperty("image") String image +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/stage/Stage.java b/models/src/main/java/com/javadiscord/jdi/core/models/stage/Stage.java index 99aada72..64e0e373 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/stage/Stage.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/stage/Stage.java @@ -5,10 +5,11 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Stage( - @JsonProperty("id") long id, - @JsonProperty("guild_id") long guildId, - @JsonProperty("channel_id") long channelId, - @JsonProperty("topic") String topic, - @JsonProperty("privacy_level") StagePrivacy privacyLevel, - @JsonProperty("discoverable_disabled") boolean discoverableDisabled, - @JsonProperty("guild_scheduled_event_id") long guildScheduleEventId) {} + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, + @JsonProperty("channel_id") long channelId, + @JsonProperty("topic") String topic, + @JsonProperty("privacy_level") StagePrivacy privacyLevel, + @JsonProperty("discoverable_disabled") boolean discoverableDisabled, + @JsonProperty("guild_scheduled_event_id") long guildScheduleEventId +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/user/Connection.java b/models/src/main/java/com/javadiscord/jdi/core/models/user/Connection.java index 94c8e91c..6dc2d75a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/user/Connection.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/user/Connection.java @@ -1,18 +1,20 @@ package com.javadiscord.jdi.core.models.user; +import com.javadiscord.jdi.core.models.guild.Integration; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.guild.Integration; @JsonIgnoreProperties(ignoreUnknown = true) public record Connection( - @JsonProperty("id") long id, - @JsonProperty("name") String name, - @JsonProperty("type") String type, - @JsonProperty("revoked") boolean revoked, - @JsonProperty("integrations") Integration integrations, - @JsonProperty("verified") boolean verified, - @JsonProperty("friend_sync") boolean friendSync, - @JsonProperty("show_activity") boolean showActivity, - @JsonProperty("two_way_link") boolean twoWayLink, - @JsonProperty("visibility") int visibility) {} + @JsonProperty("id") long id, + @JsonProperty("name") String name, + @JsonProperty("type") String type, + @JsonProperty("revoked") boolean revoked, + @JsonProperty("integrations") Integration integrations, + @JsonProperty("verified") boolean verified, + @JsonProperty("friend_sync") boolean friendSync, + @JsonProperty("show_activity") boolean showActivity, + @JsonProperty("two_way_link") boolean twoWayLink, + @JsonProperty("visibility") int visibility +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/user/Member.java b/models/src/main/java/com/javadiscord/jdi/core/models/user/Member.java index a2241a6e..57b291fc 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/user/Member.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/user/Member.java @@ -1,13 +1,14 @@ package com.javadiscord.jdi.core.models.user; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - @JsonIgnoreProperties(ignoreUnknown = true) public record Member( - @JsonProperty("guild_id") long guildId, - @JsonProperty("user") User user, - @JsonProperty("roles") List roles, - @JsonProperty("joined_at") String joinDate) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("user") User user, + @JsonProperty("roles") List roles, + @JsonProperty("joined_at") String joinDate +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/user/User.java b/models/src/main/java/com/javadiscord/jdi/core/models/user/User.java index b7426bd4..0880b653 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/user/User.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/user/User.java @@ -5,20 +5,21 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record User( - @JsonProperty("id") long id, - @JsonProperty("username") String username, - @JsonProperty("discriminator") String discriminator, - @JsonProperty("global_name") String displayName, - @JsonProperty("avatar") String avatar, - @JsonProperty("bot") boolean bot, - @JsonProperty("system") boolean system, - @JsonProperty("mfa_enabled") boolean mfaEnabled, - @JsonProperty("banner") String banner, - @JsonProperty("accent_color") int accentColor, - @JsonProperty("locale") String locale, - @JsonProperty("verified") boolean verified, - @JsonProperty("email") String email, - @JsonProperty("flags") int flags, - @JsonProperty("premium_type") PremiumType premiumType, - @JsonProperty("public_flags") int publicFlags, - @JsonProperty("avtar_decoration") String avatarDecoration) {} + @JsonProperty("id") long id, + @JsonProperty("username") String username, + @JsonProperty("discriminator") String discriminator, + @JsonProperty("global_name") String displayName, + @JsonProperty("avatar") String avatar, + @JsonProperty("bot") boolean bot, + @JsonProperty("system") boolean system, + @JsonProperty("mfa_enabled") boolean mfaEnabled, + @JsonProperty("banner") String banner, + @JsonProperty("accent_color") int accentColor, + @JsonProperty("locale") String locale, + @JsonProperty("verified") boolean verified, + @JsonProperty("email") String email, + @JsonProperty("flags") int flags, + @JsonProperty("premium_type") PremiumType premiumType, + @JsonProperty("public_flags") int publicFlags, + @JsonProperty("avtar_decoration") String avatarDecoration +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceRegion.java b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceRegion.java index 4763a20b..22d073bf 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceRegion.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceRegion.java @@ -5,8 +5,9 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record VoiceRegion( - @JsonProperty("id") String id, - @JsonProperty("name") String name, - @JsonProperty("optimal") boolean optimal, - @JsonProperty("deprecated") boolean deprecated, - @JsonProperty("custom") boolean custom) {} + @JsonProperty("id") String id, + @JsonProperty("name") String name, + @JsonProperty("optimal") boolean optimal, + @JsonProperty("deprecated") boolean deprecated, + @JsonProperty("custom") boolean custom +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceServer.java b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceServer.java index b053eb8e..84aa2601 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceServer.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceServer.java @@ -5,6 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record VoiceServer( - @JsonProperty("token") String token, - @JsonProperty("guild_id") long guildId, - @JsonProperty("endpoint") long endpoint) {} + @JsonProperty("token") String token, + @JsonProperty("guild_id") long guildId, + @JsonProperty("endpoint") long endpoint +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceState.java b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceState.java index a0531b9f..540a5b8e 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceState.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/voice/VoiceState.java @@ -1,21 +1,23 @@ package com.javadiscord.jdi.core.models.voice; +import com.javadiscord.jdi.core.models.user.Member; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.javadiscord.jdi.core.models.user.Member; @JsonIgnoreProperties(ignoreUnknown = true) public record VoiceState( - @JsonProperty("guild_id") long guildId, - @JsonProperty("channel_id") long channelId, - @JsonProperty("user_id") long userId, - @JsonProperty("member") Member member, - @JsonProperty("session_id") String sessionId, - @JsonProperty("deaf") boolean deaf, - @JsonProperty("mute") boolean mute, - @JsonProperty("self_deaf") boolean selfDeaf, - @JsonProperty("self_mute") boolean selfMute, - @JsonProperty("self_stream") boolean selfStream, - @JsonProperty("self_video") boolean selfVideo, - @JsonProperty("suppress") boolean suppress, - @JsonProperty("request_to_speak_timestamp") String requestToSpeakTimestamp) {} + @JsonProperty("guild_id") long guildId, + @JsonProperty("channel_id") long channelId, + @JsonProperty("user_id") long userId, + @JsonProperty("member") Member member, + @JsonProperty("session_id") String sessionId, + @JsonProperty("deaf") boolean deaf, + @JsonProperty("mute") boolean mute, + @JsonProperty("self_deaf") boolean selfDeaf, + @JsonProperty("self_mute") boolean selfMute, + @JsonProperty("self_stream") boolean selfStream, + @JsonProperty("self_video") boolean selfVideo, + @JsonProperty("suppress") boolean suppress, + @JsonProperty("request_to_speak_timestamp") String requestToSpeakTimestamp +) {} diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/webhook/Webhook.java b/models/src/main/java/com/javadiscord/jdi/core/models/webhook/Webhook.java index 14ebfcd9..a6fb092a 100644 --- a/models/src/main/java/com/javadiscord/jdi/core/models/webhook/Webhook.java +++ b/models/src/main/java/com/javadiscord/jdi/core/models/webhook/Webhook.java @@ -1,22 +1,24 @@ package com.javadiscord.jdi.core.models.webhook; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import com.javadiscord.jdi.core.models.channel.Channel; import com.javadiscord.jdi.core.models.guild.Guild; import com.javadiscord.jdi.core.models.user.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + @JsonIgnoreProperties(ignoreUnknown = true) public record Webhook( - @JsonProperty("id") long id, - @JsonProperty("type") WebhookType type, - @JsonProperty("guild_id") long guildId, - @JsonProperty("channel_id") long channelId, - @JsonProperty("user") User user, - @JsonProperty("name") String name, - @JsonProperty("avatar") String avatar, - @JsonProperty("token") String token, - @JsonProperty("application_id") long applicationId, - @JsonProperty("source_guild") Guild sourceGuild, - @JsonProperty("source_channel") Channel sourceChannel, - @JsonProperty("url") String url) {} + @JsonProperty("id") long id, + @JsonProperty("type") WebhookType type, + @JsonProperty("guild_id") long guildId, + @JsonProperty("channel_id") long channelId, + @JsonProperty("user") User user, + @JsonProperty("name") String name, + @JsonProperty("avatar") String avatar, + @JsonProperty("token") String token, + @JsonProperty("application_id") long applicationId, + @JsonProperty("source_guild") Guild sourceGuild, + @JsonProperty("source_channel") Channel sourceChannel, + @JsonProperty("url") String url +) {} diff --git a/spotless.xml b/spotless.xml new file mode 100644 index 00000000..8af22c7a --- /dev/null +++ b/spotless.xml @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +