diff --git a/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java b/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java index 179463ef..65f304cb 100644 --- a/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java +++ b/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java @@ -18,7 +18,7 @@ public record Thread( @JsonProperty("message_count") int messageCount, @JsonProperty("member_count") int memberCount, @JsonProperty("last_message_id") String lastMessageId, - @JsonProperty("id") String id, - @JsonProperty("guild_id") String guildId, + @JsonProperty("id") long id, + @JsonProperty("guild_id") long guildId, @JsonProperty("flags") int flags ) {} diff --git a/src/main/java/com/javadiscord/jdi/internal/models/channel/ChannelMention.java b/src/main/java/com/javadiscord/jdi/internal/models/channel/ChannelMention.java index 8962febb..16c1cef9 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/channel/ChannelMention.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/channel/ChannelMention.java @@ -5,7 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record ChannelMention( - @JsonProperty("id") String id, + @JsonProperty("id") long id, @JsonProperty("guild_id") String guildId, @JsonProperty("type") int type, @JsonProperty("name") String name diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/Application.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/Application.java index aa8ec170..f495ed52 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/Application.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/Application.java @@ -9,7 +9,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Application( - String id, + long id, String name, String icon, String description, diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionObject.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionObject.java index 85a32bd4..9ec3fc5c 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionObject.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionObject.java @@ -5,6 +5,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record AutoModerationActionObject( - @JsonProperty("type") int type, // AutoModeraetionActionType + @JsonProperty("type") int type, // AutoModerationActionType @JsonProperty("metadata") AutoModerationActionMetadata metadata ) {} diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionType.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionType.java index e7222be9..4ac9c2e8 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionType.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationActionType.java @@ -10,4 +10,8 @@ public enum AutoModerationActionType { AutoModerationActionType(int value) { this.value = value; } + + public int getValue() { + return value; + } } diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationEventType.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationEventType.java index 84e402af..d5009db7 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationEventType.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationEventType.java @@ -8,4 +8,8 @@ public enum AutoModerationEventType { AutoModerationEventType(int value) { this.value = value; } + + public int getValue() { + return value; + } } diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationKeywordPresetTypes.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationKeywordPresetTypes.java index dcd99ba9..876f7c2b 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationKeywordPresetTypes.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationKeywordPresetTypes.java @@ -10,4 +10,8 @@ public enum AutoModerationKeywordPresetTypes { AutoModerationKeywordPresetTypes(int value) { this.value = value; } + + public int getValue() { + return value; + } } diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationTriggerType.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationTriggerType.java index e05249e5..e3528b11 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationTriggerType.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/AutoModerationTriggerType.java @@ -11,4 +11,8 @@ public enum AutoModerationTriggerType { AutoModerationTriggerType(int value) { this.value = value; } + + public int getValue() { + return value; + } } diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationAccount.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationAccount.java index 81d28113..69656dea 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationAccount.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationAccount.java @@ -5,5 +5,5 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record IntegrationAccount( - @JsonProperty("id") String id, @JsonProperty("name") String name + @JsonProperty("id") long id, @JsonProperty("name") String name ) {} diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationExpireBehaviour.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationExpireBehaviour.java index dda3b62f..fba9368c 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationExpireBehaviour.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/IntegrationExpireBehaviour.java @@ -6,7 +6,7 @@ public enum IntegrationExpireBehaviour { private final int value; - private IntegrationExpireBehaviour(int value) { + IntegrationExpireBehaviour(int value) { this.value = value; } diff --git a/src/main/java/com/javadiscord/jdi/internal/models/guild/Invite.java b/src/main/java/com/javadiscord/jdi/internal/models/guild/Invite.java index a07546be..820e79d6 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/guild/Invite.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/guild/Invite.java @@ -7,7 +7,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Invite( - @JsonProperty("channel_id") String channelId, + @JsonProperty("channel_id") long channelId, @JsonProperty("code") String code, @JsonProperty("created_at") String createdAt, @JsonProperty("guild_id") String guildId, diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteraction.java b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteraction.java index c3a999f5..a8ece5d3 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteraction.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteraction.java @@ -8,7 +8,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageInteraction( - @JsonProperty("id") String id, + @JsonProperty("id") long id, @JsonProperty("type") int type, @JsonProperty("name") String name, @JsonProperty("user") User user, diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteractionMetadata.java b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteractionMetadata.java index b696cc24..b13e024a 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteractionMetadata.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageInteractionMetadata.java @@ -7,7 +7,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageInteractionMetadata( - @JsonProperty("id") String id, + @JsonProperty("id") long id, @JsonProperty("type") int type, @JsonProperty("user_id") String userId, @JsonProperty("authorizing_integration_owners") Map authorizingIntegrationOwners, diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReactionsRemoved.java b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReactionsRemoved.java index ca724380..5be61534 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReactionsRemoved.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReactionsRemoved.java @@ -5,7 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageReactionsRemoved( - @JsonProperty("message_id") long message_id, + @JsonProperty("messageId") long messageId, @JsonProperty("channel_id") long channelId, @JsonProperty("guild_id") long guildId ) {} diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReference.java b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReference.java index 56acfb6e..731ca445 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReference.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/MessageReference.java @@ -5,7 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record MessageReference( - @JsonProperty("message_id") String messageId, + @JsonProperty("messageId") String messageId, @JsonProperty("channel_id") String channelId, @JsonProperty("guild_id") String guildId, @JsonProperty("fail_if_not_exists") boolean failIfNotExists diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/StickerItem.java b/src/main/java/com/javadiscord/jdi/internal/models/message/StickerItem.java index 74ece6c0..4236c6da 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/StickerItem.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/StickerItem.java @@ -5,7 +5,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record StickerItem( - @JsonProperty("id") String id, + @JsonProperty("id") long id, @JsonProperty("name") String name, @JsonProperty("format_type") int formatType ) {} diff --git a/src/main/java/com/javadiscord/jdi/internal/models/message/TypingStart.java b/src/main/java/com/javadiscord/jdi/internal/models/message/TypingStart.java index 4ff1ef62..c71c3c0c 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/message/TypingStart.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/message/TypingStart.java @@ -7,9 +7,9 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record TypingStart( - @JsonProperty("channel_id") String channelId, - @JsonProperty("guild_id") String guildId, - @JsonProperty("user_id") String userId, + @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/src/main/java/com/javadiscord/jdi/internal/models/user/Connection.java b/src/main/java/com/javadiscord/jdi/internal/models/user/Connection.java index ce6cb421..50317c54 100644 --- a/src/main/java/com/javadiscord/jdi/internal/models/user/Connection.java +++ b/src/main/java/com/javadiscord/jdi/internal/models/user/Connection.java @@ -7,7 +7,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public record Connection( - @JsonProperty("id") String id, + @JsonProperty("id") long id, @JsonProperty("name") String name, @JsonProperty("type") String type, @JsonProperty("revoked") boolean revoked,