From 5dd3f3803f8ba516fe92664a6629cc5b9ec0a5ce Mon Sep 17 00:00:00 2001 From: HopeBaron Date: Sun, 8 Aug 2021 14:37:51 +0300 Subject: [PATCH] remove vip property --- CHANGELOG.md | 5 +++++ common/src/main/kotlin/entity/DiscordGuild.kt | 1 - core/src/main/kotlin/cache/data/InteractionData.kt | 2 +- core/src/main/kotlin/cache/data/MemberData.kt | 2 +- core/src/main/kotlin/cache/data/PartialGuildData.kt | 2 +- core/src/main/kotlin/cache/data/RegionData.kt | 3 +-- core/src/main/kotlin/cache/data/RoleTagsData.kt | 4 ++-- core/src/main/kotlin/entity/Region.kt | 2 -- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97074c6e76a5..1d2f7ef98706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ * Fixed the space in active threads get endpoint causing it to fail. * Fixed incorrect serialization of `NUMBER` option +* Fixed Missing properties in `MemberData`, `InteractionData` and others. (#361) + +## Changes + +* `Region` no longer has a `vip` property # 0.8.0-M3 diff --git a/common/src/main/kotlin/entity/DiscordGuild.kt b/common/src/main/kotlin/entity/DiscordGuild.kt index ccc0a7cc31e1..789ee5840e16 100644 --- a/common/src/main/kotlin/entity/DiscordGuild.kt +++ b/common/src/main/kotlin/entity/DiscordGuild.kt @@ -419,7 +419,6 @@ data class DiscordVoiceState( data class DiscordVoiceRegion( val id: String, val name: String, - val vip: Boolean, val optimal: Boolean, val deprecated: Boolean, val custom: Boolean, diff --git a/core/src/main/kotlin/cache/data/InteractionData.kt b/core/src/main/kotlin/cache/data/InteractionData.kt index f297f66aaeac..5033b51ece4a 100644 --- a/core/src/main/kotlin/cache/data/InteractionData.kt +++ b/core/src/main/kotlin/cache/data/InteractionData.kt @@ -38,7 +38,7 @@ data class InteractionData( val member: Optional = Optional.Missing(), val user: Optional = Optional.Missing(), val token: String, - val permissions: Optional = Optional.Missing(), + val permissions: Optional, val version: Int, val message: Optional = Optional.Missing() ) { diff --git a/core/src/main/kotlin/cache/data/MemberData.kt b/core/src/main/kotlin/cache/data/MemberData.kt index 3f76c46f52fd..4ccf8d37a8ed 100644 --- a/core/src/main/kotlin/cache/data/MemberData.kt +++ b/core/src/main/kotlin/cache/data/MemberData.kt @@ -16,7 +16,7 @@ data class MemberData( val nick: Optional = Optional.Missing(), val roles: List, val joinedAt: String, - val premiumSince: Optional = Optional.Missing(), + val premiumSince: Optional, val pending: OptionalBoolean = OptionalBoolean.Missing ) { diff --git a/core/src/main/kotlin/cache/data/PartialGuildData.kt b/core/src/main/kotlin/cache/data/PartialGuildData.kt index c05ea9e3626e..7e6fb9c23559 100644 --- a/core/src/main/kotlin/cache/data/PartialGuildData.kt +++ b/core/src/main/kotlin/cache/data/PartialGuildData.kt @@ -17,7 +17,7 @@ class PartialGuildData( val owner: OptionalBoolean = OptionalBoolean.Missing, val permissions: Optional = Optional.Missing(), val features: List, - val welcomeScreen: Optional = Optional.Missing(), + val welcomeScreen: Optional, ) { companion object { diff --git a/core/src/main/kotlin/cache/data/RegionData.kt b/core/src/main/kotlin/cache/data/RegionData.kt index 2ca1a11e7209..9819ae0ead8d 100644 --- a/core/src/main/kotlin/cache/data/RegionData.kt +++ b/core/src/main/kotlin/cache/data/RegionData.kt @@ -9,14 +9,13 @@ data class RegionData( val id: String, val guildId: OptionalSnowflake, val name: String, - val vip: Boolean, val optimal: Boolean, val deprecated: Boolean, val custom: Boolean, ) { companion object { fun from(guildId: OptionalSnowflake, region: DiscordVoiceRegion) = with(region) { - RegionData(id, guildId, name, vip, optimal, deprecated, custom) + RegionData(id, guildId, name, optimal, deprecated, custom) } } } \ No newline at end of file diff --git a/core/src/main/kotlin/cache/data/RoleTagsData.kt b/core/src/main/kotlin/cache/data/RoleTagsData.kt index 1dae1f90bdd9..52743670e765 100644 --- a/core/src/main/kotlin/cache/data/RoleTagsData.kt +++ b/core/src/main/kotlin/cache/data/RoleTagsData.kt @@ -7,8 +7,8 @@ import kotlinx.serialization.Serializable @Serializable data class RoleTagsData( - val botId: OptionalSnowflake = OptionalSnowflake.Missing, - val integrationId: OptionalSnowflake = OptionalSnowflake.Missing, + val botId: OptionalSnowflake, + val integrationId: OptionalSnowflake, val premiumSubscriber: Boolean, ) { diff --git a/core/src/main/kotlin/entity/Region.kt b/core/src/main/kotlin/entity/Region.kt index c22492046bfb..6d3ad6015f47 100644 --- a/core/src/main/kotlin/entity/Region.kt +++ b/core/src/main/kotlin/entity/Region.kt @@ -17,8 +17,6 @@ class Region(val data: RegionData, override val kord: Kord) : KordObject { val isOptimal: Boolean get() = data.optimal - val isVip: Boolean get() = data.vip - override fun hashCode(): Int = Objects.hash(id) override fun equals(other: Any?): Boolean = when (other) {