diff --git a/common/api/common.api b/common/api/common.api index d924b2a5d387..324cfa62fd2d 100644 --- a/common/api/common.api +++ b/common/api/common.api @@ -190,32 +190,19 @@ public abstract interface annotation class dev/kord/common/annotation/KordVoice public abstract class dev/kord/common/entity/ActivityFlag { public static final field Companion Ldev/kord/common/entity/ActivityFlag$Companion; - public static final field Instance Ldev/kord/common/entity/ActivityFlag; - public static final field Join Ldev/kord/common/entity/ActivityFlag; - public static final field JoinRequest Ldev/kord/common/entity/ActivityFlag; - public static final field Play Ldev/kord/common/entity/ActivityFlag; - public static final field Spectate Ldev/kord/common/entity/ActivityFlag; - public static final field Sync Ldev/kord/common/entity/ActivityFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun getValue ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/ActivityFlag;)Ldev/kord/common/entity/ActivityFlags; public final fun plus (Ldev/kord/common/entity/ActivityFlags;)Ldev/kord/common/entity/ActivityFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ActivityFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/ActivityFlag; } public final class dev/kord/common/entity/ActivityFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/ActivityFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ActivityFlag; - public synthetic fun values ()[Ldev/kord/common/entity/ActivityFlag; } public final class dev/kord/common/entity/ActivityFlag$Embedded : dev/kord/common/entity/ActivityFlag { @@ -268,12 +255,10 @@ public final class dev/kord/common/entity/ActivityFlagKt { public final class dev/kord/common/entity/ActivityFlags { public static final field Companion Ldev/kord/common/entity/ActivityFlags$Companion; - public synthetic fun (I)V public final fun contains (Ldev/kord/common/entity/ActivityFlag;)Z public final fun contains (Ldev/kord/common/entity/ActivityFlags;)Z public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/ActivityFlags; public fun equals (Ljava/lang/Object;)Z - public final synthetic fun getFlags ()Ljava/util/Set; public final fun getValue ()I public final fun getValues ()Ljava/util/Set; public fun hashCode ()I @@ -335,7 +320,6 @@ public final class dev/kord/common/entity/ActivityType$Streaming : dev/kord/comm } public final class dev/kord/common/entity/ActivityType$Unknown : dev/kord/common/entity/ActivityType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ActivityType$Watching : dev/kord/common/entity/ActivityType { @@ -398,7 +382,6 @@ public final class dev/kord/common/entity/AllowedMentionType$RoleMentions : dev/ } public final class dev/kord/common/entity/AllowedMentionType$Unknown : dev/kord/common/entity/AllowedMentionType { - public synthetic fun (Ljava/lang/String;)V } public final class dev/kord/common/entity/AllowedMentionType$UserMentions : dev/kord/common/entity/AllowedMentionType { @@ -551,7 +534,6 @@ public final class dev/kord/common/entity/ApplicationCommandOptionType$SubComman } public final class dev/kord/common/entity/ApplicationCommandOptionType$Unknown : dev/kord/common/entity/ApplicationCommandOptionType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ApplicationCommandOptionType$User : dev/kord/common/entity/ApplicationCommandOptionType { @@ -582,7 +564,6 @@ public final class dev/kord/common/entity/ApplicationCommandPermissionType$Role } public final class dev/kord/common/entity/ApplicationCommandPermissionType$Unknown : dev/kord/common/entity/ApplicationCommandPermissionType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ApplicationCommandPermissionType$User : dev/kord/common/entity/ApplicationCommandPermissionType { @@ -613,7 +594,6 @@ public final class dev/kord/common/entity/ApplicationCommandType$Message : dev/k } public final class dev/kord/common/entity/ApplicationCommandType$Unknown : dev/kord/common/entity/ApplicationCommandType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ApplicationCommandType$User : dev/kord/common/entity/ApplicationCommandType { @@ -621,30 +601,15 @@ public final class dev/kord/common/entity/ApplicationCommandType$User : dev/kord } public abstract class dev/kord/common/entity/ApplicationFlag { - public static final field ApplicationAutoModerationRuleCreateBadge Ldev/kord/common/entity/ApplicationFlag; - public static final field ApplicationCommandBadge Ldev/kord/common/entity/ApplicationFlag; public static final field Companion Ldev/kord/common/entity/ApplicationFlag$Companion; - public static final field Embedded Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayGuildMembers Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayGuildMembersLimited Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayMessageContent Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayMessageContentLimited Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayPresence Ldev/kord/common/entity/ApplicationFlag; - public static final field GatewayPresenceLimited Ldev/kord/common/entity/ApplicationFlag; - public static final field VerificationPendingGuildLimit Ldev/kord/common/entity/ApplicationFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/ApplicationFlag;)Ldev/kord/common/entity/ApplicationFlags; public final fun plus (Ldev/kord/common/entity/ApplicationFlags;)Ldev/kord/common/entity/ApplicationFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ApplicationFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/ApplicationFlag; } public final class dev/kord/common/entity/ApplicationFlag$ApplicationAutoModerationRuleCreateBadge : dev/kord/common/entity/ApplicationFlag { @@ -658,8 +623,6 @@ public final class dev/kord/common/entity/ApplicationFlag$ApplicationCommandBadg public final class dev/kord/common/entity/ApplicationFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/ApplicationFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ApplicationFlag; - public synthetic fun values ()[Ldev/kord/common/entity/ApplicationFlag; } public final class dev/kord/common/entity/ApplicationFlag$Embedded : dev/kord/common/entity/ApplicationFlag { @@ -708,15 +671,11 @@ public final class dev/kord/common/entity/ApplicationFlagKt { public final class dev/kord/common/entity/ApplicationFlags { public static final field Companion Ldev/kord/common/entity/ApplicationFlags$Companion; - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/ApplicationFlag;)Z public final fun contains (Ldev/kord/common/entity/ApplicationFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/ApplicationFlags; public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/ApplicationFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/ApplicationFlags;IILjava/lang/Object;)Ldev/kord/common/entity/ApplicationFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getFlags ()Ljava/util/List; public final fun getValues ()Ljava/util/Set; public fun hashCode ()I public final fun minus (Ldev/kord/common/entity/ApplicationFlag;)Ldev/kord/common/entity/ApplicationFlags; @@ -731,7 +690,6 @@ public final class dev/kord/common/entity/ApplicationFlags$Builder { public fun (I)V public synthetic fun (IILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Ldev/kord/common/entity/ApplicationFlags; - public final synthetic fun flags ()Ldev/kord/common/entity/ApplicationFlags; public final fun unaryMinus (Ldev/kord/common/entity/ApplicationFlag;)V public final fun unaryMinus (Ldev/kord/common/entity/ApplicationFlags;)V public final fun unaryPlus (Ldev/kord/common/entity/ApplicationFlag;)V @@ -790,7 +748,6 @@ public final class dev/kord/common/entity/ApplicationRoleConnectionMetadataType$ } public final class dev/kord/common/entity/ApplicationRoleConnectionMetadataType$Unknown : dev/kord/common/entity/ApplicationRoleConnectionMetadataType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/ArchiveDuration { @@ -1443,7 +1400,6 @@ public final class dev/kord/common/entity/AuditLogEvent$ThreadUpdate : dev/kord/ } public final class dev/kord/common/entity/AuditLogEvent$Unknown : dev/kord/common/entity/AuditLogEvent { - public synthetic fun (I)V } public final class dev/kord/common/entity/AuditLogEvent$WebhookCreate : dev/kord/common/entity/AuditLogEvent { @@ -1486,7 +1442,6 @@ public final class dev/kord/common/entity/AutoModerationActionType$Timeout : dev } public final class dev/kord/common/entity/AutoModerationActionType$Unknown : dev/kord/common/entity/AutoModerationActionType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/AutoModerationRuleEventType { @@ -1509,7 +1464,6 @@ public final class dev/kord/common/entity/AutoModerationRuleEventType$MessageSen } public final class dev/kord/common/entity/AutoModerationRuleEventType$Unknown : dev/kord/common/entity/AutoModerationRuleEventType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/AutoModerationRuleKeywordPresetType { @@ -1540,7 +1494,6 @@ public final class dev/kord/common/entity/AutoModerationRuleKeywordPresetType$Sl } public final class dev/kord/common/entity/AutoModerationRuleKeywordPresetType$Unknown : dev/kord/common/entity/AutoModerationRuleKeywordPresetType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/AutoModerationRuleTriggerType { @@ -1575,7 +1528,6 @@ public final class dev/kord/common/entity/AutoModerationRuleTriggerType$Spam : d } public final class dev/kord/common/entity/AutoModerationRuleTriggerType$Unknown : dev/kord/common/entity/AutoModerationRuleTriggerType { - public synthetic fun (I)V } public abstract interface class dev/kord/common/entity/BaseDiscordApplication { @@ -1681,33 +1633,23 @@ public final class dev/kord/common/entity/ButtonStyle$Success : dev/kord/common/ } public final class dev/kord/common/entity/ButtonStyle$Unknown : dev/kord/common/entity/ButtonStyle { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/ChannelFlag { public static final field Companion Ldev/kord/common/entity/ChannelFlag$Companion; - public static final field Pinned Ldev/kord/common/entity/ChannelFlag; - public static final field RequireTag Ldev/kord/common/entity/ChannelFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/ChannelFlag;)Ldev/kord/common/entity/ChannelFlags; public final fun plus (Ldev/kord/common/entity/ChannelFlags;)Ldev/kord/common/entity/ChannelFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ChannelFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/ChannelFlag; } public final class dev/kord/common/entity/ChannelFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/ChannelFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/ChannelFlag; - public synthetic fun values ()[Ldev/kord/common/entity/ChannelFlag; } public final class dev/kord/common/entity/ChannelFlag$HideMediaDownloadOptions : dev/kord/common/entity/ChannelFlag { @@ -1736,15 +1678,11 @@ public final class dev/kord/common/entity/ChannelFlagKt { public final class dev/kord/common/entity/ChannelFlags { public static final field Companion Ldev/kord/common/entity/ChannelFlags$Companion; - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/ChannelFlag;)Z public final fun contains (Ldev/kord/common/entity/ChannelFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/ChannelFlags; public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/ChannelFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/ChannelFlags;IILjava/lang/Object;)Ldev/kord/common/entity/ChannelFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getFlags ()Ljava/util/List; public final fun getValues ()Ljava/util/Set; public fun hashCode ()I public final fun minus (Ldev/kord/common/entity/ChannelFlag;)Ldev/kord/common/entity/ChannelFlags; @@ -1837,7 +1775,6 @@ public final class dev/kord/common/entity/ChannelType$PublicNewsThread : dev/kor } public final class dev/kord/common/entity/ChannelType$Unknown : dev/kord/common/entity/ChannelType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/Choice { @@ -1849,7 +1786,6 @@ public abstract class dev/kord/common/entity/Choice { public final class dev/kord/common/entity/Choice$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; - public final synthetic fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } public final class dev/kord/common/entity/Choice$IntegerChoice : dev/kord/common/entity/Choice { @@ -2149,7 +2085,6 @@ public final class dev/kord/common/entity/ComponentType$TextInput : dev/kord/com } public final class dev/kord/common/entity/ComponentType$Unknown : dev/kord/common/entity/ComponentType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ComponentType$UserSelect : dev/kord/common/entity/ComponentType { @@ -2180,7 +2115,6 @@ public final class dev/kord/common/entity/DefaultMessageNotificationLevel$OnlyMe } public final class dev/kord/common/entity/DefaultMessageNotificationLevel$Unknown : dev/kord/common/entity/DefaultMessageNotificationLevel { - public synthetic fun (I)V } public final class dev/kord/common/entity/DefaultReaction { @@ -2652,14 +2586,6 @@ public final class dev/kord/common/entity/DiscordApplicationCommand$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/DiscordApplicationKt { - public static final synthetic fun ApplicationFlags (Ljava/lang/Iterable;)Ldev/kord/common/entity/ApplicationFlags; - public static final synthetic fun ApplicationFlags (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/ApplicationFlags; - public static final synthetic fun ApplicationFlags ([Ldev/kord/common/entity/ApplicationFlag;)Ldev/kord/common/entity/ApplicationFlags; - public static final synthetic fun ApplicationFlags ([Ldev/kord/common/entity/ApplicationFlags;)Ldev/kord/common/entity/ApplicationFlags; - public static final synthetic fun ApplicationFlagsWithIterable (Ljava/lang/Iterable;)Ldev/kord/common/entity/ApplicationFlags; -} - public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetadata { public static final field Companion Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadata$Companion; public fun (Ldev/kord/common/entity/ApplicationRoleConnectionMetadataType;Ljava/lang/String;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;)V @@ -2897,7 +2823,6 @@ public final class dev/kord/common/entity/DiscordAutoComplete$$serializer : kotl public final class dev/kord/common/entity/DiscordAutoComplete$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; - public final synthetic fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } public final class dev/kord/common/entity/DiscordAutoModerationAction { @@ -3179,14 +3104,6 @@ public final class dev/kord/common/entity/DiscordChannel$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/DiscordChannelKt { - public static final synthetic fun ChannelFlags (Ljava/lang/Iterable;)Ldev/kord/common/entity/ChannelFlags; - public static final synthetic fun ChannelFlags (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/ChannelFlags; - public static final synthetic fun ChannelFlags ([Ldev/kord/common/entity/ChannelFlag;)Ldev/kord/common/entity/ChannelFlags; - public static final synthetic fun ChannelFlags ([Ldev/kord/common/entity/ChannelFlags;)Ldev/kord/common/entity/ChannelFlags; - public static final synthetic fun ChannelFlags0 (Ljava/lang/Iterable;)Ldev/kord/common/entity/ChannelFlags; -} - public final class dev/kord/common/entity/DiscordChatComponent : dev/kord/common/entity/DiscordComponent { public static final field Companion Ldev/kord/common/entity/DiscordChatComponent$Companion; public fun (Ldev/kord/common/entity/ComponentType;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/OptionalBoolean;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/OptionalInt;Ldev/kord/common/entity/optional/OptionalInt;Ldev/kord/common/entity/optional/OptionalInt;Ldev/kord/common/entity/optional/OptionalInt;Ldev/kord/common/entity/optional/OptionalBoolean;Ldev/kord/common/entity/optional/Optional;Ldev/kord/common/entity/optional/Optional;)V @@ -3375,7 +3292,6 @@ public final class dev/kord/common/entity/DiscordConnectionVisibility$None : dev } public final class dev/kord/common/entity/DiscordConnectionVisibility$Unknown : dev/kord/common/entity/DiscordConnectionVisibility { - public synthetic fun (I)V } public final class dev/kord/common/entity/DiscordDeletedGuildRole { @@ -4749,14 +4665,6 @@ public final class dev/kord/common/entity/DiscordMessageInteraction$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/DiscordMessageKt { - public static final synthetic fun MessageFlags (Ljava/lang/Iterable;)Ldev/kord/common/entity/MessageFlags; - public static final synthetic fun MessageFlags (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/MessageFlags; - public static final synthetic fun MessageFlags ([Ldev/kord/common/entity/MessageFlag;)Ldev/kord/common/entity/MessageFlags; - public static final synthetic fun MessageFlags ([Ldev/kord/common/entity/MessageFlags;)Ldev/kord/common/entity/MessageFlags; - public static final synthetic fun MessageFlagsWithIterable (Ljava/lang/Iterable;)Ldev/kord/common/entity/MessageFlags; -} - public final class dev/kord/common/entity/DiscordMessageReference { public static final field Companion Ldev/kord/common/entity/DiscordMessageReference$Companion; public fun ()V @@ -5636,12 +5544,7 @@ public final class dev/kord/common/entity/DiscordShard { public fun toString ()Ljava/lang/String; } -public final class dev/kord/common/entity/DiscordShard$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/common/entity/DiscordShard; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/common/entity/DiscordShard;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class dev/kord/common/entity/DiscordShard$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -6209,10 +6112,6 @@ public final class dev/kord/common/entity/DiscordUser$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/DiscordUserKt { - public static final synthetic fun UserFlags (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/UserFlags; -} - public final class dev/kord/common/entity/DiscordVoiceRegion { public static final field Companion Ldev/kord/common/entity/DiscordVoiceRegion$Companion; public fun (Ljava/lang/String;Ljava/lang/String;ZZZ)V @@ -6502,7 +6401,6 @@ public final class dev/kord/common/entity/EmbedType$Rich : dev/kord/common/entit } public final class dev/kord/common/entity/EmbedType$Unknown : dev/kord/common/entity/EmbedType { - public synthetic fun (Ljava/lang/String;)V } public final class dev/kord/common/entity/EmbedType$Video : dev/kord/common/entity/EmbedType { @@ -6537,7 +6435,6 @@ public final class dev/kord/common/entity/ExplicitContentFilter$MembersWithoutRo } public final class dev/kord/common/entity/ExplicitContentFilter$Unknown : dev/kord/common/entity/ExplicitContentFilter { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/ForumLayoutType { @@ -6568,7 +6465,6 @@ public final class dev/kord/common/entity/ForumLayoutType$NotSet : dev/kord/comm } public final class dev/kord/common/entity/ForumLayoutType$Unknown : dev/kord/common/entity/ForumLayoutType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ForumTag { @@ -6714,7 +6610,6 @@ public final class dev/kord/common/entity/GuildFeature$TicketedEventsEnabled : d } public final class dev/kord/common/entity/GuildFeature$Unknown : dev/kord/common/entity/GuildFeature { - public synthetic fun (Ljava/lang/String;)V } public final class dev/kord/common/entity/GuildFeature$VIPRegions : dev/kord/common/entity/GuildFeature { @@ -6734,24 +6629,15 @@ public final class dev/kord/common/entity/GuildFeature$WelcomeScreenEnabled : de } public abstract class dev/kord/common/entity/GuildMemberFlag { - public static final field BypassesVerification Ldev/kord/common/entity/GuildMemberFlag; public static final field Companion Ldev/kord/common/entity/GuildMemberFlag$Companion; - public static final field CompletedOnboarding Ldev/kord/common/entity/GuildMemberFlag; - public static final field DidRejoin Ldev/kord/common/entity/GuildMemberFlag; - public static final field StartedOnboarding Ldev/kord/common/entity/GuildMemberFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/GuildMemberFlag;)Ldev/kord/common/entity/GuildMemberFlags; public final fun plus (Ldev/kord/common/entity/GuildMemberFlags;)Ldev/kord/common/entity/GuildMemberFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/GuildMemberFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/GuildMemberFlag; } public final class dev/kord/common/entity/GuildMemberFlag$BypassesVerification : dev/kord/common/entity/GuildMemberFlag { @@ -6761,9 +6647,6 @@ public final class dev/kord/common/entity/GuildMemberFlag$BypassesVerification : public final class dev/kord/common/entity/GuildMemberFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/GuildMemberFlag; public final fun getEntries ()Ljava/util/List; - public final synthetic fun serializer ()Lkotlinx/serialization/KSerializer; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/GuildMemberFlag; - public synthetic fun values ()[Ldev/kord/common/entity/GuildMemberFlag; } public final class dev/kord/common/entity/GuildMemberFlag$CompletedOnboarding : dev/kord/common/entity/GuildMemberFlag { @@ -6792,13 +6675,9 @@ public final class dev/kord/common/entity/GuildMemberFlagKt { public final class dev/kord/common/entity/GuildMemberFlags { public static final field Companion Ldev/kord/common/entity/GuildMemberFlags$Companion; - public synthetic fun (I)V - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/GuildMemberFlag;)Z public final fun contains (Ldev/kord/common/entity/GuildMemberFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/GuildMemberFlags; public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/GuildMemberFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/GuildMemberFlags;IILjava/lang/Object;)Ldev/kord/common/entity/GuildMemberFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I public final fun getValues ()Ljava/util/Set; @@ -6874,7 +6753,6 @@ public final class dev/kord/common/entity/GuildScheduledEventPrivacyLevel$GuildO } public final class dev/kord/common/entity/GuildScheduledEventPrivacyLevel$Unknown : dev/kord/common/entity/GuildScheduledEventPrivacyLevel { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/GuildScheduledEventStatus { @@ -6909,7 +6787,6 @@ public final class dev/kord/common/entity/GuildScheduledEventStatus$Scheduled : } public final class dev/kord/common/entity/GuildScheduledEventStatus$Unknown : dev/kord/common/entity/GuildScheduledEventStatus { - public synthetic fun (I)V } public final class dev/kord/common/entity/InstallParams { @@ -7001,7 +6878,6 @@ public final class dev/kord/common/entity/IntegrationExpireBehavior$RemoveRole : } public final class dev/kord/common/entity/IntegrationExpireBehavior$Unknown : dev/kord/common/entity/IntegrationExpireBehavior { - public synthetic fun (I)V } public final class dev/kord/common/entity/InteractionCallbackData { @@ -7093,7 +6969,6 @@ public final class dev/kord/common/entity/InteractionResponseType$Pong : dev/kor } public final class dev/kord/common/entity/InteractionResponseType$Unknown : dev/kord/common/entity/InteractionResponseType { - public synthetic fun (I)V } public final class dev/kord/common/entity/InteractionResponseType$UpdateMessage : dev/kord/common/entity/InteractionResponseType { @@ -7136,7 +7011,6 @@ public final class dev/kord/common/entity/InteractionType$Ping : dev/kord/common } public final class dev/kord/common/entity/InteractionType$Unknown : dev/kord/common/entity/InteractionType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/InviteTargetType { @@ -7163,7 +7037,6 @@ public final class dev/kord/common/entity/InviteTargetType$Stream : dev/kord/com } public final class dev/kord/common/entity/InviteTargetType$Unknown : dev/kord/common/entity/InviteTargetType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/MFALevel { @@ -7190,7 +7063,6 @@ public final class dev/kord/common/entity/MFALevel$None : dev/kord/common/entity } public final class dev/kord/common/entity/MFALevel$Unknown : dev/kord/common/entity/MFALevel { - public synthetic fun (I)V } public final class dev/kord/common/entity/MessageActivity { @@ -7255,7 +7127,6 @@ public final class dev/kord/common/entity/MessageActivityType$Spectate : dev/kor } public final class dev/kord/common/entity/MessageActivityType$Unknown : dev/kord/common/entity/MessageActivityType { - public synthetic fun (I)V } public final class dev/kord/common/entity/MessageApplication { @@ -7296,37 +7167,19 @@ public final class dev/kord/common/entity/MessageApplication$Companion { public abstract class dev/kord/common/entity/MessageFlag { public static final field Companion Ldev/kord/common/entity/MessageFlag$Companion; - public static final field CrossPosted Ldev/kord/common/entity/MessageFlag; - public static final field Ephemeral Ldev/kord/common/entity/MessageFlag; - public static final field FailedToMentionSomeRolesInThread Ldev/kord/common/entity/MessageFlag; - public static final field HasThread Ldev/kord/common/entity/MessageFlag; - public static final field IsCrossPost Ldev/kord/common/entity/MessageFlag; - public static final field IsVoiceMessage Ldev/kord/common/entity/MessageFlag; - public static final field Loading Ldev/kord/common/entity/MessageFlag; - public static final field SourceMessageDeleted Ldev/kord/common/entity/MessageFlag; - public static final field SuppressEmbeds Ldev/kord/common/entity/MessageFlag; - public static final field SuppressNotifications Ldev/kord/common/entity/MessageFlag; - public static final field Urgent Ldev/kord/common/entity/MessageFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/MessageFlag;)Ldev/kord/common/entity/MessageFlags; public final fun plus (Ldev/kord/common/entity/MessageFlags;)Ldev/kord/common/entity/MessageFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/MessageFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/MessageFlag; } public final class dev/kord/common/entity/MessageFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/MessageFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/MessageFlag; - public synthetic fun values ()[Ldev/kord/common/entity/MessageFlag; } public final class dev/kord/common/entity/MessageFlag$CrossPosted : dev/kord/common/entity/MessageFlag { @@ -7387,15 +7240,11 @@ public final class dev/kord/common/entity/MessageFlagKt { public final class dev/kord/common/entity/MessageFlags { public static final field Companion Ldev/kord/common/entity/MessageFlags$Companion; - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/MessageFlag;)Z public final fun contains (Ldev/kord/common/entity/MessageFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/MessageFlags; public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/MessageFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/MessageFlags;IILjava/lang/Object;)Ldev/kord/common/entity/MessageFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getFlags ()Ljava/util/List; public final fun getValues ()Ljava/util/Set; public fun hashCode ()I public final fun minus (Ldev/kord/common/entity/MessageFlag;)Ldev/kord/common/entity/MessageFlags; @@ -7410,7 +7259,6 @@ public final class dev/kord/common/entity/MessageFlags$Builder { public fun (I)V public synthetic fun (IILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Ldev/kord/common/entity/MessageFlags; - public final synthetic fun flags ()Ldev/kord/common/entity/MessageFlags; public final fun unaryMinus (Ldev/kord/common/entity/MessageFlag;)V public final fun unaryMinus (Ldev/kord/common/entity/MessageFlags;)V public final fun unaryPlus (Ldev/kord/common/entity/MessageFlag;)V @@ -7529,7 +7377,6 @@ public final class dev/kord/common/entity/MessageStickerType$PNG : dev/kord/comm } public final class dev/kord/common/entity/MessageStickerType$Unknown : dev/kord/common/entity/MessageStickerType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/MessageType { @@ -7668,22 +7515,12 @@ public final class dev/kord/common/entity/MessageType$ThreadStarterMessage : dev } public final class dev/kord/common/entity/MessageType$Unknown : dev/kord/common/entity/MessageType { - public synthetic fun (I)V } public final class dev/kord/common/entity/MessageType$UserJoin : dev/kord/common/entity/MessageType { public static final field INSTANCE Ldev/kord/common/entity/MessageType$UserJoin; } -public final class dev/kord/common/entity/NotSerializable : kotlinx/serialization/KSerializer { - public static final field INSTANCE Ldev/kord/common/entity/NotSerializable; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Void; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)Ljava/lang/Void; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V -} - public abstract class dev/kord/common/entity/NsfwLevel { public static final field Companion Ldev/kord/common/entity/NsfwLevel$Companion; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -7716,7 +7553,6 @@ public final class dev/kord/common/entity/NsfwLevel$Safe : dev/kord/common/entit } public final class dev/kord/common/entity/NsfwLevel$Unknown : dev/kord/common/entity/NsfwLevel { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/OnboardingMode { @@ -7769,7 +7605,6 @@ public final class dev/kord/common/entity/OnboardingPromptType$MultipleChoice : } public final class dev/kord/common/entity/OnboardingPromptType$Unknown : dev/kord/common/entity/OnboardingPromptType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/Option { @@ -7839,13 +7674,11 @@ public final class dev/kord/common/entity/OverwriteType$Role : dev/kord/common/e } public final class dev/kord/common/entity/OverwriteType$Unknown : dev/kord/common/entity/OverwriteType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/Permission { public static final field Companion Ldev/kord/common/entity/Permission$Companion; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/kord/common/DiscordBitSet;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()Ldev/kord/common/DiscordBitSet; public final fun getShift ()I @@ -7863,10 +7696,6 @@ public final class dev/kord/common/entity/Permission$Administrator : dev/kord/co public static final field INSTANCE Ldev/kord/common/entity/Permission$Administrator; } -public final class dev/kord/common/entity/Permission$All : dev/kord/common/entity/Permission { - public static final field INSTANCE Ldev/kord/common/entity/Permission$All; -} - public final class dev/kord/common/entity/Permission$AttachFiles : dev/kord/common/entity/Permission { public static final field INSTANCE Ldev/kord/common/entity/Permission$AttachFiles; } @@ -7882,7 +7711,6 @@ public final class dev/kord/common/entity/Permission$ChangeNickname : dev/kord/c public final class dev/kord/common/entity/Permission$Companion { public final fun fromShift (I)Ldev/kord/common/entity/Permission; public final fun getEntries ()Ljava/util/List; - public final synthetic fun getValues ()Ljava/util/Set; } public final class dev/kord/common/entity/Permission$Connect : dev/kord/common/entity/Permission { @@ -8010,8 +7838,6 @@ public final class dev/kord/common/entity/Permission$Stream : dev/kord/common/en } public final class dev/kord/common/entity/Permission$Unknown : dev/kord/common/entity/Permission { - public synthetic fun (Ldev/kord/common/DiscordBitSet;)V - public synthetic fun ([J)V } public final class dev/kord/common/entity/Permission$UseApplicationCommands : dev/kord/common/entity/Permission { @@ -8059,29 +7885,23 @@ public final class dev/kord/common/entity/Permission$ViewGuildInsights : dev/kor } public final class dev/kord/common/entity/PermissionKt { - public static final synthetic fun PermissionWithIterable (Ljava/lang/Iterable;)Ldev/kord/common/entity/Permissions; public static final fun Permissions (Ljava/lang/Iterable;)Ldev/kord/common/entity/Permissions; - public static final synthetic fun Permissions (Ljava/lang/String;)Ldev/kord/common/entity/Permissions; - public static final synthetic fun Permissions (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; + public static final fun Permissions (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; public static final fun Permissions ([Ldev/kord/common/entity/Permission;)Ldev/kord/common/entity/Permissions; public static final fun Permissions ([Ldev/kord/common/entity/Permissions;)Ldev/kord/common/entity/Permissions; public static synthetic fun Permissions$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/kord/common/entity/Permissions; public static final fun Permissions0 (Ljava/lang/Iterable;)Ldev/kord/common/entity/Permissions; - public static final fun Permissions0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; + public static final synthetic fun Permissions0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; public static synthetic fun Permissions0$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/kord/common/entity/Permissions; } public final class dev/kord/common/entity/Permissions { public static final field Companion Ldev/kord/common/entity/Permissions$Companion; public static final field NewCompanion Ldev/kord/common/entity/Permissions$NewCompanion; - public synthetic fun (Ldev/kord/common/DiscordBitSet;)V - public final synthetic fun component1 ()Ldev/kord/common/DiscordBitSet; public final fun contains (Ldev/kord/common/entity/Permission;)Z public final fun contains (Ldev/kord/common/entity/Permissions;)Z - public final synthetic fun copy (Ldev/kord/common/DiscordBitSet;)Ldev/kord/common/entity/Permissions; - public final synthetic fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; - public static synthetic fun copy$default (Ldev/kord/common/entity/Permissions;Ldev/kord/common/DiscordBitSet;ILjava/lang/Object;)Ldev/kord/common/entity/Permissions; - public final fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; + public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; + public final synthetic fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/Permissions; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()Ldev/kord/common/DiscordBitSet; public final fun getValues ()Ljava/util/Set; @@ -8104,12 +7924,7 @@ public final class dev/kord/common/entity/Permissions$Builder { public final fun unaryPlus (Ldev/kord/common/entity/Permissions;)V } -public final class dev/kord/common/entity/Permissions$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/common/entity/Permissions; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/common/entity/Permissions;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class dev/kord/common/entity/Permissions$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -8117,16 +7932,8 @@ public final class dev/kord/common/entity/Permissions$NewCompanion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/Permissions$PermissionsBuilder { - public fun (Ldev/kord/common/DiscordBitSet;)V - public final fun permissions ()Ldev/kord/common/entity/Permissions; - public final fun unaryMinus (Ldev/kord/common/entity/Permission;)V - public final fun unaryMinus (Ldev/kord/common/entity/Permissions;)V - public final fun unaryPlus (Ldev/kord/common/entity/Permission;)V - public final fun unaryPlus (Ldev/kord/common/entity/Permissions;)V -} - public final class dev/kord/common/entity/PermissionsKt { + public static final fun getALL (Ldev/kord/common/entity/Permissions$Companion;)Ldev/kord/common/entity/Permissions; public static final fun getALL (Ldev/kord/common/entity/Permissions$NewCompanion;)Ldev/kord/common/entity/Permissions; } @@ -8162,7 +7969,6 @@ public final class dev/kord/common/entity/PremiumTier$Two : dev/kord/common/enti } public final class dev/kord/common/entity/PremiumTier$Unknown : dev/kord/common/entity/PremiumTier { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/PresenceStatus { @@ -8201,7 +8007,6 @@ public final class dev/kord/common/entity/PresenceStatus$Online : dev/kord/commo } public final class dev/kord/common/entity/PresenceStatus$Unknown : dev/kord/common/entity/PresenceStatus { - public synthetic fun (Ljava/lang/String;)V } public final class dev/kord/common/entity/Reaction { @@ -8395,7 +8200,6 @@ public final class dev/kord/common/entity/ScheduledEntityType$StageInstance : de } public final class dev/kord/common/entity/ScheduledEntityType$Unknown : dev/kord/common/entity/ScheduledEntityType { - public synthetic fun (I)V } public final class dev/kord/common/entity/ScheduledEntityType$Voice : dev/kord/common/entity/ScheduledEntityType { @@ -8492,7 +8296,6 @@ public final class dev/kord/common/entity/SortOrderType$LatestActivity : dev/kor } public final class dev/kord/common/entity/SortOrderType$Unknown : dev/kord/common/entity/SortOrderType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/StageInstancePrivacyLevel { @@ -8519,7 +8322,6 @@ public final class dev/kord/common/entity/StageInstancePrivacyLevel$Public : dev } public final class dev/kord/common/entity/StageInstancePrivacyLevel$Unknown : dev/kord/common/entity/StageInstancePrivacyLevel { - public synthetic fun (I)V } public final class dev/kord/common/entity/SubCommand : dev/kord/common/entity/Option { @@ -8555,32 +8357,19 @@ public final class dev/kord/common/entity/SubCommand$Companion { public abstract class dev/kord/common/entity/SystemChannelFlag { public static final field Companion Ldev/kord/common/entity/SystemChannelFlag$Companion; - public static final field SuppressGuildReminderNotifications Ldev/kord/common/entity/SystemChannelFlag; - public static final field SuppressJoinNotificationReplies Ldev/kord/common/entity/SystemChannelFlag; - public static final field SuppressJoinNotifications Ldev/kord/common/entity/SystemChannelFlag; - public static final field SuppressPremiumSubscriptions Ldev/kord/common/entity/SystemChannelFlag; - public static final field SuppressRoleSubscriptionPurchaseNotificationReplies Ldev/kord/common/entity/SystemChannelFlag; - public static final field SuppressRoleSubscriptionPurchaseNotifications Ldev/kord/common/entity/SystemChannelFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/SystemChannelFlag;)Ldev/kord/common/entity/SystemChannelFlags; public final fun plus (Ldev/kord/common/entity/SystemChannelFlags;)Ldev/kord/common/entity/SystemChannelFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/SystemChannelFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/SystemChannelFlag; } public final class dev/kord/common/entity/SystemChannelFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/SystemChannelFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/SystemChannelFlag; - public synthetic fun values ()[Ldev/kord/common/entity/SystemChannelFlag; } public final class dev/kord/common/entity/SystemChannelFlag$SuppressGuildReminderNotifications : dev/kord/common/entity/SystemChannelFlag { @@ -8622,13 +8411,9 @@ public final class dev/kord/common/entity/SystemChannelFlagKt { public final class dev/kord/common/entity/SystemChannelFlags { public static final field Companion Ldev/kord/common/entity/SystemChannelFlags$Companion; public static final field NewCompanion Ldev/kord/common/entity/SystemChannelFlags$NewCompanion; - public synthetic fun (I)V - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/SystemChannelFlag;)Z public final fun contains (Ldev/kord/common/entity/SystemChannelFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/SystemChannelFlags; public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/SystemChannelFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/SystemChannelFlags;IILjava/lang/Object;)Ldev/kord/common/entity/SystemChannelFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I public final fun getValues ()Ljava/util/Set; @@ -8651,12 +8436,7 @@ public final class dev/kord/common/entity/SystemChannelFlags$Builder { public final fun unaryPlus (Ldev/kord/common/entity/SystemChannelFlags;)V } -public final class dev/kord/common/entity/SystemChannelFlags$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/common/entity/SystemChannelFlags; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/common/entity/SystemChannelFlags;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class dev/kord/common/entity/SystemChannelFlags$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -8718,7 +8498,6 @@ public final class dev/kord/common/entity/TeamMembershipState$Invited : dev/kord } public final class dev/kord/common/entity/TeamMembershipState$Unknown : dev/kord/common/entity/TeamMembershipState { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/TextInputStyle { @@ -8745,40 +8524,18 @@ public final class dev/kord/common/entity/TextInputStyle$Short : dev/kord/common } public final class dev/kord/common/entity/TextInputStyle$Unknown : dev/kord/common/entity/TextInputStyle { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/UserFlag { - public static final field ActiveDeveloper Ldev/kord/common/entity/UserFlag; - public static final field BotHttpInteractions Ldev/kord/common/entity/UserFlag; - public static final field BugHunterLevel1 Ldev/kord/common/entity/UserFlag; - public static final field BugHunterLevel2 Ldev/kord/common/entity/UserFlag; public static final field Companion Ldev/kord/common/entity/UserFlag$Companion; - public static final field DiscordCertifiedModerator Ldev/kord/common/entity/UserFlag; - public static final field DiscordEmployee Ldev/kord/common/entity/UserFlag; - public static final field DiscordPartner Ldev/kord/common/entity/UserFlag; - public static final field EarlySupporter Ldev/kord/common/entity/UserFlag; - public static final field HouseBalance Ldev/kord/common/entity/UserFlag; - public static final field HouseBravery Ldev/kord/common/entity/UserFlag; - public static final field HouseBrilliance Ldev/kord/common/entity/UserFlag; - public static final field HypeSquad Ldev/kord/common/entity/UserFlag; - public static final field System Ldev/kord/common/entity/UserFlag; - public static final field TeamUser Ldev/kord/common/entity/UserFlag; - public static final field VerifiedBot Ldev/kord/common/entity/UserFlag; - public static final field VerifiedBotDeveloper Ldev/kord/common/entity/UserFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/common/entity/UserFlag;)Ldev/kord/common/entity/UserFlags; public final fun plus (Ldev/kord/common/entity/UserFlags;)Ldev/kord/common/entity/UserFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/UserFlag; - public static synthetic fun values ()[Ldev/kord/common/entity/UserFlag; } public final class dev/kord/common/entity/UserFlag$ActiveDeveloper : dev/kord/common/entity/UserFlag { @@ -8800,8 +8557,6 @@ public final class dev/kord/common/entity/UserFlag$BugHunterLevel2 : dev/kord/co public final class dev/kord/common/entity/UserFlag$Companion { public final fun fromShift (I)Ldev/kord/common/entity/UserFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/common/entity/UserFlag; - public synthetic fun values ()[Ldev/kord/common/entity/UserFlag; } public final class dev/kord/common/entity/UserFlag$DiscordCertifiedModerator : dev/kord/common/entity/UserFlag { @@ -8836,10 +8591,6 @@ public final class dev/kord/common/entity/UserFlag$HypeSquad : dev/kord/common/e public static final field INSTANCE Ldev/kord/common/entity/UserFlag$HypeSquad; } -public final class dev/kord/common/entity/UserFlag$System : dev/kord/common/entity/UserFlag { - public static final field INSTANCE Ldev/kord/common/entity/UserFlag$System; -} - public final class dev/kord/common/entity/UserFlag$TeamUser : dev/kord/common/entity/UserFlag { public static final field INSTANCE Ldev/kord/common/entity/UserFlag$TeamUser; } @@ -8866,18 +8617,12 @@ public final class dev/kord/common/entity/UserFlagKt { public final class dev/kord/common/entity/UserFlags { public static final field Companion Ldev/kord/common/entity/UserFlags$Companion; - public static final field UserFlagsSerializer Ldev/kord/common/entity/UserFlags$UserFlagsSerializer; - public synthetic fun (I)V - public final synthetic fun component1 ()I public final fun contains (Ldev/kord/common/entity/UserFlag;)Z public final fun contains (Ldev/kord/common/entity/UserFlags;)Z - public final synthetic fun copy (I)Ldev/kord/common/entity/UserFlags; - public final synthetic fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/UserFlags; - public static synthetic fun copy$default (Ldev/kord/common/entity/UserFlags;IILjava/lang/Object;)Ldev/kord/common/entity/UserFlags; - public final fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/UserFlags; + public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/UserFlags; + public final synthetic fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/common/entity/UserFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getFlags ()Ljava/util/List; public final fun getValues ()Ljava/util/Set; public fun hashCode ()I public final fun minus (Ldev/kord/common/entity/UserFlag;)Ldev/kord/common/entity/UserFlags; @@ -8902,24 +8647,6 @@ public final class dev/kord/common/entity/UserFlags$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/common/entity/UserFlags$UserFlagsBuilder { - public fun ()V - public fun (I)V - public synthetic fun (IILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun flags ()Ldev/kord/common/entity/UserFlags; - public final fun unaryMinus (Ldev/kord/common/entity/UserFlag;)V - public final fun unaryPlus (Ldev/kord/common/entity/UserFlag;)V -} - -public final class dev/kord/common/entity/UserFlags$UserFlagsSerializer : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/common/entity/UserFlags; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/common/entity/UserFlags;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - public abstract class dev/kord/common/entity/UserPremium { public static final field Companion Ldev/kord/common/entity/UserPremium$Companion; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -8952,7 +8679,6 @@ public final class dev/kord/common/entity/UserPremium$None : dev/kord/common/ent } public final class dev/kord/common/entity/UserPremium$Unknown : dev/kord/common/entity/UserPremium { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/VerificationLevel { @@ -8987,7 +8713,6 @@ public final class dev/kord/common/entity/VerificationLevel$None : dev/kord/comm } public final class dev/kord/common/entity/VerificationLevel$Unknown : dev/kord/common/entity/VerificationLevel { - public synthetic fun (I)V } public final class dev/kord/common/entity/VerificationLevel$VeryHigh : dev/kord/common/entity/VerificationLevel { @@ -9018,7 +8743,6 @@ public final class dev/kord/common/entity/VideoQualityMode$Full : dev/kord/commo } public final class dev/kord/common/entity/VideoQualityMode$Unknown : dev/kord/common/entity/VideoQualityMode { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/WebhookType { @@ -9049,7 +8773,6 @@ public final class dev/kord/common/entity/WebhookType$Incoming : dev/kord/common } public final class dev/kord/common/entity/WebhookType$Unknown : dev/kord/common/entity/WebhookType { - public synthetic fun (I)V } public abstract class dev/kord/common/entity/optional/Optional { diff --git a/common/src/commonMain/kotlin/entity/ActivityFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityFlag.kt similarity index 67% rename from common/src/commonMain/kotlin/entity/ActivityFlag.kt rename to common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityFlag.kt index 32c2e9f54005..c0f9f229ecaa 100644 --- a/common/src/commonMain/kotlin/entity/ActivityFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityFlag.kt @@ -1,16 +1,13 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -45,60 +42,23 @@ public sealed class ActivityFlag( * [flag]. */ public operator fun plus(flag: ActivityFlag): ActivityFlags = - ActivityFlags(this.value or flag.value, null) + ActivityFlags(this.value or flag.value) /** * Returns an instance of [ActivityFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: ActivityFlags): ActivityFlags = - ActivityFlags(this.value or flags.value, null) + ActivityFlags(this.value or flags.value) final override fun equals(other: Any?): Boolean = this === other || (other is ActivityFlag && this.shift == other.shift) final override fun hashCode(): Int = shift.hashCode() - final override fun toString(): String = if (this is Unknown) - "ActivityFlag.Unknown(shift=$shift)" else "ActivityFlag.${this::class.simpleName}" - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "ActivityFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "ActivityFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun ordinal(): Int = when (this) { - Instance -> 0 - Join -> 1 - Spectate -> 2 - JoinRequest -> 3 - Sync -> 4 - Play -> 5 - PartyPrivacyFriends -> 6 - PartyPrivacyVoiceChannel -> 7 - Embedded -> 8 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - message = "ActivityFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ActivityFlag::class.java", imports = - arrayOf("dev.kord.common.entity.ActivityFlag")), - DeprecationLevel.HIDDEN, - ) - public fun getDeclaringClass(): Class = ActivityFlag::class.java + final override fun toString(): String = + if (this is Unknown) "ActivityFlag.Unknown(shift=$shift)" + else "ActivityFlag.${this::class.simpleName}" /** * An unknown [ActivityFlag]. @@ -146,48 +106,6 @@ public sealed class ActivityFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Instance: ActivityFlag = Instance - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Join: ActivityFlag = Join - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Spectate: ActivityFlag = Spectate - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val JoinRequest: ActivityFlag = JoinRequest - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Sync: ActivityFlag = Sync - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Play: ActivityFlag = Play - /** * Returns an instance of [ActivityFlag] with [ActivityFlag.shift] equal to the specified * [shift]. @@ -206,39 +124,6 @@ public sealed class ActivityFlag( 8 -> Embedded else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "ActivityFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - @JvmStatic - public open fun valueOf(name: String): ActivityFlag = when (name) { - "Instance" -> Instance - "Join" -> Join - "Spectate" -> Spectate - "JoinRequest" -> JoinRequest - "Sync" -> Sync - "Play" -> Play - "PartyPrivacyFriends" -> PartyPrivacyFriends - "PartyPrivacyVoiceChannel" -> PartyPrivacyVoiceChannel - "Embedded" -> Embedded - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - message = "ActivityFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ActivityFlag.entries.toTypedArray()", imports = - arrayOf("dev.kord.common.entity.ActivityFlag")), - DeprecationLevel.HIDDEN, - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -312,18 +197,7 @@ public class ActivityFlags internal constructor( * The raw value used by Discord. */ public val `value`: Int, - @Suppress("UNUSED_PARAMETER") unused: Nothing?, ) { - // TODO uncomment annotation in DiscordActivity.kt and delete this file when this constructor is removed after - // deprecation cycle - @Deprecated( - "Don't construct an instance of 'ActivityFlags' from a raw value. Use the factory functions described in the " + - "documentation instead.", - ReplaceWith("ActivityFlags.Builder(value).build()", "dev.kord.common.entity.ActivityFlags"), - DeprecationLevel.HIDDEN, - ) - public constructor(value: Int) : this(value, null) - /** * A [Set] of all [ActivityFlag]s contained in this instance of [ActivityFlags]. */ @@ -338,17 +212,6 @@ public class ActivityFlags internal constructor( } } - /** - * @suppress - */ - @Deprecated( - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public val flags: Set - get() = values - /** * Checks if this instance of [ActivityFlags] has all bits set that are set in [flag]. */ @@ -366,28 +229,28 @@ public class ActivityFlags internal constructor( * [flag]. */ public operator fun plus(flag: ActivityFlag): ActivityFlags = - ActivityFlags(this.value or flag.value, null) + ActivityFlags(this.value or flag.value) /** * Returns an instance of [ActivityFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: ActivityFlags): ActivityFlags = - ActivityFlags(this.value or flags.value, null) + ActivityFlags(this.value or flags.value) /** * Returns an instance of [ActivityFlags] that has all bits set that are set in `this` except * the bits that are set in [flag]. */ public operator fun minus(flag: ActivityFlag): ActivityFlags = - ActivityFlags(this.value and flag.value.inv(), null) + ActivityFlags(this.value and flag.value.inv()) /** * Returns an instance of [ActivityFlags] that has all bits set that are set in `this` except * the bits that are set in [flags]. */ public operator fun minus(flags: ActivityFlags): ActivityFlags = - ActivityFlags(this.value and flags.value.inv(), null) + ActivityFlags(this.value and flags.value.inv()) /** * Returns a copy of this instance of [ActivityFlags] modified with [builder]. @@ -439,7 +302,7 @@ public class ActivityFlags internal constructor( * Returns an instance of [ActivityFlags] that has all bits set that are currently set in * this [Builder]. */ - public fun build(): ActivityFlags = ActivityFlags(value, null) + public fun build(): ActivityFlags = ActivityFlags(value) } internal object Serializer : KSerializer { @@ -453,7 +316,7 @@ public class ActivityFlags internal constructor( } override fun deserialize(decoder: Decoder): ActivityFlags = - ActivityFlags(decoder.decodeSerializableValue(delegate), null) + ActivityFlags(decoder.decodeSerializableValue(delegate)) } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityType.kt index f00b0b816548..a5ad04b424e0 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityType.kt @@ -39,17 +39,7 @@ public sealed class ActivityType( */ public class Unknown internal constructor( code: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ActivityType(code) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ActivityType.from()'.", - replaceWith = ReplaceWith(expression = "ActivityType.from(code)", imports = - arrayOf("dev.kord.common.entity.ActivityType")), - ) - public constructor(code: Int) : this(code, null) - } + ) : ActivityType(code) public object Game : ActivityType(0) @@ -101,7 +91,7 @@ public sealed class ActivityType( 3 -> Watching 4 -> Custom 5 -> Competing - else -> Unknown(code, null) + else -> Unknown(code) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AllowedMentionType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AllowedMentionType.kt index 371af082a1cf..1a41e7bea0a0 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AllowedMentionType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AllowedMentionType.kt @@ -40,17 +40,7 @@ public sealed class AllowedMentionType( */ public class Unknown internal constructor( `value`: String, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AllowedMentionType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AllowedMentionType.from()'.", - replaceWith = ReplaceWith(expression = "AllowedMentionType.from(value)", imports = - arrayOf("dev.kord.common.entity.AllowedMentionType")), - ) - public constructor(`value`: String) : this(value, null) - } + ) : AllowedMentionType(value) /** * Controls role mentions. @@ -101,7 +91,7 @@ public sealed class AllowedMentionType( "roles" -> RoleMentions "users" -> UserMentions "everyone" -> EveryoneMentions - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandOptionType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandOptionType.kt index fd3ed459436c..36171e54608d 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandOptionType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandOptionType.kt @@ -41,17 +41,7 @@ public sealed class ApplicationCommandOptionType( */ public class Unknown internal constructor( type: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ApplicationCommandOptionType(type) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ApplicationCommandOptionType.from()'.", - replaceWith = ReplaceWith(expression = "ApplicationCommandOptionType.from(type)", - imports = arrayOf("dev.kord.common.entity.ApplicationCommandOptionType")), - ) - public constructor(type: Int) : this(type, null) - } + ) : ApplicationCommandOptionType(type) public object SubCommand : ApplicationCommandOptionType(1) @@ -137,7 +127,7 @@ public sealed class ApplicationCommandOptionType( 9 -> Mentionable 10 -> Number 11 -> Attachment - else -> Unknown(type, null) + else -> Unknown(type) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandPermissionType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandPermissionType.kt index c63936f216f0..9cf7d70fc8e9 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandPermissionType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandPermissionType.kt @@ -41,18 +41,7 @@ public sealed class ApplicationCommandPermissionType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ApplicationCommandPermissionType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ApplicationCommandPermissionType.from()'.", - replaceWith = ReplaceWith(expression = "ApplicationCommandPermissionType.from(value)", - imports = - arrayOf("dev.kord.common.entity.ApplicationCommandPermissionType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ApplicationCommandPermissionType(value) public object Role : ApplicationCommandPermissionType(1) @@ -94,7 +83,7 @@ public sealed class ApplicationCommandPermissionType( 1 -> Role 2 -> User 3 -> Channel - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandType.kt index ce6998eb6e75..71a168e57c9c 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationCommandType.kt @@ -40,17 +40,7 @@ public sealed class ApplicationCommandType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ApplicationCommandType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ApplicationCommandType.from()'.", - replaceWith = ReplaceWith(expression = "ApplicationCommandType.from(value)", imports = - arrayOf("dev.kord.common.entity.ApplicationCommandType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ApplicationCommandType(value) /** * A text-based command that shows up when a user types `/`. @@ -101,7 +91,7 @@ public sealed class ApplicationCommandType( 1 -> ChatInput 2 -> User 3 -> Message - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt index a917b96cb04f..ad8ba22f1d69 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt @@ -4,14 +4,10 @@ package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -64,49 +60,6 @@ public sealed class ApplicationFlag( if (this is Unknown) "ApplicationFlag.Unknown(shift=$shift)" else "ApplicationFlag.${this::class.simpleName}" - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun ordinal(): Int = when (this) { - ApplicationAutoModerationRuleCreateBadge -> 0 - GatewayPresence -> 1 - GatewayPresenceLimited -> 2 - GatewayGuildMembers -> 3 - GatewayGuildMembersLimited -> 4 - VerificationPendingGuildLimit -> 5 - Embedded -> 6 - GatewayMessageContent -> 7 - GatewayMessageContentLimited -> 8 - ApplicationCommandBadge -> 9 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ApplicationFlag::class.java", imports = - arrayOf("dev.kord.common.entity.ApplicationFlag")), - ) - public fun getDeclaringClass(): Class = ApplicationFlag::class.java - /** * An unknown [ApplicationFlag]. * @@ -198,77 +151,6 @@ public sealed class ApplicationFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val ApplicationAutoModerationRuleCreateBadge: ApplicationFlag = - ApplicationAutoModerationRuleCreateBadge - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayPresence: ApplicationFlag = GatewayPresence - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayPresenceLimited: ApplicationFlag = GatewayPresenceLimited - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayGuildMembers: ApplicationFlag = GatewayGuildMembers - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayGuildMembersLimited: ApplicationFlag = GatewayGuildMembersLimited - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val VerificationPendingGuildLimit: ApplicationFlag = VerificationPendingGuildLimit - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Embedded: ApplicationFlag = Embedded - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayMessageContent: ApplicationFlag = GatewayMessageContent - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val GatewayMessageContentLimited: ApplicationFlag = GatewayMessageContentLimited - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val ApplicationCommandBadge: ApplicationFlag = ApplicationCommandBadge - /** * Returns an instance of [ApplicationFlag] with [ApplicationFlag.shift] equal to the * specified [shift]. @@ -288,43 +170,6 @@ public sealed class ApplicationFlag( 23 -> ApplicationCommandBadge else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = - "ApplicationFlag is no longer an enum class. Deprecated without a replacement.", - ) - @JvmStatic - public open fun valueOf(name: String): ApplicationFlag = when (name) { - "ApplicationAutoModerationRuleCreateBadge" -> ApplicationAutoModerationRuleCreateBadge - "GatewayPresence" -> GatewayPresence - "GatewayPresenceLimited" -> GatewayPresenceLimited - "GatewayGuildMembers" -> GatewayGuildMembers - "GatewayGuildMembersLimited" -> GatewayGuildMembersLimited - "VerificationPendingGuildLimit" -> VerificationPendingGuildLimit - "Embedded" -> Embedded - "GatewayMessageContent" -> GatewayMessageContent - "GatewayMessageContentLimited" -> GatewayMessageContentLimited - "ApplicationCommandBadge" -> ApplicationCommandBadge - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ApplicationFlag.entries.toTypedArray()", imports - = arrayOf("dev.kord.common.entity.ApplicationFlag")), - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -413,17 +258,6 @@ public class ApplicationFlags internal constructor( } } - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - ) - public val flags: List - get() = values.toList() - /** * Checks if this instance of [ApplicationFlags] has all bits set that are set in [flag]. */ @@ -479,26 +313,6 @@ public class ApplicationFlags internal constructor( override fun toString(): String = "ApplicationFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ApplicationFlags is no longer a data class. Deprecated without a replacement.", - ) - public fun copy(code: Int = this.code): ApplicationFlags = ApplicationFlags(code) - public class Builder( private var code: Int = 0, ) { @@ -535,16 +349,6 @@ public class ApplicationFlags internal constructor( * this [Builder]. */ public fun build(): ApplicationFlags = ApplicationFlags(code) - - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Renamed to 'build'", - replaceWith = ReplaceWith(expression = "this.build()", imports = arrayOf()), - ) - public fun flags(): ApplicationFlags = build() } internal object Serializer : KSerializer { diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationRoleConnectionMetadataType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationRoleConnectionMetadataType.kt index 9923e72a14e4..46a5c0470609 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationRoleConnectionMetadataType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationRoleConnectionMetadataType.kt @@ -46,18 +46,7 @@ public sealed class ApplicationRoleConnectionMetadataType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ApplicationRoleConnectionMetadataType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ApplicationRoleConnectionMetadataType.from()'.", - replaceWith = ReplaceWith(expression = - "ApplicationRoleConnectionMetadataType.from(value)", imports = - arrayOf("dev.kord.common.entity.ApplicationRoleConnectionMetadataType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ApplicationRoleConnectionMetadataType(value) /** * The metadata value (`integer`) is less than or equal to the guild's configured value @@ -148,7 +137,7 @@ public sealed class ApplicationRoleConnectionMetadataType( 6 -> DateTimeGreaterThanOrEqual 7 -> BooleanEqual 8 -> BooleanNotEqual - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AuditLogEvent.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AuditLogEvent.kt index 7e45d8f479a0..e95ded0bfbb6 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AuditLogEvent.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AuditLogEvent.kt @@ -40,17 +40,7 @@ public sealed class AuditLogEvent( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AuditLogEvent(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AuditLogEvent.from()'.", - replaceWith = ReplaceWith(expression = "AuditLogEvent.from(value)", imports = - arrayOf("dev.kord.common.entity.AuditLogEvent")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : AuditLogEvent(value) /** * Server settings were updated. @@ -470,7 +460,7 @@ public sealed class AuditLogEvent( 145 -> AutoModerationUserCommunicationDisabled 150 -> CreatorMonetizationRequestCreated 151 -> CreatorMonetizationTermsAccepted - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationActionType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationActionType.kt index ec4401798154..df9516bc96a4 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationActionType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationActionType.kt @@ -43,17 +43,7 @@ public sealed class AutoModerationActionType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AutoModerationActionType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AutoModerationActionType.from()'.", - replaceWith = ReplaceWith(expression = "AutoModerationActionType.from(value)", imports = - arrayOf("dev.kord.common.entity.AutoModerationActionType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : AutoModerationActionType(value) /** * Blocks a member's message and prevents it from being posted. @@ -112,7 +102,7 @@ public sealed class AutoModerationActionType( 1 -> BlockMessage 2 -> SendAlertMessage 3 -> Timeout - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleEventType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleEventType.kt index 76ddd2c278f2..5a72badaa942 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleEventType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleEventType.kt @@ -43,17 +43,7 @@ public sealed class AutoModerationRuleEventType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AutoModerationRuleEventType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AutoModerationRuleEventType.from()'.", - replaceWith = ReplaceWith(expression = "AutoModerationRuleEventType.from(value)", - imports = arrayOf("dev.kord.common.entity.AutoModerationRuleEventType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : AutoModerationRuleEventType(value) /** * When a member sends or edits a message in the guild. @@ -90,7 +80,7 @@ public sealed class AutoModerationRuleEventType( */ public fun from(`value`: Int): AutoModerationRuleEventType = when (value) { 1 -> MessageSend - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleKeywordPresetType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleKeywordPresetType.kt index 392c2df7cb83..a31fa36f1d59 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleKeywordPresetType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleKeywordPresetType.kt @@ -43,18 +43,7 @@ public sealed class AutoModerationRuleKeywordPresetType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AutoModerationRuleKeywordPresetType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AutoModerationRuleKeywordPresetType.from()'.", - replaceWith = ReplaceWith(expression = - "AutoModerationRuleKeywordPresetType.from(value)", imports = - arrayOf("dev.kord.common.entity.AutoModerationRuleKeywordPresetType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : AutoModerationRuleKeywordPresetType(value) /** * Words that may be considered forms of swearing or cursing. @@ -105,7 +94,7 @@ public sealed class AutoModerationRuleKeywordPresetType( 1 -> Profanity 2 -> SexualContent 3 -> Slurs - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleTriggerType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleTriggerType.kt index 0ce0d87f077c..d36000bec495 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleTriggerType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AutoModerationRuleTriggerType.kt @@ -43,17 +43,7 @@ public sealed class AutoModerationRuleTriggerType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : AutoModerationRuleTriggerType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'AutoModerationRuleTriggerType.from()'.", - replaceWith = ReplaceWith(expression = "AutoModerationRuleTriggerType.from(value)", - imports = arrayOf("dev.kord.common.entity.AutoModerationRuleTriggerType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : AutoModerationRuleTriggerType(value) /** * Check if content contains words from a user defined list of keywords. @@ -111,7 +101,7 @@ public sealed class AutoModerationRuleTriggerType( 3 -> Spam 4 -> KeywordPreset 5 -> MentionSpam - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ButtonStyle.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ButtonStyle.kt index deabd26d6a89..634e443fc832 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ButtonStyle.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ButtonStyle.kt @@ -41,17 +41,7 @@ public sealed class ButtonStyle( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ButtonStyle(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ButtonStyle.from()'.", - replaceWith = ReplaceWith(expression = "ButtonStyle.from(value)", imports = - arrayOf("dev.kord.common.entity.ButtonStyle")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ButtonStyle(value) /** * Blurple. @@ -114,7 +104,7 @@ public sealed class ButtonStyle( 3 -> Success 4 -> Danger 5 -> Link - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt index 2cd5df1e4a89..c5ffedbf25a0 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt @@ -4,14 +4,10 @@ package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -62,42 +58,6 @@ public sealed class ChannelFlag( final override fun toString(): String = if (this is Unknown) "ChannelFlag.Unknown(shift=$shift)" else "ChannelFlag.${this::class.simpleName}" - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun ordinal(): Int = when (this) { - Pinned -> 0 - RequireTag -> 1 - HideMediaDownloadOptions -> 2 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ChannelFlag::class.java", imports = - arrayOf("dev.kord.common.entity.ChannelFlag")), - ) - public fun getDeclaringClass(): Class = ChannelFlag::class.java - /** * An unknown [ChannelFlag]. * @@ -138,20 +98,6 @@ public sealed class ChannelFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Pinned: ChannelFlag = Pinned - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val RequireTag: ChannelFlag = RequireTag - /** * Returns an instance of [ChannelFlag] with [ChannelFlag.shift] equal to the specified * [shift]. @@ -164,35 +110,6 @@ public sealed class ChannelFlag( 15 -> HideMediaDownloadOptions else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlag is no longer an enum class. Deprecated without a replacement.", - ) - @JvmStatic - public open fun valueOf(name: String): ChannelFlag = when (name) { - "Pinned" -> Pinned - "RequireTag" -> RequireTag - "HideMediaDownloadOptions" -> HideMediaDownloadOptions - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "ChannelFlag.entries.toTypedArray()", imports = - arrayOf("dev.kord.common.entity.ChannelFlag")), - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -280,17 +197,6 @@ public class ChannelFlags internal constructor( } } - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - ) - public val flags: List - get() = values.toList() - /** * Checks if this instance of [ChannelFlags] has all bits set that are set in [flag]. */ @@ -344,26 +250,6 @@ public class ChannelFlags internal constructor( override fun toString(): String = "ChannelFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "ChannelFlags is no longer a data class. Deprecated without a replacement.", - ) - public fun copy(code: Int = this.code): ChannelFlags = ChannelFlags(code) - public class Builder( private var code: Int = 0, ) { diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelType.kt index 100a50643958..6b4579753b58 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelType.kt @@ -39,17 +39,7 @@ public sealed class ChannelType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ChannelType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ChannelType.from()'.", - replaceWith = ReplaceWith(expression = "ChannelType.from(value)", imports = - arrayOf("dev.kord.common.entity.ChannelType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ChannelType(value) /** * A text channel within a server. @@ -175,7 +165,7 @@ public sealed class ChannelType( 14 -> GuildDirectory 15 -> GuildForum 16 -> GuildMedia - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ComponentType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ComponentType.kt index ae4ade5a37f6..c3c38d3ec9a9 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ComponentType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ComponentType.kt @@ -40,17 +40,7 @@ public sealed class ComponentType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ComponentType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ComponentType.from()'.", - replaceWith = ReplaceWith(expression = "ComponentType.from(value)", imports = - arrayOf("dev.kord.common.entity.ComponentType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ComponentType(value) /** * A container for other components. @@ -134,7 +124,7 @@ public sealed class ComponentType( 6 -> RoleSelect 7 -> MentionableSelect 8 -> ChannelSelect - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DefaultMessageNotificationLevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DefaultMessageNotificationLevel.kt index c291b59a0aac..33a099175f27 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DefaultMessageNotificationLevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DefaultMessageNotificationLevel.kt @@ -41,18 +41,7 @@ public sealed class DefaultMessageNotificationLevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : DefaultMessageNotificationLevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'DefaultMessageNotificationLevel.from()'.", - replaceWith = ReplaceWith(expression = "DefaultMessageNotificationLevel.from(value)", - imports = - arrayOf("dev.kord.common.entity.DefaultMessageNotificationLevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : DefaultMessageNotificationLevel(value) /** * Members will receive notifications for all messages by default. @@ -96,7 +85,7 @@ public sealed class DefaultMessageNotificationLevel( public fun from(`value`: Int): DefaultMessageNotificationLevel = when (value) { 0 -> AllMessages 1 -> OnlyMentions - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordConnectionVisibility.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordConnectionVisibility.kt index 0cfbae053da8..46cccd113dc2 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordConnectionVisibility.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordConnectionVisibility.kt @@ -41,17 +41,7 @@ public sealed class DiscordConnectionVisibility( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : DiscordConnectionVisibility(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'DiscordConnectionVisibility.from()'.", - replaceWith = ReplaceWith(expression = "DiscordConnectionVisibility.from(value)", - imports = arrayOf("dev.kord.common.entity.DiscordConnectionVisibility")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : DiscordConnectionVisibility(value) /** * Invisible to everyone except the user themselves. @@ -95,7 +85,7 @@ public sealed class DiscordConnectionVisibility( public fun from(`value`: Int): DiscordConnectionVisibility = when (value) { 0 -> None 1 -> Everyone - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt index 45ee311f3e0f..5020a29a5e94 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt @@ -39,17 +39,7 @@ public sealed class EmbedType( */ public class Unknown internal constructor( `value`: String, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : EmbedType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'EmbedType.from()'.", - replaceWith = ReplaceWith(expression = "EmbedType.from(value)", imports = - arrayOf("dev.kord.common.entity.EmbedType")), - ) - public constructor(`value`: String) : this(value, null) - } + ) : EmbedType(value) /** * Generic embed rendered from embed attributes. @@ -118,7 +108,7 @@ public sealed class EmbedType( "gifv" -> Gifv "article" -> Article "link" -> Link - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ExplicitContentFilter.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ExplicitContentFilter.kt index 1dbeb09a76c6..08a290aa80ec 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ExplicitContentFilter.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ExplicitContentFilter.kt @@ -40,17 +40,7 @@ public sealed class ExplicitContentFilter( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ExplicitContentFilter(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ExplicitContentFilter.from()'.", - replaceWith = ReplaceWith(expression = "ExplicitContentFilter.from(value)", imports = - arrayOf("dev.kord.common.entity.ExplicitContentFilter")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ExplicitContentFilter(value) /** * Media content will not be scanned. @@ -101,7 +91,7 @@ public sealed class ExplicitContentFilter( 0 -> Disabled 1 -> MembersWithoutRoles 2 -> AllMembers - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ForumLayoutType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ForumLayoutType.kt index 13cc638b7e93..5e9f8ffe5371 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ForumLayoutType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ForumLayoutType.kt @@ -40,17 +40,7 @@ public sealed class ForumLayoutType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ForumLayoutType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ForumLayoutType.from()'.", - replaceWith = ReplaceWith(expression = "ForumLayoutType.from(value)", imports = - arrayOf("dev.kord.common.entity.ForumLayoutType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ForumLayoutType(value) /** * No default has been set for forum channel. @@ -100,7 +90,7 @@ public sealed class ForumLayoutType( 0 -> NotSet 1 -> ListView 2 -> GalleryView - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildFeature.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildFeature.kt index 717ee3e35589..0c9a08e0cdc3 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildFeature.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildFeature.kt @@ -40,17 +40,7 @@ public sealed class GuildFeature( */ public class Unknown internal constructor( `value`: String, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : GuildFeature(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'GuildFeature.from()'.", - replaceWith = ReplaceWith(expression = "GuildFeature.from(value)", imports = - arrayOf("dev.kord.common.entity.GuildFeature")), - ) - public constructor(`value`: String) : this(value, null) - } + ) : GuildFeature(value) /** * Guild has access to set an animated guild banner image. @@ -271,7 +261,7 @@ public sealed class GuildFeature( "VERIFIED" -> Verified "VIP_REGIONS" -> VIPRegions "WELCOME_SCREEN_ENABLED" -> WelcomeScreenEnabled - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/src/commonMain/kotlin/entity/GuildMemberFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildMemberFlag.kt similarity index 64% rename from common/src/commonMain/kotlin/entity/GuildMemberFlag.kt rename to common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildMemberFlag.kt index c544d2f57cc0..a15dd8a70b5f 100644 --- a/common/src/commonMain/kotlin/entity/GuildMemberFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildMemberFlag.kt @@ -1,16 +1,13 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -45,56 +42,23 @@ public sealed class GuildMemberFlag( * [flag]. */ public operator fun plus(flag: GuildMemberFlag): GuildMemberFlags = - GuildMemberFlags(this.code or flag.code, null) + GuildMemberFlags(this.code or flag.code) /** * Returns an instance of [GuildMemberFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: GuildMemberFlags): GuildMemberFlags = - GuildMemberFlags(this.code or flags.code, null) + GuildMemberFlags(this.code or flags.code) final override fun equals(other: Any?): Boolean = this === other || (other is GuildMemberFlag && this.shift == other.shift) final override fun hashCode(): Int = shift.hashCode() - final override fun toString(): String = if (this is Unknown) - "GuildMemberFlag.Unknown(shift=$shift)" else "GuildMemberFlag.${this::class.simpleName}" - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "GuildMemberFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun name(): String = name - private val name get() = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "GuildMemberFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun ordinal(): Int = when (this) { - DidRejoin -> 0 - CompletedOnboarding -> 1 - BypassesVerification -> 2 - StartedOnboarding -> 3 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - message = "GuildMemberFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "GuildMemberFlag::class.java", imports = - arrayOf("dev.kord.common.entity.GuildMemberFlag")), - DeprecationLevel.HIDDEN, - ) - public fun getDeclaringClass(): Class = GuildMemberFlag::class.java + final override fun toString(): String = + if (this is Unknown) "GuildMemberFlag.Unknown(shift=$shift)" + else "GuildMemberFlag.${this::class.simpleName}" /** * An unknown [GuildMemberFlag]. @@ -138,50 +102,6 @@ public sealed class GuildMemberFlag( ) } - // TODO uncomment annotation in Member.kt and delete this file when this function is removed after deprecation - // cycle - @Deprecated( - "'GuildMemberFlag' is no longer serializable, serialize 'GuildMemberFlags' instead. Deprecated without a " + - "replacement.", - level = DeprecationLevel.HIDDEN, - ) - public fun serializer(): KSerializer = Serializer - - private object Serializer : KSerializer { - override val descriptor = - PrimitiveSerialDescriptor("dev.kord.common.entity.GuildMemberFlag", PrimitiveKind.STRING) - - override fun serialize(encoder: Encoder, value: GuildMemberFlag) = encoder.encodeString(value.name) - override fun deserialize(decoder: Decoder) = valueOf0(decoder.decodeString()) - } - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val DidRejoin: GuildMemberFlag = DidRejoin - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val CompletedOnboarding: GuildMemberFlag = CompletedOnboarding - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val BypassesVerification: GuildMemberFlag = BypassesVerification - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val StartedOnboarding: GuildMemberFlag = StartedOnboarding /** * Returns an instance of [GuildMemberFlag] with [GuildMemberFlag.shift] equal to the @@ -196,35 +116,6 @@ public sealed class GuildMemberFlag( 3 -> StartedOnboarding else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "GuildMemberFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - @JvmStatic - public open fun valueOf(name: String): GuildMemberFlag = valueOf0(name) - private fun valueOf0(name: String) = when (name) { - "DidRejoin" -> DidRejoin - "CompletedOnboarding" -> CompletedOnboarding - "BypassesVerification" -> BypassesVerification - "StartedOnboarding" -> StartedOnboarding - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - message = "GuildMemberFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "GuildMemberFlag.entries.toTypedArray()", imports - = arrayOf("dev.kord.common.entity.GuildMemberFlag")), - DeprecationLevel.HIDDEN, - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -236,8 +127,7 @@ public sealed class GuildMemberFlag( * You can create an instance of [GuildMemberFlags] using the following methods: * ```kotlin * // from individual GuildMemberFlags - * val guildMemberFlags1 = GuildMemberFlags(GuildMemberFlag.DidRejoin, - * GuildMemberFlag.CompletedOnboarding) + * val guildMemberFlags1 = GuildMemberFlags(GuildMemberFlag.DidRejoin, GuildMemberFlag.CompletedOnboarding) * * // from an Iterable * val iterable: Iterable = TODO() @@ -276,8 +166,7 @@ public sealed class GuildMemberFlag( * specific [GuildMemberFlag]s: * ```kotlin * val hasGuildMemberFlag = GuildMemberFlag.DidRejoin in guildMemberFlags - * val hasGuildMemberFlags = GuildMemberFlags(GuildMemberFlag.DidRejoin, - * GuildMemberFlag.CompletedOnboarding) in guildMemberFlags + * val hasGuildMemberFlags = GuildMemberFlags(GuildMemberFlag.DidRejoin, GuildMemberFlag.CompletedOnboarding) in guildMemberFlags * ``` * * ## Unknown [GuildMemberFlag]s @@ -300,18 +189,7 @@ public class GuildMemberFlags internal constructor( * The raw code used by Discord. */ public val code: Int, - @Suppress("UNUSED_PARAMETER") unused: Nothing?, ) { - // TODO uncomment annotation in Member.kt and delete this file when this constructor is removed after deprecation - // cycle - @Deprecated( - "Don't construct an instance of 'GuildMemberFlags' from a raw code. Use the factory functions described in " + - "the documentation instead.", - ReplaceWith("GuildMemberFlags.Builder(code).build()", "dev.kord.common.entity.GuildMemberFlags"), - DeprecationLevel.HIDDEN, - ) - public constructor(code: Int) : this(code, null) - /** * A [Set] of all [GuildMemberFlag]s contained in this instance of [GuildMemberFlags]. */ @@ -343,28 +221,28 @@ public class GuildMemberFlags internal constructor( * [flag]. */ public operator fun plus(flag: GuildMemberFlag): GuildMemberFlags = - GuildMemberFlags(this.code or flag.code, null) + GuildMemberFlags(this.code or flag.code) /** * Returns an instance of [GuildMemberFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: GuildMemberFlags): GuildMemberFlags = - GuildMemberFlags(this.code or flags.code, null) + GuildMemberFlags(this.code or flags.code) /** * Returns an instance of [GuildMemberFlags] that has all bits set that are set in `this` except * the bits that are set in [flag]. */ public operator fun minus(flag: GuildMemberFlag): GuildMemberFlags = - GuildMemberFlags(this.code and flag.code.inv(), null) + GuildMemberFlags(this.code and flag.code.inv()) /** * Returns an instance of [GuildMemberFlags] that has all bits set that are set in `this` except * the bits that are set in [flags]. */ public operator fun minus(flags: GuildMemberFlags): GuildMemberFlags = - GuildMemberFlags(this.code and flags.code.inv(), null) + GuildMemberFlags(this.code and flags.code.inv()) /** * Returns a copy of this instance of [GuildMemberFlags] modified with [builder]. @@ -381,24 +259,6 @@ public class GuildMemberFlags internal constructor( override fun toString(): String = "GuildMemberFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - message = "GuildMemberFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "GuildMemberFlags is no longer a data class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun copy(code: Int = this.code): GuildMemberFlags = GuildMemberFlags(code, null) - public class Builder( private var code: Int = 0, ) { @@ -434,7 +294,7 @@ public class GuildMemberFlags internal constructor( * Returns an instance of [GuildMemberFlags] that has all bits set that are currently set in * this [Builder]. */ - public fun build(): GuildMemberFlags = GuildMemberFlags(code, null) + public fun build(): GuildMemberFlags = GuildMemberFlags(code) } internal object Serializer : KSerializer { @@ -449,7 +309,7 @@ public class GuildMemberFlags internal constructor( } override fun deserialize(decoder: Decoder): GuildMemberFlags = - GuildMemberFlags(decoder.decodeSerializableValue(delegate), null) + GuildMemberFlags(decoder.decodeSerializableValue(delegate)) } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventPrivacyLevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventPrivacyLevel.kt index 8457099c3527..0dd750a108b0 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventPrivacyLevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventPrivacyLevel.kt @@ -41,18 +41,7 @@ public sealed class GuildScheduledEventPrivacyLevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : GuildScheduledEventPrivacyLevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'GuildScheduledEventPrivacyLevel.from()'.", - replaceWith = ReplaceWith(expression = "GuildScheduledEventPrivacyLevel.from(value)", - imports = - arrayOf("dev.kord.common.entity.GuildScheduledEventPrivacyLevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : GuildScheduledEventPrivacyLevel(value) /** * The scheduled event is only accessible to guild members. @@ -89,7 +78,7 @@ public sealed class GuildScheduledEventPrivacyLevel( */ public fun from(`value`: Int): GuildScheduledEventPrivacyLevel = when (value) { 2 -> GuildOnly - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventStatus.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventStatus.kt index cc927ee36493..90d3374bc84d 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventStatus.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildScheduledEventStatus.kt @@ -41,17 +41,7 @@ public sealed class GuildScheduledEventStatus( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : GuildScheduledEventStatus(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'GuildScheduledEventStatus.from()'.", - replaceWith = ReplaceWith(expression = "GuildScheduledEventStatus.from(value)", imports - = arrayOf("dev.kord.common.entity.GuildScheduledEventStatus")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : GuildScheduledEventStatus(value) public object Scheduled : GuildScheduledEventStatus(1) @@ -97,7 +87,7 @@ public sealed class GuildScheduledEventStatus( 2 -> Active 3 -> Completed 4 -> Cancelled - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/IntegrationExpireBehavior.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/IntegrationExpireBehavior.kt index f89ef8a68f99..125c384b2f5f 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/IntegrationExpireBehavior.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/IntegrationExpireBehavior.kt @@ -41,17 +41,7 @@ public sealed class IntegrationExpireBehavior( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : IntegrationExpireBehavior(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'IntegrationExpireBehavior.from()'.", - replaceWith = ReplaceWith(expression = "IntegrationExpireBehavior.from(value)", imports - = arrayOf("dev.kord.common.entity.IntegrationExpireBehavior")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : IntegrationExpireBehavior(value) public object RemoveRole : IntegrationExpireBehavior(0) @@ -89,7 +79,7 @@ public sealed class IntegrationExpireBehavior( public fun from(`value`: Int): IntegrationExpireBehavior = when (value) { 0 -> RemoveRole 1 -> Kick - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionResponseType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionResponseType.kt index ca814eb3259b..8c0dd7d8134d 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionResponseType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionResponseType.kt @@ -41,17 +41,7 @@ public sealed class InteractionResponseType( */ public class Unknown internal constructor( type: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : InteractionResponseType(type) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'InteractionResponseType.from()'.", - replaceWith = ReplaceWith(expression = "InteractionResponseType.from(type)", imports = - arrayOf("dev.kord.common.entity.InteractionResponseType")), - ) - public constructor(type: Int) : this(type, null) - } + ) : InteractionResponseType(type) /** * ACK a [Ping][dev.kord.common.entity.InteractionType.Ping]. @@ -131,7 +121,7 @@ public sealed class InteractionResponseType( 7 -> UpdateMessage 8 -> ApplicationCommandAutoCompleteResult 9 -> Modal - else -> Unknown(type, null) + else -> Unknown(type) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionType.kt index 82bbcf0ca72b..1dcc335a18a5 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InteractionType.kt @@ -40,17 +40,7 @@ public sealed class InteractionType( */ public class Unknown internal constructor( type: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : InteractionType(type) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'InteractionType.from()'.", - replaceWith = ReplaceWith(expression = "InteractionType.from(type)", imports = - arrayOf("dev.kord.common.entity.InteractionType")), - ) - public constructor(type: Int) : this(type, null) - } + ) : InteractionType(type) public object Ping : InteractionType(1) @@ -99,7 +89,7 @@ public sealed class InteractionType( 3 -> Component 4 -> AutoComplete 5 -> ModalSubmit - else -> Unknown(type, null) + else -> Unknown(type) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InviteTargetType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InviteTargetType.kt index 46465cfe03bf..1c5a4665b9c7 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InviteTargetType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/InviteTargetType.kt @@ -40,17 +40,7 @@ public sealed class InviteTargetType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : InviteTargetType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'InviteTargetType.from()'.", - replaceWith = ReplaceWith(expression = "InviteTargetType.from(value)", imports = - arrayOf("dev.kord.common.entity.InviteTargetType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : InviteTargetType(value) public object Stream : InviteTargetType(1) @@ -87,7 +77,7 @@ public sealed class InviteTargetType( public fun from(`value`: Int): InviteTargetType = when (value) { 1 -> Stream 2 -> EmbeddedApplication - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MFALevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MFALevel.kt index 881835af28ad..5384db114c37 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MFALevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MFALevel.kt @@ -39,17 +39,7 @@ public sealed class MFALevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : MFALevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'MFALevel.from()'.", - replaceWith = ReplaceWith(expression = "MFALevel.from(value)", imports = - arrayOf("dev.kord.common.entity.MFALevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : MFALevel(value) /** * Guild has no MFA/2FA requirement for moderation actions. @@ -90,7 +80,7 @@ public sealed class MFALevel( public fun from(`value`: Int): MFALevel = when (value) { 0 -> None 1 -> Elevated - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageActivityType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageActivityType.kt index 9e5f570c3b03..201afa82f929 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageActivityType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageActivityType.kt @@ -40,17 +40,7 @@ public sealed class MessageActivityType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : MessageActivityType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'MessageActivityType.from()'.", - replaceWith = ReplaceWith(expression = "MessageActivityType.from(value)", imports = - arrayOf("dev.kord.common.entity.MessageActivityType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : MessageActivityType(value) public object Join : MessageActivityType(1) @@ -95,7 +85,7 @@ public sealed class MessageActivityType( 2 -> Spectate 3 -> Listen 5 -> JoinRequest - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt index f75c9a539cc7..bf5f029577e3 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt @@ -4,14 +4,10 @@ package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -62,50 +58,6 @@ public sealed class MessageFlag( final override fun toString(): String = if (this is Unknown) "MessageFlag.Unknown(shift=$shift)" else "MessageFlag.${this::class.simpleName}" - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlag is no longer an enum class. Deprecated without a replacement.", - ) - public fun ordinal(): Int = when (this) { - CrossPosted -> 0 - IsCrossPost -> 1 - SuppressEmbeds -> 2 - SourceMessageDeleted -> 3 - Urgent -> 4 - HasThread -> 5 - Ephemeral -> 6 - Loading -> 7 - FailedToMentionSomeRolesInThread -> 8 - SuppressNotifications -> 9 - IsVoiceMessage -> 10 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "MessageFlag::class.java", imports = - arrayOf("dev.kord.common.entity.MessageFlag")), - ) - public fun getDeclaringClass(): Class = MessageFlag::class.java - /** * An unknown [MessageFlag]. * @@ -191,83 +143,6 @@ public sealed class MessageFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val CrossPosted: MessageFlag = CrossPosted - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val IsCrossPost: MessageFlag = IsCrossPost - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressEmbeds: MessageFlag = SuppressEmbeds - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SourceMessageDeleted: MessageFlag = SourceMessageDeleted - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Urgent: MessageFlag = Urgent - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val HasThread: MessageFlag = HasThread - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Ephemeral: MessageFlag = Ephemeral - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Loading: MessageFlag = Loading - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val FailedToMentionSomeRolesInThread: MessageFlag = FailedToMentionSomeRolesInThread - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressNotifications: MessageFlag = SuppressNotifications - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val IsVoiceMessage: MessageFlag = IsVoiceMessage - /** * Returns an instance of [MessageFlag] with [MessageFlag.shift] equal to the specified * [shift]. @@ -288,43 +163,6 @@ public sealed class MessageFlag( 13 -> IsVoiceMessage else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlag is no longer an enum class. Deprecated without a replacement.", - ) - @JvmStatic - public open fun valueOf(name: String): MessageFlag = when (name) { - "CrossPosted" -> CrossPosted - "IsCrossPost" -> IsCrossPost - "SuppressEmbeds" -> SuppressEmbeds - "SourceMessageDeleted" -> SourceMessageDeleted - "Urgent" -> Urgent - "HasThread" -> HasThread - "Ephemeral" -> Ephemeral - "Loading" -> Loading - "FailedToMentionSomeRolesInThread" -> FailedToMentionSomeRolesInThread - "SuppressNotifications" -> SuppressNotifications - "IsVoiceMessage" -> IsVoiceMessage - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "MessageFlag.entries.toTypedArray()", imports = - arrayOf("dev.kord.common.entity.MessageFlag")), - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -412,17 +250,6 @@ public class MessageFlags internal constructor( } } - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - ) - public val flags: List - get() = values.toList() - /** * Checks if this instance of [MessageFlags] has all bits set that are set in [flag]. */ @@ -476,26 +303,6 @@ public class MessageFlags internal constructor( override fun toString(): String = "MessageFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "MessageFlags is no longer a data class. Deprecated without a replacement.", - ) - public fun copy(code: Int = this.code): MessageFlags = MessageFlags(code) - public class Builder( private var code: Int = 0, ) { @@ -532,16 +339,6 @@ public class MessageFlags internal constructor( * this [Builder]. */ public fun build(): MessageFlags = MessageFlags(code) - - /** - * @suppress - */ - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Renamed to 'build'", - replaceWith = ReplaceWith(expression = "this.build()", imports = arrayOf()), - ) - public fun flags(): MessageFlags = build() } internal object Serializer : KSerializer { diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageStickerType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageStickerType.kt index 3c4b3acd00c4..08547ab640b4 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageStickerType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageStickerType.kt @@ -40,17 +40,7 @@ public sealed class MessageStickerType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : MessageStickerType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'MessageStickerType.from()'.", - replaceWith = ReplaceWith(expression = "MessageStickerType.from(value)", imports = - arrayOf("dev.kord.common.entity.MessageStickerType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : MessageStickerType(value) public object PNG : MessageStickerType(1) @@ -95,7 +85,7 @@ public sealed class MessageStickerType( 2 -> APNG 3 -> LOTTIE 4 -> GIF - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageType.kt index d85bb78b9285..73c3a531f035 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageType.kt @@ -39,17 +39,7 @@ public sealed class MessageType( */ public class Unknown internal constructor( code: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : MessageType(code) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'MessageType.from()'.", - replaceWith = ReplaceWith(expression = "MessageType.from(code)", imports = - arrayOf("dev.kord.common.entity.MessageType")), - ) - public constructor(code: Int) : this(code, null) - } + ) : MessageType(code) public object Default : MessageType(0) @@ -201,7 +191,7 @@ public sealed class MessageType( 29 -> StageSpeaker 31 -> StageTopic 32 -> GuildApplicationPremiumSubscription - else -> Unknown(code, null) + else -> Unknown(code) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/NsfwLevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/NsfwLevel.kt index 0ad123a3db5c..f18e70ce9943 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/NsfwLevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/NsfwLevel.kt @@ -39,17 +39,7 @@ public sealed class NsfwLevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : NsfwLevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'NsfwLevel.from()'.", - replaceWith = ReplaceWith(expression = "NsfwLevel.from(value)", imports = - arrayOf("dev.kord.common.entity.NsfwLevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : NsfwLevel(value) public object Default : NsfwLevel(0) @@ -92,7 +82,7 @@ public sealed class NsfwLevel( 1 -> Explicit 2 -> Safe 3 -> AgeRestricted - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OnboardingPromptType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OnboardingPromptType.kt index 164742e38c3e..0fd9dea47a31 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OnboardingPromptType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OnboardingPromptType.kt @@ -40,17 +40,7 @@ public sealed class OnboardingPromptType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : OnboardingPromptType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'OnboardingPromptType.from()'.", - replaceWith = ReplaceWith(expression = "OnboardingPromptType.from(value)", imports = - arrayOf("dev.kord.common.entity.OnboardingPromptType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : OnboardingPromptType(value) public object MultipleChoice : OnboardingPromptType(0) @@ -87,7 +77,7 @@ public sealed class OnboardingPromptType( public fun from(`value`: Int): OnboardingPromptType = when (value) { 0 -> MultipleChoice 1 -> Dropdown - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OverwriteType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OverwriteType.kt index 3fe8c4d57c15..443132b1beb8 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OverwriteType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/OverwriteType.kt @@ -40,17 +40,7 @@ public sealed class OverwriteType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : OverwriteType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'OverwriteType.from()'.", - replaceWith = ReplaceWith(expression = "OverwriteType.from(value)", imports = - arrayOf("dev.kord.common.entity.OverwriteType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : OverwriteType(value) public object Role : OverwriteType(0) @@ -86,7 +76,7 @@ public sealed class OverwriteType( public fun from(`value`: Int): OverwriteType = when (value) { 0 -> Role 1 -> Member - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/src/commonMain/kotlin/entity/Permission.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/Permission.kt similarity index 70% rename from common/src/commonMain/kotlin/entity/Permission.kt rename to common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/Permission.kt index 856903ee0900..4d1fb9746e5b 100644 --- a/common/src/commonMain/kotlin/entity/Permission.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/Permission.kt @@ -1,3 +1,4 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) @@ -22,77 +23,39 @@ import kotlinx.serialization.encoding.Encoder * See [Permission]s in the * [Discord Developer Documentation](https://discord.com/developers/docs/topics/permissions). */ -public sealed class Permission { - private val isProper: Boolean - private val _shift: Int // only use if isProper == true - private val _code: DiscordBitSet? // only non-null if isProper == false - - private constructor(shift: Int) { - require(shift >= 0) { """shift has to be >= 0 but was $shift""" } - isProper = true - _shift = shift - _code = null - } - - private constructor(code: DiscordBitSet) { - var singleBitIsSet = false - var shift = -1 - for (i in 0..= 0. */ - public val shift: Int - get() = if (isProper) _shift else throw IllegalArgumentException( - "$this is not a proper instance of 'Permission' because multiple bits are set." - ) + public val shift: Int, +) { + init { + require(shift >= 0) { """shift has to be >= 0 but was $shift""" } + } /** * The raw code used by Discord. */ public val code: DiscordBitSet - get() = if (isProper) EmptyBitSet().also { it[_shift] = true } else _code!! + get() = EmptyBitSet().also { it[shift] = true } /** * Returns an instance of [Permissions] that has all bits set that are set in `this` and [flag]. */ - public operator fun plus(flag: Permission): Permissions = Permissions(this.code + flag.code, null) + public operator fun plus(flag: Permission): Permissions = Permissions(this.code + flag.code) /** * Returns an instance of [Permissions] that has all bits set that are set in `this` and * [flags]. */ - public operator fun plus(flags: Permissions): Permissions = Permissions(this.code + flags.code, null) + public operator fun plus(flags: Permissions): Permissions = Permissions(this.code + flags.code) final override fun equals(other: Any?): Boolean = this === other || - (other is Permission - && (this.isProper == other.isProper) - && (if (isProper) this._shift == other._shift else this._code == other._code)) + (other is Permission && this.shift == other.shift) - final override fun hashCode(): Int = if (isProper) _shift.hashCode() else _code.hashCode() + final override fun hashCode(): Int = shift.hashCode() - final override fun toString(): String = if (this is Unknown) - (if (isProper) "Permission.Unknown(shift=$_shift)" else "Permission.Unknown(code=$_code)") + final override fun toString(): String = if (this is Unknown) "Permission.Unknown(shift=$shift)" else "Permission.${this::class.simpleName}" /** @@ -100,25 +63,9 @@ public sealed class Permission { * * This is used as a fallback for [Permission]s that haven't been added to Kord yet. */ - public class Unknown : Permission { - internal constructor(shift: Int) : super(shift) - - // TODO uncomment annotation in Permissions.kt and delete this file when these constructors are removed after - // deprecation cycle - @Deprecated( - "Construct an unknown 'Permission' with 'Permission.fromShift()' instead.", - ReplaceWith("Permission.fromShift(TODO())", imports = ["dev.kord.common.entity.Permission"]), - DeprecationLevel.HIDDEN, - ) - public constructor(code: DiscordBitSet) : super(code) - - @Deprecated( - "Construct an unknown 'Permission' with 'Permission.fromShift()' instead.", - ReplaceWith("Permission.fromShift(TODO())", imports = ["dev.kord.common.entity.Permission"]), - DeprecationLevel.HIDDEN, - ) - public constructor(vararg values: Long) : super(DiscordBitSet(values)) - } + public class Unknown internal constructor( + shift: Int, + ) : Permission(shift) /** * Allows creation of instant invites. @@ -365,15 +312,6 @@ public sealed class Permission { */ public object SendVoiceMessages : Permission(46) - // TODO uncomment annotation in Permissions.kt and delete this file when this object is removed after deprecation - // cycle - @Deprecated( - "'Permission.All' is not a proper 'Permission' instance. Replace with 'Permissions.ALL'.", - ReplaceWith("Permissions.ALL", imports = ["dev.kord.common.entity.Permissions", "dev.kord.common.entity.ALL"]), - DeprecationLevel.HIDDEN, - ) - public object All : Permission(Permissions.ALL.code) - public companion object { /** * A [List] of all known [Permission]s. @@ -430,14 +368,6 @@ public sealed class Permission { ) } - // TODO uncomment annotation in Permissions.kt and delete this file when this property is removed after - // deprecation cycle - @Deprecated( - "Renamed to 'entries'.", - ReplaceWith("Permission.entries", imports = ["dev.kord.common.entity.Permission"]), - DeprecationLevel.HIDDEN, - ) - public val values: Set get() = entries.toSet() /** * Returns an instance of [Permission] with [Permission.shift] equal to the specified @@ -566,18 +496,7 @@ public class Permissions internal constructor( * The raw code used by Discord. */ public val code: DiscordBitSet, - @Suppress("UNUSED_PARAMETER") unused: Nothing?, ) { - // TODO uncomment annotation in Permissions.kt and delete this file when this constructor is removed after - // deprecation cycle - @Deprecated( - "Don't construct an instance of 'Permissions' from a raw code. Use the factory functions described in the " + - "documentation instead.", - ReplaceWith("Permissions.Builder(code).build()", "dev.kord.common.entity.Permissions"), - DeprecationLevel.HIDDEN, - ) - public constructor(code: DiscordBitSet) : this(code, null) - /** * A [Set] of all [Permission]s contained in this instance of [Permissions]. */ @@ -601,44 +520,41 @@ public class Permissions internal constructor( /** * Returns an instance of [Permissions] that has all bits set that are set in `this` and [flag]. */ - public operator fun plus(flag: Permission): Permissions = Permissions(this.code + flag.code, null) + public operator fun plus(flag: Permission): Permissions = Permissions(this.code + flag.code) /** * Returns an instance of [Permissions] that has all bits set that are set in `this` and * [flags]. */ - public operator fun plus(flags: Permissions): Permissions = Permissions(this.code + flags.code, null) + public operator fun plus(flags: Permissions): Permissions = Permissions(this.code + flags.code) /** * Returns an instance of [Permissions] that has all bits set that are set in `this` except the * bits that are set in [flag]. */ - public operator fun minus(flag: Permission): Permissions = Permissions(this.code - flag.code, null) + public operator fun minus(flag: Permission): Permissions = Permissions(this.code - flag.code) /** * Returns an instance of [Permissions] that has all bits set that are set in `this` except the * bits that are set in [flags]. */ - public operator fun minus(flags: Permissions): Permissions = Permissions(this.code - flags.code, null) + public operator fun minus(flags: Permissions): Permissions = Permissions(this.code - flags.code) /** * Returns a copy of this instance of [Permissions] modified with [builder]. */ - @JvmName("copy0") // TODO other name when deprecated overload is removed public inline fun copy(builder: Builder.() -> Unit): Permissions { contract { callsInPlace(builder, EXACTLY_ONCE) } return Builder(code.copy()).apply(builder).build() } - @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") @Deprecated( - "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.", level = DeprecationLevel.HIDDEN, + message = "Binary compatibility, keep for some releases.", ) - @kotlin.internal.LowPriorityInOverloadResolution - public inline fun copy(block: PermissionsBuilder.() -> Unit): Permissions { - contract { callsInPlace(block, EXACTLY_ONCE) } - return PermissionsBuilder(code.copy()).apply(block).permissions() + public inline fun copy0(builder: Builder.() -> Unit): Permissions { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return copy(builder) } override fun equals(other: Any?): Boolean = this === other || @@ -648,38 +564,6 @@ public class Permissions internal constructor( override fun toString(): String = "Permissions(values=$values)" - /** - * @suppress - */ - @Deprecated( - message = "Permissions is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public operator fun component1(): DiscordBitSet = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "Permissions is no longer a data class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun copy(code: DiscordBitSet = this.code): Permissions = Permissions(code, null) - - @Deprecated( - "Renamed to 'Builder'.", - ReplaceWith("Permissions.Builder", imports = ["dev.kord.common.entity.Permissions"]), - DeprecationLevel.HIDDEN, - ) - public class PermissionsBuilder(code: DiscordBitSet) { - private val delegate = Builder(code) - public operator fun Permissions.unaryPlus(): Unit = with(delegate) { unaryPlus() } - public operator fun Permissions.unaryMinus(): Unit = with(delegate) { unaryMinus() } - public operator fun Permission.unaryPlus(): Unit = with(delegate) { unaryPlus() } - public operator fun Permission.unaryMinus(): Unit = with(delegate) { unaryMinus() } - public fun permissions(): Permissions = delegate.build() - } - public class Builder( private val code: DiscordBitSet = EmptyBitSet(), ) { @@ -715,7 +599,7 @@ public class Permissions internal constructor( * Returns an instance of [Permissions] that has all bits set that are currently set in this * [Builder]. */ - public fun build(): Permissions = Permissions(code.copy(), null) + public fun build(): Permissions = Permissions(code.copy()) } internal object Serializer : KSerializer { @@ -730,49 +614,46 @@ public class Permissions internal constructor( } override fun deserialize(decoder: Decoder): Permissions = - Permissions(decoder.decodeSerializableValue(delegate), null) + Permissions(decoder.decodeSerializableValue(delegate)) } - public companion object NewCompanion { - - @Suppress("DEPRECATION_ERROR") + public companion object { + @Suppress(names = arrayOf("DEPRECATION")) @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("Permissions.serializer()", imports = ["dev.kord.common.entity.Permissions"]), - DeprecationLevel.HIDDEN, + message = "Renamed to 'Companion'.", + replaceWith = ReplaceWith(expression = "Permissions.Companion", imports = + arrayOf("dev.kord.common.entity.Permissions")), ) @JvmField - public val Companion: Companion = Companion() + public val NewCompanion: NewCompanion = NewCompanion() } @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("Permissions.serializer()", imports = ["dev.kord.common.entity.Permissions"]), - DeprecationLevel.HIDDEN, + message = "Renamed to 'Companion'.", + replaceWith = ReplaceWith(expression = "Permissions.Companion", imports = + arrayOf("dev.kord.common.entity.Permissions")), ) - public class Companion internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this + public class NewCompanion internal constructor() { + public fun serializer(): KSerializer = Permissions.serializer() } } /** * Returns an instance of [Permissions] built with [Permissions.Builder]. */ -@JvmName("Permissions0") // TODO other name when deprecated overload is removed public inline fun Permissions(builder: Permissions.Builder.() -> Unit = {}): Permissions { contract { callsInPlace(builder, EXACTLY_ONCE) } return Permissions.Builder().apply(builder).build() } -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") +@Suppress(names = arrayOf("FunctionName")) @Deprecated( - "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.", level = DeprecationLevel.HIDDEN, + message = "Binary compatibility, keep for some releases.", ) -@kotlin.internal.LowPriorityInOverloadResolution -public inline fun Permissions(block: Permissions.PermissionsBuilder.() -> Unit = {}): Permissions { - contract { callsInPlace(block, EXACTLY_ONCE) } - return Permissions.PermissionsBuilder(DiscordBitSet(0)).apply(block).permissions() +public inline fun Permissions0(builder: Permissions.Builder.() -> Unit = {}): Permissions { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return Permissions(builder) } /** @@ -807,20 +688,3 @@ public fun Permissions(flags: Iterable): Permissions = Permissions { public fun Permissions(flags: Iterable): Permissions = Permissions { flags.forEach { +it } } - -// TODO uncomment annotation in Permissions.kt and delete this file when these functions are removed after deprecation -// cycle -@Suppress("FunctionName") -@Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun PermissionWithIterable(flags: Iterable): Permissions = Permissions(flags) - -@Deprecated( - "Don't construct an instance of 'Permissions' from a raw value. Use the factory functions described in the " + - "documentation instead.", - ReplaceWith( - "Permissions.Builder(DiscordBitSet(value)).build()", - imports = ["dev.kord.common.entity.Permissions", "dev.kord.common.DiscordBitSet"], - ), - DeprecationLevel.HIDDEN, -) -public fun Permissions(value: String): Permissions = Permissions(DiscordBitSet(value), null) diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PremiumTier.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PremiumTier.kt index 38aeec3d09f6..6e34486f57dd 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PremiumTier.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PremiumTier.kt @@ -39,17 +39,7 @@ public sealed class PremiumTier( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : PremiumTier(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'PremiumTier.from()'.", - replaceWith = ReplaceWith(expression = "PremiumTier.from(value)", imports = - arrayOf("dev.kord.common.entity.PremiumTier")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : PremiumTier(value) /** * Guild has not unlocked any Server Boost perks. @@ -105,7 +95,7 @@ public sealed class PremiumTier( 1 -> One 2 -> Two 3 -> Three - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PresenceStatus.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PresenceStatus.kt index 884898e6e07d..251e2c4bb94a 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PresenceStatus.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/PresenceStatus.kt @@ -40,17 +40,7 @@ public sealed class PresenceStatus( */ public class Unknown internal constructor( `value`: String, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : PresenceStatus(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'PresenceStatus.from()'.", - replaceWith = ReplaceWith(expression = "PresenceStatus.from(value)", imports = - arrayOf("dev.kord.common.entity.PresenceStatus")), - ) - public constructor(`value`: String) : this(value, null) - } + ) : PresenceStatus(value) /** * Online. @@ -114,7 +104,7 @@ public sealed class PresenceStatus( "idle" -> Idle "invisible" -> Invisible "offline" -> Offline - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ScheduledEntityType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ScheduledEntityType.kt index ffb056112334..643fdc7f636e 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ScheduledEntityType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ScheduledEntityType.kt @@ -40,17 +40,7 @@ public sealed class ScheduledEntityType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : ScheduledEntityType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'ScheduledEntityType.from()'.", - replaceWith = ReplaceWith(expression = "ScheduledEntityType.from(value)", imports = - arrayOf("dev.kord.common.entity.ScheduledEntityType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : ScheduledEntityType(value) public object StageInstance : ScheduledEntityType(1) @@ -91,7 +81,7 @@ public sealed class ScheduledEntityType( 1 -> StageInstance 2 -> Voice 3 -> External - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SortOrderType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SortOrderType.kt index 74b1a6f76808..1ba90d2dabae 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SortOrderType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SortOrderType.kt @@ -40,17 +40,7 @@ public sealed class SortOrderType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : SortOrderType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'SortOrderType.from()'.", - replaceWith = ReplaceWith(expression = "SortOrderType.from(value)", imports = - arrayOf("dev.kord.common.entity.SortOrderType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : SortOrderType(value) /** * Sort forum posts by activity. @@ -92,7 +82,7 @@ public sealed class SortOrderType( public fun from(`value`: Int): SortOrderType = when (value) { 0 -> LatestActivity 1 -> CreationDate - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/StageInstancePrivacyLevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/StageInstancePrivacyLevel.kt index 7f52e0fc7cb7..3324ed8ddd23 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/StageInstancePrivacyLevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/StageInstancePrivacyLevel.kt @@ -41,17 +41,7 @@ public sealed class StageInstancePrivacyLevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : StageInstancePrivacyLevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'StageInstancePrivacyLevel.from()'.", - replaceWith = ReplaceWith(expression = "StageInstancePrivacyLevel.from(value)", imports - = arrayOf("dev.kord.common.entity.StageInstancePrivacyLevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : StageInstancePrivacyLevel(value) /** * The Stage instance is visible publicly. @@ -96,7 +86,7 @@ public sealed class StageInstancePrivacyLevel( public fun from(`value`: Int): StageInstancePrivacyLevel = when (value) { 1 -> @Suppress("DEPRECATION") Public 2 -> GuildOnly - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/src/commonMain/kotlin/entity/SystemChannelFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SystemChannelFlag.kt similarity index 64% rename from common/src/commonMain/kotlin/entity/SystemChannelFlag.kt rename to common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SystemChannelFlag.kt index cb97eb7c2b6b..d1d8c7251deb 100644 --- a/common/src/commonMain/kotlin/entity/SystemChannelFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SystemChannelFlag.kt @@ -1,16 +1,14 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -45,58 +43,23 @@ public sealed class SystemChannelFlag( * [flag]. */ public operator fun plus(flag: SystemChannelFlag): SystemChannelFlags = - SystemChannelFlags(this.code or flag.code, null) + SystemChannelFlags(this.code or flag.code) /** * Returns an instance of [SystemChannelFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: SystemChannelFlags): SystemChannelFlags = - SystemChannelFlags(this.code or flags.code, null) + SystemChannelFlags(this.code or flags.code) final override fun equals(other: Any?): Boolean = this === other || (other is SystemChannelFlag && this.shift == other.shift) final override fun hashCode(): Int = shift.hashCode() - final override fun toString(): String = if (this is Unknown) - "SystemChannelFlag.Unknown(shift=$shift)" else - "SystemChannelFlag.${this::class.simpleName}" - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SystemChannelFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SystemChannelFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun ordinal(): Int = when (this) { - SuppressJoinNotifications -> 0 - SuppressPremiumSubscriptions -> 1 - SuppressGuildReminderNotifications -> 2 - SuppressJoinNotificationReplies -> 3 - SuppressRoleSubscriptionPurchaseNotifications -> 4 - SuppressRoleSubscriptionPurchaseNotificationReplies -> 5 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - message = "SystemChannelFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "SystemChannelFlag::class.java", imports = - arrayOf("dev.kord.common.entity.SystemChannelFlag")), - DeprecationLevel.HIDDEN, - ) - public fun getDeclaringClass(): Class = SystemChannelFlag::class.java + final override fun toString(): String = + if (this is Unknown) "SystemChannelFlag.Unknown(shift=$shift)" + else "SystemChannelFlag.${this::class.simpleName}" /** * An unknown [SystemChannelFlag]. @@ -153,52 +116,6 @@ public sealed class SystemChannelFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressJoinNotifications: SystemChannelFlag = SuppressJoinNotifications - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressPremiumSubscriptions: SystemChannelFlag = SuppressPremiumSubscriptions - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressGuildReminderNotifications: SystemChannelFlag = - SuppressGuildReminderNotifications - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressJoinNotificationReplies: SystemChannelFlag = - SuppressJoinNotificationReplies - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressRoleSubscriptionPurchaseNotifications: SystemChannelFlag = - SuppressRoleSubscriptionPurchaseNotifications - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val SuppressRoleSubscriptionPurchaseNotificationReplies: SystemChannelFlag = - SuppressRoleSubscriptionPurchaseNotificationReplies - /** * Returns an instance of [SystemChannelFlag] with [SystemChannelFlag.shift] equal to the * specified [shift]. @@ -214,36 +131,6 @@ public sealed class SystemChannelFlag( 5 -> SuppressRoleSubscriptionPurchaseNotificationReplies else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SystemChannelFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - @JvmStatic - public open fun valueOf(name: String): SystemChannelFlag = when (name) { - "SuppressJoinNotifications" -> SuppressJoinNotifications - "SuppressPremiumSubscriptions" -> SuppressPremiumSubscriptions - "SuppressGuildReminderNotifications" -> SuppressGuildReminderNotifications - "SuppressJoinNotificationReplies" -> SuppressJoinNotificationReplies - "SuppressRoleSubscriptionPurchaseNotifications" -> SuppressRoleSubscriptionPurchaseNotifications - "SuppressRoleSubscriptionPurchaseNotificationReplies" -> SuppressRoleSubscriptionPurchaseNotificationReplies - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - message = "SystemChannelFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "SystemChannelFlag.entries.toTypedArray()", - imports = arrayOf("dev.kord.common.entity.SystemChannelFlag")), - DeprecationLevel.HIDDEN, - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -255,8 +142,7 @@ public sealed class SystemChannelFlag( * You can create an instance of [SystemChannelFlags] using the following methods: * ```kotlin * // from individual SystemChannelFlags - * val systemChannelFlags1 = SystemChannelFlags(SystemChannelFlag.SuppressJoinNotifications, - * SystemChannelFlag.SuppressPremiumSubscriptions) + * val systemChannelFlags1 = SystemChannelFlags(SystemChannelFlag.SuppressJoinNotifications, SystemChannelFlag.SuppressPremiumSubscriptions) * * // from an Iterable * val iterable: Iterable = TODO() @@ -295,8 +181,7 @@ public sealed class SystemChannelFlag( * specific [SystemChannelFlag]s: * ```kotlin * val hasSystemChannelFlag = SystemChannelFlag.SuppressJoinNotifications in systemChannelFlags - * val hasSystemChannelFlags = SystemChannelFlags(SystemChannelFlag.SuppressJoinNotifications, - * SystemChannelFlag.SuppressPremiumSubscriptions) in systemChannelFlags + * val hasSystemChannelFlags = SystemChannelFlags(SystemChannelFlag.SuppressJoinNotifications, SystemChannelFlag.SuppressPremiumSubscriptions) in systemChannelFlags * ``` * * ## Unknown [SystemChannelFlag]s @@ -319,18 +204,7 @@ public class SystemChannelFlags internal constructor( * The raw code used by Discord. */ public val code: Int, - @Suppress("UNUSED_PARAMETER") unused: Nothing?, ) { - // TODO uncomment annotation in DiscordGuild.kt and delete this file when this constructor is removed after - // deprecation cycle - @Deprecated( - "Don't construct an instance of 'SystemChannelFlags' from a raw code. Use the factory functions described in " + - "the documentation instead.", - ReplaceWith("SystemChannelFlags.Builder(code).build()", "dev.kord.common.entity.SystemChannelFlags"), - DeprecationLevel.HIDDEN, - ) - public constructor(code: Int) : this(code, null) - /** * A [Set] of all [SystemChannelFlag]s contained in this instance of [SystemChannelFlags]. */ @@ -362,28 +236,28 @@ public class SystemChannelFlags internal constructor( * [flag]. */ public operator fun plus(flag: SystemChannelFlag): SystemChannelFlags = - SystemChannelFlags(this.code or flag.code, null) + SystemChannelFlags(this.code or flag.code) /** * Returns an instance of [SystemChannelFlags] that has all bits set that are set in `this` and * [flags]. */ public operator fun plus(flags: SystemChannelFlags): SystemChannelFlags = - SystemChannelFlags(this.code or flags.code, null) + SystemChannelFlags(this.code or flags.code) /** * Returns an instance of [SystemChannelFlags] that has all bits set that are set in `this` * except the bits that are set in [flag]. */ public operator fun minus(flag: SystemChannelFlag): SystemChannelFlags = - SystemChannelFlags(this.code and flag.code.inv(), null) + SystemChannelFlags(this.code and flag.code.inv()) /** * Returns an instance of [SystemChannelFlags] that has all bits set that are set in `this` * except the bits that are set in [flags]. */ public operator fun minus(flags: SystemChannelFlags): SystemChannelFlags = - SystemChannelFlags(this.code and flags.code.inv(), null) + SystemChannelFlags(this.code and flags.code.inv()) /** * Returns a copy of this instance of [SystemChannelFlags] modified with [builder]. @@ -400,24 +274,6 @@ public class SystemChannelFlags internal constructor( override fun toString(): String = "SystemChannelFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - message = "SystemChannelFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SystemChannelFlags is no longer a data class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun copy(code: Int = this.code): SystemChannelFlags = SystemChannelFlags(code, null) - public class Builder( private var code: Int = 0, ) { @@ -453,7 +309,7 @@ public class SystemChannelFlags internal constructor( * Returns an instance of [SystemChannelFlags] that has all bits set that are currently set * in this [Builder]. */ - public fun build(): SystemChannelFlags = SystemChannelFlags(code, null) + public fun build(): SystemChannelFlags = SystemChannelFlags(code) } internal object Serializer : KSerializer { @@ -468,27 +324,27 @@ public class SystemChannelFlags internal constructor( } override fun deserialize(decoder: Decoder): SystemChannelFlags = - SystemChannelFlags(decoder.decodeSerializableValue(delegate), null) + SystemChannelFlags(decoder.decodeSerializableValue(delegate)) } - public companion object NewCompanion { - @Suppress("DEPRECATION_ERROR") + public companion object { + @Suppress(names = arrayOf("DEPRECATION")) @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("SystemChannelFlags.serializer()", imports = ["dev.kord.common.entity.SystemChannelFlags"]), - DeprecationLevel.HIDDEN, + message = "Renamed to 'Companion'.", + replaceWith = ReplaceWith(expression = "SystemChannelFlags.Companion", imports = + arrayOf("dev.kord.common.entity.SystemChannelFlags")), ) @JvmField - public val Companion: Companion = Companion() + public val NewCompanion: NewCompanion = NewCompanion() } @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("SystemChannelFlags.serializer()", imports = ["dev.kord.common.entity.SystemChannelFlags"]), - DeprecationLevel.HIDDEN, + message = "Renamed to 'Companion'.", + replaceWith = ReplaceWith(expression = "SystemChannelFlags.Companion", imports = + arrayOf("dev.kord.common.entity.SystemChannelFlags")), ) - public class Companion internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this + public class NewCompanion internal constructor() { + public fun serializer(): KSerializer = SystemChannelFlags.serializer() } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TeamMembershipState.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TeamMembershipState.kt index 236f161c561a..665ec34572d6 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TeamMembershipState.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TeamMembershipState.kt @@ -40,17 +40,7 @@ public sealed class TeamMembershipState( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : TeamMembershipState(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'TeamMembershipState.from()'.", - replaceWith = ReplaceWith(expression = "TeamMembershipState.from(value)", imports = - arrayOf("dev.kord.common.entity.TeamMembershipState")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : TeamMembershipState(value) public object Invited : TeamMembershipState(1) @@ -87,7 +77,7 @@ public sealed class TeamMembershipState( public fun from(`value`: Int): TeamMembershipState = when (value) { 1 -> Invited 2 -> Accepted - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TextInputStyle.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TextInputStyle.kt index 1080721875a2..728d5a4a8128 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TextInputStyle.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/TextInputStyle.kt @@ -42,17 +42,7 @@ public sealed class TextInputStyle( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : TextInputStyle(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'TextInputStyle.from()'.", - replaceWith = ReplaceWith(expression = "TextInputStyle.from(value)", imports = - arrayOf("dev.kord.common.entity.TextInputStyle")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : TextInputStyle(value) /** * A single-line input. @@ -95,7 +85,7 @@ public sealed class TextInputStyle( public fun from(`value`: Int): TextInputStyle = when (value) { 1 -> Short 2 -> Paragraph - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/src/commonMain/kotlin/entity/UserFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserFlag.kt similarity index 53% rename from common/src/commonMain/kotlin/entity/UserFlag.kt rename to common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserFlag.kt index 3f8de6b72003..74dd701d3ad7 100644 --- a/common/src/commonMain/kotlin/entity/UserFlag.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserFlag.kt @@ -1,16 +1,13 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) package dev.kord.common.entity -import dev.kord.common.Class -import dev.kord.common.java import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract -import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer @@ -43,12 +40,12 @@ public sealed class UserFlag( /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` and [flag]. */ - public operator fun plus(flag: UserFlag): UserFlags = UserFlags(this.code or flag.code, null) + public operator fun plus(flag: UserFlag): UserFlags = UserFlags(this.code or flag.code) /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` and [flags]. */ - public operator fun plus(flags: UserFlags): UserFlags = UserFlags(this.code or flags.code, null) + public operator fun plus(flags: UserFlags): UserFlags = UserFlags(this.code or flags.code) final override fun equals(other: Any?): Boolean = this === other || (other is UserFlag && this.shift == other.shift) @@ -58,49 +55,6 @@ public sealed class UserFlag( final override fun toString(): String = if (this is Unknown) "UserFlag.Unknown(shift=$shift)" else "UserFlag.${this::class.simpleName}" - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = "UserFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith", "DEPRECATION_ERROR")) - @Deprecated(message = "UserFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun ordinal(): Int = when (this) { - DiscordEmployee -> 0 - DiscordPartner -> 1 - HypeSquad -> 2 - BugHunterLevel1 -> 3 - HouseBravery -> 4 - HouseBrilliance -> 5 - HouseBalance -> 6 - EarlySupporter -> 7 - TeamUser -> 8 - System -> 9 - BugHunterLevel2 -> 10 - VerifiedBot -> 11 - VerifiedBotDeveloper -> 12 - DiscordCertifiedModerator -> 13 - BotHttpInteractions -> 14 - ActiveDeveloper -> 15 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - message = "UserFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "UserFlag::class.java", imports = - arrayOf("dev.kord.common.entity.UserFlag")), - DeprecationLevel.HIDDEN, - ) - public fun getDeclaringClass(): Class = UserFlag::class.java - /** * An unknown [UserFlag]. * @@ -155,13 +109,6 @@ public sealed class UserFlag( */ public object TeamUser : UserFlag(10) - @Deprecated( - "'UserFlag.System' is no longer documented. You can still use it with 'UserFlag.fromShift(12)'.", - ReplaceWith("UserFlag.fromShift(12)", imports = ["dev.kord.common.entity.UserFlag"]), - DeprecationLevel.HIDDEN, - ) - public object System : UserFlag(12) - /** * Bug Hunter Level 2 */ @@ -207,7 +154,6 @@ public sealed class UserFlag( HouseBalance, EarlySupporter, TeamUser, - @Suppress("DEPRECATION_ERROR") System, BugHunterLevel2, VerifiedBot, VerifiedBotDeveloper, @@ -218,119 +164,6 @@ public sealed class UserFlag( } - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val DiscordEmployee: UserFlag = DiscordEmployee - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val DiscordPartner: UserFlag = DiscordPartner - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val HypeSquad: UserFlag = HypeSquad - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val BugHunterLevel1: UserFlag = BugHunterLevel1 - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val HouseBravery: UserFlag = HouseBravery - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val HouseBrilliance: UserFlag = HouseBrilliance - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val HouseBalance: UserFlag = HouseBalance - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val EarlySupporter: UserFlag = EarlySupporter - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val TeamUser: UserFlag = TeamUser - - @Suppress(names = arrayOf("DEPRECATION_ERROR")) - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val System: UserFlag = System - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val BugHunterLevel2: UserFlag = BugHunterLevel2 - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val VerifiedBot: UserFlag = VerifiedBot - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val VerifiedBotDeveloper: UserFlag = VerifiedBotDeveloper - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val DiscordCertifiedModerator: UserFlag = DiscordCertifiedModerator - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val BotHttpInteractions: UserFlag = BotHttpInteractions - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val ActiveDeveloper: UserFlag = ActiveDeveloper - /** * Returns an instance of [UserFlag] with [UserFlag.shift] equal to the specified [shift]. * @@ -346,7 +179,6 @@ public sealed class UserFlag( 8 -> HouseBalance 9 -> EarlySupporter 10 -> TeamUser - 12 -> @Suppress("DEPRECATION_ERROR") System 14 -> BugHunterLevel2 16 -> VerifiedBot 17 -> VerifiedBotDeveloper @@ -355,46 +187,6 @@ public sealed class UserFlag( 22 -> ActiveDeveloper else -> Unknown(shift) } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "UserFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - @JvmStatic - public open fun valueOf(name: String): UserFlag = when (name) { - "DiscordEmployee" -> DiscordEmployee - "DiscordPartner" -> DiscordPartner - "HypeSquad" -> HypeSquad - "BugHunterLevel1" -> BugHunterLevel1 - "HouseBravery" -> HouseBravery - "HouseBrilliance" -> HouseBrilliance - "HouseBalance" -> HouseBalance - "EarlySupporter" -> EarlySupporter - "TeamUser" -> TeamUser - "System" -> @Suppress("DEPRECATION_ERROR") System - "BugHunterLevel2" -> BugHunterLevel2 - "VerifiedBot" -> VerifiedBot - "VerifiedBotDeveloper" -> VerifiedBotDeveloper - "DiscordCertifiedModerator" -> DiscordCertifiedModerator - "BotHttpInteractions" -> BotHttpInteractions - "ActiveDeveloper" -> ActiveDeveloper - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - message = "UserFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "UserFlag.entries.toTypedArray()", imports = - arrayOf("dev.kord.common.entity.UserFlag")), - DeprecationLevel.HIDDEN, - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() } } @@ -466,17 +258,7 @@ public class UserFlags internal constructor( * The raw code used by Discord. */ public val code: Int, - @Suppress("UNUSED_PARAMETER") unused: Nothing?, ) { - // TODO uncomment annotation in DiscordUser.kt and delete this file when this constructor is removed after - // deprecation cycle - @Deprecated( - "Don't construct an instance of 'UserFlags' from a raw code. Use the factory functions described in the " + - "documentation instead.", - ReplaceWith("UserFlags.Builder(code).build()", "dev.kord.common.entity.UserFlags"), - DeprecationLevel.HIDDEN, - ) - public constructor(code: Int) : this(code, null) /** * A [Set] of all [UserFlag]s contained in this instance of [UserFlags]. */ @@ -491,17 +273,6 @@ public class UserFlags internal constructor( } } - /** - * @suppress - */ - @Deprecated( - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public val flags: List - get() = values.toList() - /** * Checks if this instance of [UserFlags] has all bits set that are set in [flag]. */ @@ -515,44 +286,41 @@ public class UserFlags internal constructor( /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` and [flag]. */ - public operator fun plus(flag: UserFlag): UserFlags = UserFlags(this.code or flag.code, null) + public operator fun plus(flag: UserFlag): UserFlags = UserFlags(this.code or flag.code) /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` and [flags]. */ - public operator fun plus(flags: UserFlags): UserFlags = UserFlags(this.code or flags.code, null) + public operator fun plus(flags: UserFlags): UserFlags = UserFlags(this.code or flags.code) /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` except the * bits that are set in [flag]. */ - public operator fun minus(flag: UserFlag): UserFlags = UserFlags(this.code and flag.code.inv(), null) + public operator fun minus(flag: UserFlag): UserFlags = UserFlags(this.code and flag.code.inv()) /** * Returns an instance of [UserFlags] that has all bits set that are set in `this` except the * bits that are set in [flags]. */ public operator fun minus(flags: UserFlags): UserFlags = - UserFlags(this.code and flags.code.inv(), null) + UserFlags(this.code and flags.code.inv()) /** * Returns a copy of this instance of [UserFlags] modified with [builder]. */ - @JvmName("copy0") // TODO other name when deprecated overload is removed public inline fun copy(builder: Builder.() -> Unit): UserFlags { contract { callsInPlace(builder, EXACTLY_ONCE) } return Builder(code).apply(builder).build() } - @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") @Deprecated( - "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.", level = DeprecationLevel.HIDDEN, + message = "Binary compatibility, keep for some releases.", ) - @kotlin.internal.LowPriorityInOverloadResolution - public inline fun copy(block: UserFlagsBuilder.() -> Unit): UserFlags { - contract { callsInPlace(block, EXACTLY_ONCE) } - return UserFlagsBuilder(code).apply(block).flags() + public inline fun copy0(builder: Builder.() -> Unit): UserFlags { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return copy(builder) } override fun equals(other: Any?): Boolean = this === other || @@ -562,35 +330,6 @@ public class UserFlags internal constructor( override fun toString(): String = "UserFlags(values=$values)" - /** - * @suppress - */ - @Deprecated( - message = "UserFlags is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public operator fun component1(): Int = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = "UserFlags is no longer a data class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun copy(code: Int = this.code): UserFlags = UserFlags(code, null) - - @Deprecated( - "Renamed to 'Builder'.", - ReplaceWith("UserFlags.Builder", imports = ["dev.kord.common.entity.UserFlags"]), - DeprecationLevel.HIDDEN, - ) - public class UserFlagsBuilder(code: Int = 0) { - private val delegate = Builder(code) - public operator fun UserFlag.unaryPlus(): Unit = with(delegate) { unaryPlus() } - public operator fun UserFlag.unaryMinus(): Unit = with(delegate) { unaryMinus() } - public fun flags(): UserFlags = delegate.build() - } - public class Builder( private var code: Int = 0, ) { @@ -626,7 +365,7 @@ public class UserFlags internal constructor( * Returns an instance of [UserFlags] that has all bits set that are currently set in this * [Builder]. */ - public fun build(): UserFlags = UserFlags(code, null) + public fun build(): UserFlags = UserFlags(code) } internal object Serializer : KSerializer { @@ -640,27 +379,7 @@ public class UserFlags internal constructor( } override fun deserialize(decoder: Decoder): UserFlags = - UserFlags(decoder.decodeSerializableValue(delegate), null) - } - - public companion object { - @Suppress("DEPRECATION_ERROR") - @Deprecated( - "Renamed to 'Companion', which no longer implements 'KSerializer'.", - ReplaceWith("UserFlags.serializer()", imports = ["dev.kord.common.entity.UserFlags"]), - DeprecationLevel.HIDDEN, - ) - @JvmField - public val UserFlagsSerializer: UserFlagsSerializer = UserFlagsSerializer() - } - - @Deprecated( - "Renamed to 'Companion', which no longer implements 'KSerializer'.", - ReplaceWith("UserFlags.serializer()", imports = ["dev.kord.common.entity.UserFlags"]), - DeprecationLevel.HIDDEN, - ) - public class UserFlagsSerializer internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this + UserFlags(decoder.decodeSerializableValue(delegate)) } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserPremium.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserPremium.kt index b1522902a317..2685d0933e6c 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserPremium.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserPremium.kt @@ -41,17 +41,7 @@ public sealed class UserPremium( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : UserPremium(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'UserPremium.from()'.", - replaceWith = ReplaceWith(expression = "UserPremium.from(value)", imports = - arrayOf("dev.kord.common.entity.UserPremium")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : UserPremium(value) public object None : UserPremium(0) @@ -95,7 +85,7 @@ public sealed class UserPremium( 1 -> NitroClassic 2 -> Nitro 3 -> NitroBasic - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VerificationLevel.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VerificationLevel.kt index b53fec62b30a..3c0a0d3a8902 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VerificationLevel.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VerificationLevel.kt @@ -40,17 +40,7 @@ public sealed class VerificationLevel( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : VerificationLevel(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'VerificationLevel.from()'.", - replaceWith = ReplaceWith(expression = "VerificationLevel.from(value)", imports = - arrayOf("dev.kord.common.entity.VerificationLevel")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : VerificationLevel(value) /** * Unrestricted. @@ -114,7 +104,7 @@ public sealed class VerificationLevel( 2 -> Medium 3 -> High 4 -> VeryHigh - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VideoQualityMode.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VideoQualityMode.kt index f293c39ff57c..81da7010891c 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VideoQualityMode.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/VideoQualityMode.kt @@ -40,17 +40,7 @@ public sealed class VideoQualityMode( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : VideoQualityMode(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'VideoQualityMode.from()'.", - replaceWith = ReplaceWith(expression = "VideoQualityMode.from(value)", imports = - arrayOf("dev.kord.common.entity.VideoQualityMode")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : VideoQualityMode(value) /** * Discord chooses the quality for optimal performance. @@ -93,7 +83,7 @@ public sealed class VideoQualityMode( public fun from(`value`: Int): VideoQualityMode = when (value) { 1 -> Auto 2 -> Full - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/WebhookType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/WebhookType.kt index 32b1165d33dd..98d320a05b19 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/WebhookType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/WebhookType.kt @@ -39,17 +39,7 @@ public sealed class WebhookType( */ public class Unknown internal constructor( `value`: Int, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : WebhookType(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'WebhookType.from()'.", - replaceWith = ReplaceWith(expression = "WebhookType.from(value)", imports = - arrayOf("dev.kord.common.entity.WebhookType")), - ) - public constructor(`value`: Int) : this(value, null) - } + ) : WebhookType(value) /** * Incoming Webhooks can post messages to channels with a generated token. @@ -99,7 +89,7 @@ public sealed class WebhookType( 1 -> Incoming 2 -> ChannelFollower 3 -> Application - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/common/src/commonMain/kotlin/Class.kt b/common/src/commonMain/kotlin/Class.kt deleted file mode 100644 index fb84e24915dd..000000000000 --- a/common/src/commonMain/kotlin/Class.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dev.kord.common - -import dev.kord.common.annotation.KordInternal -import kotlin.reflect.KClass - -// TODO remove when enum artifacts are removed from generated flags - -/** @suppress */ -@Suppress("unused") -public expect class Class - -/** @suppress */ -@KordInternal -public expect val KClass.java: Class diff --git a/common/src/commonMain/kotlin/DiscordBitSet.kt b/common/src/commonMain/kotlin/DiscordBitSet.kt index ece22501c9db..2cb7d9c75efa 100644 --- a/common/src/commonMain/kotlin/DiscordBitSet.kt +++ b/common/src/commonMain/kotlin/DiscordBitSet.kt @@ -152,6 +152,6 @@ public fun DiscordBitSet(value: String): DiscordBitSet { @Deprecated( "Replaced by 'DiscordBitSet.serializer()'.", ReplaceWith("DiscordBitSet.serializer()", imports = ["dev.kord.common.DiscordBitSet"]), - DeprecationLevel.WARNING, + DeprecationLevel.ERROR, ) public object DiscordBitSetSerializer : KSerializer by DiscordBitSet.Serializer diff --git a/common/src/commonMain/kotlin/Locale.kt b/common/src/commonMain/kotlin/Locale.kt index d17e5000bfa3..6393d6f3d607 100644 --- a/common/src/commonMain/kotlin/Locale.kt +++ b/common/src/commonMain/kotlin/Locale.kt @@ -239,7 +239,7 @@ public data class Locale(val language: String, val country: String? = null) { @Deprecated( "Replaced by 'Locale.serializer()'.", ReplaceWith("Locale.serializer()", imports = ["dev.kord.common.Locale"]), - DeprecationLevel.WARNING, + DeprecationLevel.ERROR, ) public object Serializer : KSerializer by NewSerializer diff --git a/common/src/commonMain/kotlin/entity/DiscordActivity.kt b/common/src/commonMain/kotlin/entity/DiscordActivity.kt index 524c80639af7..ec278b3f3227 100644 --- a/common/src/commonMain/kotlin/entity/DiscordActivity.kt +++ b/common/src/commonMain/kotlin/entity/DiscordActivity.kt @@ -11,7 +11,6 @@ ], ) -/* @file:Generate( INT_FLAGS, name = "ActivityFlag", docUrl = "https://discord.com/developers/docs/topics/gateway-events#activity-object-activity-flags", @@ -27,7 +26,6 @@ Entry(name = "Embedded", shift = 8), ], ) -*/ package dev.kord.common.entity @@ -36,6 +34,7 @@ import dev.kord.common.entity.optional.OptionalBoolean import dev.kord.common.entity.optional.OptionalSnowflake import dev.kord.common.serialization.InstantInEpochMilliseconds import dev.kord.ksp.Generate +import dev.kord.ksp.Generate.EntityType.INT_FLAGS import dev.kord.ksp.Generate.EntityType.INT_KORD_ENUM import dev.kord.ksp.Generate.Entry import kotlinx.serialization.* diff --git a/common/src/commonMain/kotlin/entity/DiscordApplication.kt b/common/src/commonMain/kotlin/entity/DiscordApplication.kt index 7d6c1d39459c..c0858c209566 100644 --- a/common/src/commonMain/kotlin/entity/DiscordApplication.kt +++ b/common/src/commonMain/kotlin/entity/DiscordApplication.kt @@ -1,6 +1,5 @@ @file:Generate( - INT_FLAGS, name = "ApplicationFlag", valueName = "code", wasEnum = true, collectionWasDataClass = true, - hadFlagsProperty = true, builderHadFlagsFunction = true, + INT_FLAGS, name = "ApplicationFlag", valueName = "code", docUrl = "https://discord.com/developers/docs/resources/application#application-object-application-flags", entries = [ Entry( @@ -64,9 +63,6 @@ import dev.kord.ksp.Generate.EntityType.INT_FLAGS import dev.kord.ksp.Generate.Entry import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlin.contracts.InvocationKind -import kotlin.contracts.contract -import kotlin.jvm.JvmName public sealed interface BaseDiscordApplication { public val id: Snowflake @@ -167,37 +163,6 @@ public data class DiscordPartialApplication( override val roleConnectionsVerificationUrl: Optional = Optional.Missing(), ) : BaseDiscordApplication -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ApplicationFlags") -public inline fun applicationFlags(builder: ApplicationFlags.Builder.() -> Unit): ApplicationFlags { - contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - return ApplicationFlags.Builder().apply(builder).build() -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ApplicationFlags") -public fun applicationFlags(vararg flags: ApplicationFlag): ApplicationFlags = ApplicationFlags { - flags.forEach { +it } -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ApplicationFlags") -public fun applicationFlags(vararg flags: ApplicationFlags): ApplicationFlags = ApplicationFlags { - flags.forEach { +it } -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ApplicationFlags") -public fun applicationFlags(flags: Iterable): ApplicationFlags = ApplicationFlags { - flags.forEach { +it } -} - -@Suppress("FunctionName") -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun ApplicationFlagsWithIterable(flags: Iterable): ApplicationFlags = ApplicationFlags { - flags.forEach { +it } -} - @Serializable public data class InstallParams( /** The scopes to add the application to the server with. */ diff --git a/common/src/commonMain/kotlin/entity/DiscordChannel.kt b/common/src/commonMain/kotlin/entity/DiscordChannel.kt index 1ab958590d3c..0f5ed66a903d 100644 --- a/common/src/commonMain/kotlin/entity/DiscordChannel.kt +++ b/common/src/commonMain/kotlin/entity/DiscordChannel.kt @@ -45,8 +45,7 @@ ) @file:Generate( - INT_FLAGS, name = "ChannelFlag", valueName = "code", wasEnum = true, collectionWasDataClass = true, - hadFlagsProperty = true, + INT_FLAGS, name = "ChannelFlag", valueName = "code", docUrl = "https://discord.com/developers/docs/resources/channel#channel-object-channel-flags", entries = [ Entry( @@ -60,7 +59,7 @@ "[GuildForum][ChannelType.GuildForum] or [GuildMedia][ChannelType.GuildMedia] channel.", ), Entry( - "HideMediaDownloadOptions", shift = 15, noStaticFieldIfEntityWasEnum = true, + "HideMediaDownloadOptions", shift = 15, kDoc = "When set hides the embedded media download options. Available only for " + "[GuildMedia][ChannelType.GuildMedia] channels.", ), @@ -122,9 +121,6 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder import kotlin.LazyThreadSafetyMode.PUBLICATION -import kotlin.contracts.InvocationKind -import kotlin.contracts.contract -import kotlin.jvm.JvmName import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes @@ -191,29 +187,6 @@ public data class DiscordChannel( val message: Optional = Optional.Missing(), ) -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ChannelFlags") -public inline fun channelFlags(builder: ChannelFlags.Builder.() -> Unit): ChannelFlags { - contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - return ChannelFlags.Builder().apply(builder).build() -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ChannelFlags") -public fun channelFlags(vararg flags: ChannelFlag): ChannelFlags = ChannelFlags { flags.forEach { +it } } - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ChannelFlags") -public fun channelFlags(vararg flags: ChannelFlags): ChannelFlags = ChannelFlags { flags.forEach { +it } } - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("ChannelFlags") -public fun channelFlags(flags: Iterable): ChannelFlags = ChannelFlags { flags.forEach { +it } } - -@Suppress("FunctionName") -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun ChannelFlags0(flags: Iterable): ChannelFlags = ChannelFlags { flags.forEach { +it } } - @Serializable public data class Overwrite( val id: Snowflake, @@ -262,7 +235,7 @@ public sealed class ArchiveDuration( @Deprecated( "Replaced by 'ArchiveDuration.from()'.", ReplaceWith("ArchiveDuration.from(duration)", imports = ["dev.kord.common.entity.ArchiveDuration"]), - DeprecationLevel.WARNING, + DeprecationLevel.ERROR, ) public constructor(duration: Duration) : this(duration, unused = null) } diff --git a/common/src/commonMain/kotlin/entity/DiscordGuild.kt b/common/src/commonMain/kotlin/entity/DiscordGuild.kt index ba01d3189363..7c9e24ddf662 100644 --- a/common/src/commonMain/kotlin/entity/DiscordGuild.kt +++ b/common/src/commonMain/kotlin/entity/DiscordGuild.kt @@ -150,9 +150,9 @@ ], ) -/* @file:Generate( INT_FLAGS, name = "SystemChannelFlag", valueName = "code", + collectionHadNewCompanion = true, docUrl = "https://discord.com/developers/docs/resources/guild#guild-object-system-channel-flags", entries = [ Entry("SuppressJoinNotifications", shift = 0, kDoc = "Suppress member join notifications."), @@ -169,7 +169,6 @@ ), ], ) -*/ package dev.kord.common.entity diff --git a/common/src/commonMain/kotlin/entity/DiscordGuildOnboarding.kt b/common/src/commonMain/kotlin/entity/DiscordGuildOnboarding.kt index 734fd452e05a..a0dc52a09888 100644 --- a/common/src/commonMain/kotlin/entity/DiscordGuildOnboarding.kt +++ b/common/src/commonMain/kotlin/entity/DiscordGuildOnboarding.kt @@ -1,5 +1,5 @@ @file:Generate( - INT_KORD_ENUM, name = "OnboardingMode", unknownConstructorWasPublic = false, + INT_KORD_ENUM, name = "OnboardingMode", kDoc = "Defines the criteria used to satisfy Onboarding constraints that are required for enabling.", docUrl = "https://discord.com/developers/docs/resources/guild#guild-onboarding-object-onboarding-mode", entries = [ diff --git a/common/src/commonMain/kotlin/entity/DiscordMessage.kt b/common/src/commonMain/kotlin/entity/DiscordMessage.kt index 79a9df2a9494..6cd1a5bc853e 100644 --- a/common/src/commonMain/kotlin/entity/DiscordMessage.kt +++ b/common/src/commonMain/kotlin/entity/DiscordMessage.kt @@ -37,8 +37,7 @@ ) @file:Generate( - INT_FLAGS, name = "MessageFlag", valueName = "code", wasEnum = true, collectionWasDataClass = true, - hadFlagsProperty = true, builderHadFlagsFunction = true, + INT_FLAGS, name = "MessageFlag", valueName = "code", docUrl = "https://discord.com/developers/docs/resources/channel#message-object-message-flags", entries = [ Entry( @@ -136,9 +135,6 @@ import dev.kord.ksp.Generate.Entry import kotlinx.datetime.Instant import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlin.contracts.InvocationKind -import kotlin.contracts.contract -import kotlin.jvm.JvmName /** * Represents [a message sent in a channel within Discord](https://discord.com/developers/docs/resources/channel#message-object). @@ -407,37 +403,6 @@ public data class DiscordMentionedChannel( val name: String, ) -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("MessageFlags") -public inline fun messageFlags(builder: MessageFlags.Builder.() -> Unit): MessageFlags { - contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - return MessageFlags.Builder().apply(builder).build() -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("MessageFlags") -public fun messageFlags(vararg flags: MessageFlag): MessageFlags = MessageFlags { - flags.forEach { +it } -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("MessageFlags") -public fun messageFlags(vararg flags: MessageFlags): MessageFlags = MessageFlags { - flags.forEach { +it } -} - -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -@JvmName("MessageFlags") -public fun messageFlags(flags: Iterable): MessageFlags = MessageFlags { - flags.forEach { +it } -} - -@Suppress("FunctionName") -@Deprecated("Binary compatibility. Keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun MessageFlagsWithIterable(flags: Iterable): MessageFlags = MessageFlags { - flags.forEach { +it } -} - /** * A representation of a [Discord Attachment structure](https://discord.com/developers/docs/resources/channel#attachment-object). * diff --git a/common/src/commonMain/kotlin/entity/DiscordSelectDefaultValue.kt b/common/src/commonMain/kotlin/entity/DiscordSelectDefaultValue.kt index e59c21c1cb37..7931bef20272 100644 --- a/common/src/commonMain/kotlin/entity/DiscordSelectDefaultValue.kt +++ b/common/src/commonMain/kotlin/entity/DiscordSelectDefaultValue.kt @@ -1,5 +1,5 @@ @file:Generate( - STRING_KORD_ENUM, name = "SelectDefaultValueType", unknownConstructorWasPublic = false, + STRING_KORD_ENUM, name = "SelectDefaultValueType", docUrl = "https://discord.com/developers/docs/interactions/message-components#select-menu-object-select-default-value-structure", entries = [ Entry("User", stringValue = "user"), diff --git a/common/src/commonMain/kotlin/entity/DiscordShard.kt b/common/src/commonMain/kotlin/entity/DiscordShard.kt index a83ecd5746a3..eaf659a54817 100644 --- a/common/src/commonMain/kotlin/entity/DiscordShard.kt +++ b/common/src/commonMain/kotlin/entity/DiscordShard.kt @@ -32,23 +32,23 @@ public data class DiscordShard(val index: Int, val count: Int) { } } - public companion object NewCompanion { - @Suppress("DEPRECATION_ERROR") + public companion object { + @Suppress("DEPRECATION") @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("DiscordShard.serializer()", imports = ["dev.kord.common.entity.DiscordShard"]), - DeprecationLevel.HIDDEN, + "Renamed to 'Companion'.", + ReplaceWith("DiscordShard.Companion", imports = ["dev.kord.common.entity.DiscordShard"]), + DeprecationLevel.WARNING, ) @JvmField - public val Companion: Companion = Companion() + public val NewCompanion: NewCompanion = NewCompanion() } @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("DiscordShard.serializer()", imports = ["dev.kord.common.entity.DiscordShard"]), - DeprecationLevel.HIDDEN, + "Renamed to 'Companion'.", + ReplaceWith("DiscordShard.Companion", imports = ["dev.kord.common.entity.DiscordShard"]), + DeprecationLevel.WARNING, ) - public class Companion internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this + public class NewCompanion internal constructor() { + public fun serializer(): KSerializer = DiscordShard.serializer() } } diff --git a/common/src/commonMain/kotlin/entity/DiscordUser.kt b/common/src/commonMain/kotlin/entity/DiscordUser.kt index 9b13380a2d85..a891325d4ee2 100644 --- a/common/src/commonMain/kotlin/entity/DiscordUser.kt +++ b/common/src/commonMain/kotlin/entity/DiscordUser.kt @@ -10,10 +10,9 @@ ], ) -/* @file:Generate( INT_FLAGS, name = "UserFlag", valueName = "code", - hadFlagsProperty = true, + collectionHadCopy0 = true, docUrl = "https://discord.com/developers/docs/resources/user#user-object-user-flags", entries = [ Entry("DiscordEmployee", shift = 0, kDoc = "Discord Employee"), @@ -39,13 +38,13 @@ ), ], ) -*/ package dev.kord.common.entity import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.OptionalBoolean import dev.kord.ksp.Generate +import dev.kord.ksp.Generate.EntityType.INT_FLAGS import dev.kord.ksp.Generate.EntityType.INT_KORD_ENUM import dev.kord.ksp.Generate.Entry import kotlinx.serialization.ExperimentalSerializationApi @@ -144,14 +143,3 @@ public data class DiscordOptionallyMemberUser( @JsonNames("member", "guild_member") val member: Optional = Optional.Missing(), ) - -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") -@Deprecated( - "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.", - level = DeprecationLevel.HIDDEN, -) -@kotlin.internal.LowPriorityInOverloadResolution -public inline fun UserFlags(builder: UserFlags.UserFlagsBuilder.() -> Unit): UserFlags { - contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - return UserFlags.UserFlagsBuilder().apply(builder).flags() -} diff --git a/common/src/commonMain/kotlin/entity/Interactions.kt b/common/src/commonMain/kotlin/entity/Interactions.kt index c537524d5728..b13acaf279ef 100644 --- a/common/src/commonMain/kotlin/entity/Interactions.kt +++ b/common/src/commonMain/kotlin/entity/Interactions.kt @@ -78,7 +78,6 @@ package dev.kord.common.entity import dev.kord.common.Locale -import dev.kord.common.annotation.KordExperimental import dev.kord.common.entity.optional.* import dev.kord.ksp.Generate import dev.kord.ksp.Generate.EntityType.INT_KORD_ENUM @@ -148,21 +147,6 @@ public data class ApplicationCommandOption( val maxLength: OptionalInt = OptionalInt.Missing ) -/** - * A serializer whose sole purpose is to provide a No-Op serializer for [Any]. - * The serializer is used when the generic type is neither known nor relevant to the serialization process - * - * e.g: `Choice<@Serializable(NotSerializable::class) Any?>` - * The serialization is handled by [Choice] serializer instead where we don't care about the generic type. - */ -@Deprecated("This is no longer used, deprecated without a replacement.", level = DeprecationLevel.HIDDEN) -@KordExperimental -public object NotSerializable : KSerializer { - override fun deserialize(decoder: Decoder): Nothing = error("This operation is not supported.") - override val descriptor: SerialDescriptor = String.serializer().descriptor - override fun serialize(encoder: Encoder, value: Any?): Nothing = error("This operation is not supported.") -} - @Serializable(Choice.Serializer::class) public sealed class Choice { @@ -241,12 +225,6 @@ public sealed class Choice { } } } - - public companion object { - @Suppress("UNUSED_PARAMETER") - @Deprecated("Choice is no longer generic", ReplaceWith("this.serializer()"), DeprecationLevel.HIDDEN) - public fun serializer(typeSerial0: KSerializer): KSerializer = serializer() - } } @Serializable @@ -712,17 +690,7 @@ public data class DiscordGuildApplicationCommandPermission( @Serializable public data class DiscordAutoComplete( val choices: List, -) { - public companion object { - @Suppress("UNUSED_PARAMETER") - @Deprecated( - "DiscordAutoComplete is no longer generic", - ReplaceWith("this.serializer()"), - DeprecationLevel.HIDDEN, - ) - public fun serializer(typeSerial0: KSerializer): KSerializer = serializer() - } -} +) @Serializable public data class DiscordModal( diff --git a/common/src/commonMain/kotlin/entity/Member.kt b/common/src/commonMain/kotlin/entity/Member.kt index a37a5dc6a98b..cbcd9e5ee677 100644 --- a/common/src/commonMain/kotlin/entity/Member.kt +++ b/common/src/commonMain/kotlin/entity/Member.kt @@ -1,4 +1,3 @@ -/* @file:Generate( INT_FLAGS, name = "GuildMemberFlag", valueName = "code", docUrl = "https://discord.com/developers/docs/resources/guild#guild-member-object-guild-member-flags", @@ -9,13 +8,15 @@ Entry("StartedOnboarding", shift = 3, kDoc = "Member has started onboarding."), ], ) -*/ package dev.kord.common.entity import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.OptionalBoolean import dev.kord.common.entity.optional.OptionalSnowflake +import dev.kord.ksp.Generate +import dev.kord.ksp.Generate.EntityType.INT_FLAGS +import dev.kord.ksp.Generate.Entry import kotlinx.datetime.Instant import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/entity/Permissions.kt b/common/src/commonMain/kotlin/entity/Permissions.kt index 7cdb15ffa357..b3e91e25b2dc 100644 --- a/common/src/commonMain/kotlin/entity/Permissions.kt +++ b/common/src/commonMain/kotlin/entity/Permissions.kt @@ -1,6 +1,6 @@ -/* @file:Generate( BIT_SET_FLAGS, name = "Permission", valueName = "code", + collectionHadCopy0 = true, collectionHadNewCompanion = true, hadBuilderFactoryFunction0 = true, docUrl = "https://discord.com/developers/docs/topics/permissions", entries = [ Entry("CreateInstantInvite", shift = 0, kDoc = "Allows creation of instant invites."), @@ -98,11 +98,22 @@ Entry("SendVoiceMessages", shift = 46, kDoc = "Allows sending voice messages."), ], ) -*/ package dev.kord.common.entity +import dev.kord.ksp.Generate +import dev.kord.ksp.Generate.EntityType.BIT_SET_FLAGS +import dev.kord.ksp.Generate.Entry + private val ALL_PERMISSIONS = Permissions(flags = Permission.entries) /** All known [Permission]s (as contained in [Permission.entries]) combined into a single [Permissions] instance. */ +public val Permissions.Companion.ALL: Permissions get() = ALL_PERMISSIONS + +@Suppress("UnusedReceiverParameter", "DEPRECATION") +@Deprecated( + "'Permissions.NewCompanion' was renamed to 'Permissions.Companion'. Use 'Permissions.Companion.ALL' instead.", + ReplaceWith("Permissions.ALL", imports = ["dev.kord.common.entity.Permissions", "dev.kord.common.entity.ALL"]), + DeprecationLevel.WARNING, +) public val Permissions.NewCompanion.ALL: Permissions get() = ALL_PERMISSIONS diff --git a/common/src/commonMain/kotlin/entity/Team.kt b/common/src/commonMain/kotlin/entity/Team.kt index 4b86b6c5185a..5a31dbee5ed0 100644 --- a/common/src/commonMain/kotlin/entity/Team.kt +++ b/common/src/commonMain/kotlin/entity/Team.kt @@ -1,5 +1,5 @@ @file:Generate( - STRING_KORD_ENUM, name = "TeamMemberRole", unknownConstructorWasPublic = false, + STRING_KORD_ENUM, name = "TeamMemberRole", docUrl = "https://discord.com/developers/docs/topics/teams#team-member-roles", entries = [ Entry( diff --git a/common/src/commonTest/kotlin/json/PermissionsTest.kt b/common/src/commonTest/kotlin/json/PermissionsTest.kt index b6491f7181a3..291985a2aec2 100644 --- a/common/src/commonTest/kotlin/json/PermissionsTest.kt +++ b/common/src/commonTest/kotlin/json/PermissionsTest.kt @@ -20,13 +20,6 @@ class PermissionsTest { } } - @Test - @JsName("test2") - fun `Permission All does not swallow the universe`() { - @Suppress("DEPRECATION_ERROR") - Permission.All //oh yeah, this is worthy of a test - } - @Test @JsName("test3") fun `permissions serialization test`() { diff --git a/common/src/jvmMain/kotlin/Class.kt b/common/src/jvmMain/kotlin/Class.kt deleted file mode 100644 index d3bcf912a04f..000000000000 --- a/common/src/jvmMain/kotlin/Class.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dev.kord.common - -import dev.kord.common.annotation.KordInternal -import kotlin.reflect.KClass -import kotlin.jvm.java as getJavaClass - -/** @suppress */ -public actual typealias Class = java.lang.Class - -/** @suppress */ -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@kotlin.internal.InlineOnly -@KordInternal -public actual inline val KClass.java: Class inline get() = getJavaClass diff --git a/common/src/nonJvmMain/kotlin/Class.kt b/common/src/nonJvmMain/kotlin/Class.kt deleted file mode 100644 index 1fab50094fd6..000000000000 --- a/common/src/nonJvmMain/kotlin/Class.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dev.kord.common - -import dev.kord.common.annotation.KordInternal -import kotlin.reflect.KClass - -/** @suppress */ -@Suppress("ACTUAL_WITHOUT_EXPECT") -public actual typealias Class = KClass - -/** @suppress */ -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@kotlin.internal.InlineOnly -@KordInternal -public actual inline val KClass.java: Class inline get() = this diff --git a/core/api/core.api b/core/api/core.api index daa638174d4c..a535d1f6dd6d 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -153,11 +153,8 @@ public final class dev/kord/core/Unsafe { public final class dev/kord/core/UtilKt { public static final fun enableEvent (Ldev/kord/gateway/Intents$Builder;Lkotlin/reflect/KClass;)V - public static final synthetic fun enableEvent (Ldev/kord/gateway/Intents$IntentsBuilder;Lkotlin/reflect/KClass;)V public static final fun enableEvents (Ldev/kord/gateway/Intents$Builder;Ljava/lang/Iterable;)V public static final fun enableEvents (Ldev/kord/gateway/Intents$Builder;[Lkotlin/reflect/KClass;)V - public static final synthetic fun enableEvents (Ldev/kord/gateway/Intents$IntentsBuilder;Ljava/lang/Iterable;)V - public static final synthetic fun enableEvents (Ldev/kord/gateway/Intents$IntentsBuilder;[Lkotlin/reflect/KClass;)V } public abstract interface class dev/kord/core/behavior/ApplicationCommandBehavior : dev/kord/core/entity/Entity { @@ -6565,7 +6562,6 @@ public final class dev/kord/core/entity/Message : dev/kord/core/behavior/Message public final fun getAuthor ()Ldev/kord/core/entity/User; public final fun getAuthorAsMember (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public final fun getAuthorAsMemberOrNull (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final synthetic fun getAuthorAsMemberOrThrow (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun getChannel ()Ldev/kord/core/behavior/channel/MessageChannelBehavior; public fun getChannel (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun getChannelId ()Ldev/kord/common/entity/Snowflake; @@ -7058,7 +7054,6 @@ public final class dev/kord/core/entity/TeamMember { public final fun getData ()Ldev/kord/core/cache/data/TeamMemberData; public final fun getKord ()Ldev/kord/core/Kord; public final fun getMembershipState ()Ldev/kord/common/entity/TeamMembershipState; - public final synthetic fun getPermissions ()Ljava/util/List; public final fun getRole ()Ldev/kord/common/entity/TeamMemberRole; public final fun getTeamId ()Ldev/kord/common/entity/Snowflake; public final fun getUser (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -9050,10 +9045,6 @@ public abstract class dev/kord/core/entity/component/SelectMenuComponent : dev/k public fun toString ()Ljava/lang/String; } -public final class dev/kord/core/entity/component/SelectMenuComponentKt { - public static final synthetic fun getOptions (Ldev/kord/core/entity/component/StringSelectComponent;)Ljava/util/List; -} - public final class dev/kord/core/entity/component/SelectOption { public fun (Ldev/kord/core/cache/data/SelectOptionData;)V public fun equals (Ljava/lang/Object;)Z diff --git a/core/src/commonMain/kotlin/Kord.kt b/core/src/commonMain/kotlin/Kord.kt index 5cb81af8cf20..1e14ac8ea2f4 100644 --- a/core/src/commonMain/kotlin/Kord.kt +++ b/core/src/commonMain/kotlin/Kord.kt @@ -39,7 +39,7 @@ import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.channels.Channel as CoroutineChannel -@Deprecated("Use your own logger instead, this will be removed in the future.", level = DeprecationLevel.WARNING) +@Deprecated("Use your own logger instead, this will be removed in the future.", level = DeprecationLevel.ERROR) public val kordLogger: mu.KLogger = mu.KotlinLogging.logger { } private val logger = KotlinLogging.logger { } diff --git a/core/src/commonMain/kotlin/Util.kt b/core/src/commonMain/kotlin/Util.kt index a0da8b6a8a82..7daf72aa5da1 100644 --- a/core/src/commonMain/kotlin/Util.kt +++ b/core/src/commonMain/kotlin/Util.kt @@ -1,6 +1,5 @@ package dev.kord.core -import dev.kord.common.annotation.KordInternal import dev.kord.common.entity.Snowflake import dev.kord.core.entity.Message import dev.kord.core.entity.channel.thread.ThreadChannel @@ -244,10 +243,6 @@ internal fun paginateThreads( */ public inline fun Intents.Builder.enableEvent(): Unit = enableEvent(T::class) -@Suppress("DEPRECATION_ERROR") -@Deprecated("'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN) -public inline fun Intents.IntentsBuilder.enableEvent(): Unit = enableEvent0(T::class) - /** * Adds the necessary [Intent]s to receive the specified types of [events] in all variations and with all data * available. @@ -261,11 +256,6 @@ public inline fun Intents.IntentsBuilder.enableEvent(): Unit public fun Intents.Builder.enableEvents(events: Iterable>): Unit = events.forEach { enableEvent(it) } -@Suppress("DEPRECATION_ERROR") -@Deprecated("'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN) -public fun Intents.IntentsBuilder.enableEvents(events: Iterable>): Unit = - events.forEach { enableEvent0(it) } - /** * Adds the necessary [Intent]s to receive the specified types of [events] in all variations and with all data * available. @@ -279,11 +269,6 @@ public fun Intents.IntentsBuilder.enableEvents(events: Iterable): Unit = events.forEach { enableEvent(it) } -@Suppress("DEPRECATION_ERROR") -@Deprecated("'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN) -public fun Intents.IntentsBuilder.enableEvents(vararg events: KClass): Unit = - events.forEach { enableEvent0(it) } - /** * Adds the necessary [Intent]s to receive the specified type of [event] in all variations and with all data available. * @@ -461,18 +446,5 @@ public fun Intents.Builder.enableEvent(event: KClass): Unit = when (e else -> Unit } -@Suppress("DEPRECATION_ERROR") -@Deprecated("'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN) -public fun Intents.IntentsBuilder.enableEvent(event: KClass) { - enableEvent0(event) -} - -@Suppress("DEPRECATION_ERROR") -@PublishedApi -@KordInternal -internal fun Intents.IntentsBuilder.enableEvent0(event: KClass) { - +(Intents.Builder(flags().code).apply { enableEvent(event) }.build()) -} - // Replacement of Objects.hash internal fun hash(vararg values: Any?) = values.contentHashCode() diff --git a/core/src/commonMain/kotlin/entity/Message.kt b/core/src/commonMain/kotlin/entity/Message.kt index 911a23bddd29..3669a1488788 100644 --- a/core/src/commonMain/kotlin/entity/Message.kt +++ b/core/src/commonMain/kotlin/entity/Message.kt @@ -305,9 +305,6 @@ public class Message( */ override suspend fun asMessage(): Message = this - @Deprecated("Renamed to 'getAuthorAsMember'.", ReplaceWith("this.getAuthorAsMember()"), DeprecationLevel.HIDDEN) - public suspend fun getAuthorAsMemberOrThrow(): Member = getAuthorAsMember() - /** * Requests to get the [author] as a member. * diff --git a/core/src/commonMain/kotlin/entity/Team.kt b/core/src/commonMain/kotlin/entity/Team.kt index 58c4329b98eb..894e9ae9c345 100644 --- a/core/src/commonMain/kotlin/entity/Team.kt +++ b/core/src/commonMain/kotlin/entity/Team.kt @@ -76,18 +76,6 @@ public class TeamMember(public val data: TeamMemberData, public val kord: Kord) */ public val membershipState: TeamMembershipState get() = data.membershipState - /** - * A collection of permissions granted to this member. - * At the moment, this collection will only have one element: `*`, meaning the member has all permissions. - * This is because right now there are no other permissions. Read mode [here](https://discord.com/developers/docs/topics/teams#data-models-team-members-object) - */ - @Deprecated( - "'permissions' was never different from `[\"*\"]`. It is now replaced by 'role'.", - ReplaceWith("this.role"), - DeprecationLevel.HIDDEN, - ) - public val permissions: List get() = listOf("*") - /** * The unique ID that this member belongs to. */ diff --git a/core/src/commonMain/kotlin/entity/component/SelectMenuComponent.kt b/core/src/commonMain/kotlin/entity/component/SelectMenuComponent.kt index 1bbb41aeff96..0862a09aa412 100644 --- a/core/src/commonMain/kotlin/entity/component/SelectMenuComponent.kt +++ b/core/src/commonMain/kotlin/entity/component/SelectMenuComponent.kt @@ -58,11 +58,6 @@ public class StringSelectComponent(data: ComponentData) : SelectMenuComponent(da public val options: List get() = data.options.orEmpty().map { SelectOption(it) } } -/** The possible options to choose from. */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -@Deprecated("Replaced by member in StringSelectComponent.", ReplaceWith("this.options"), DeprecationLevel.HIDDEN) -public val StringSelectComponent.options: List get() = options - public class UserSelectComponent(data: ComponentData) : SelectMenuComponent(data) { override val type: ComponentType.UserSelect get() = ComponentType.UserSelect diff --git a/gateway/api/gateway.api b/gateway/api/gateway.api index 9596d77efeff..c16823edfd44 100644 --- a/gateway/api/gateway.api +++ b/gateway/api/gateway.api @@ -1021,12 +1021,7 @@ public final class dev/kord/gateway/Heartbeat : dev/kord/gateway/Event { public fun toString ()Ljava/lang/String; } -public final class dev/kord/gateway/Heartbeat$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/gateway/Heartbeat; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/gateway/Heartbeat;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class dev/kord/gateway/Heartbeat$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -1198,7 +1193,6 @@ public final class dev/kord/gateway/Intent$AutoModerationExecution : dev/kord/ga public final class dev/kord/gateway/Intent$Companion { public final fun fromShift (I)Ldev/kord/gateway/Intent; public final fun getEntries ()Ljava/util/List; - public final synthetic fun getValues ()Ljava/util/Set; } public final class dev/kord/gateway/Intent$DirectMessageTyping : dev/kord/gateway/Intent { @@ -1213,10 +1207,6 @@ public final class dev/kord/gateway/Intent$DirectMessagesReactions : dev/kord/ga public static final field INSTANCE Ldev/kord/gateway/Intent$DirectMessagesReactions; } -public final class dev/kord/gateway/Intent$GuildBans : dev/kord/gateway/Intent { - public static final field INSTANCE Ldev/kord/gateway/Intent$GuildBans; -} - public final class dev/kord/gateway/Intent$GuildEmojis : dev/kord/gateway/Intent { public static final field INSTANCE Ldev/kord/gateway/Intent$GuildEmojis; } @@ -1278,26 +1268,21 @@ public final class dev/kord/gateway/Intent$Unknown : dev/kord/gateway/Intent { public final class dev/kord/gateway/IntentKt { public static final fun Intents (Ljava/lang/Iterable;)Ldev/kord/gateway/Intents; - public static final synthetic fun Intents (Ljava/lang/String;)Ldev/kord/gateway/Intents; - public static final synthetic fun Intents (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; + public static final fun Intents (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; public static final fun Intents ([Ldev/kord/gateway/Intent;)Ldev/kord/gateway/Intents; public static final fun Intents ([Ldev/kord/gateway/Intents;)Ldev/kord/gateway/Intents; public static synthetic fun Intents$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/kord/gateway/Intents; public static final fun Intents0 (Ljava/lang/Iterable;)Ldev/kord/gateway/Intents; - public static final fun Intents0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; + public static final synthetic fun Intents0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; public static synthetic fun Intents0$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/kord/gateway/Intents; - public static final synthetic fun IntentsWithIterable (Ljava/lang/Iterable;)Ldev/kord/gateway/Intents; } public final class dev/kord/gateway/Intents { public static final field Companion Ldev/kord/gateway/Intents$Companion; - public final synthetic fun component1 ()Ldev/kord/common/DiscordBitSet; public final fun contains (Ldev/kord/gateway/Intent;)Z public final fun contains (Ldev/kord/gateway/Intents;)Z - public final synthetic fun copy (Ldev/kord/common/DiscordBitSet;)Ldev/kord/gateway/Intents; - public final synthetic fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; - public static synthetic fun copy$default (Ldev/kord/gateway/Intents;Ldev/kord/common/DiscordBitSet;ILjava/lang/Object;)Ldev/kord/gateway/Intents; - public final fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; + public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; + public final synthetic fun copy0 (Lkotlin/jvm/functions/Function1;)Ldev/kord/gateway/Intents; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()Ldev/kord/common/DiscordBitSet; public final fun getValues ()Ljava/util/Set; @@ -1321,24 +1306,9 @@ public final class dev/kord/gateway/Intents$Builder { } public final class dev/kord/gateway/Intents$Companion { - public final synthetic fun getAll ()Ldev/kord/gateway/Intents; - public final synthetic fun getNonPrivileged ()Ldev/kord/gateway/Intents; - public final synthetic fun getNone ()Ldev/kord/gateway/Intents; - public final synthetic fun getPrivileged ()Ldev/kord/gateway/Intents; public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/gateway/Intents$IntentsBuilder { - public fun ()V - public fun (Ldev/kord/common/DiscordBitSet;)V - public synthetic fun (Ldev/kord/common/DiscordBitSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun flags ()Ldev/kord/gateway/Intents; - public final fun unaryMinus (Ldev/kord/gateway/Intent;)V - public final fun unaryMinus (Ldev/kord/gateway/Intents;)V - public final fun unaryPlus (Ldev/kord/gateway/Intent;)V - public final fun unaryPlus (Ldev/kord/gateway/Intents;)V -} - public final class dev/kord/gateway/IntentsKt { public static final fun getALL (Ldev/kord/gateway/Intents$Companion;)Ldev/kord/gateway/Intents; public static final fun getNONE (Ldev/kord/gateway/Intents$Companion;)Ldev/kord/gateway/Intents; @@ -1346,15 +1316,6 @@ public final class dev/kord/gateway/IntentsKt { public static final fun getPRIVILEGED (Ldev/kord/gateway/Intents$Companion;)Ldev/kord/gateway/Intents; } -public final class dev/kord/gateway/IntentsSerializer : kotlinx/serialization/KSerializer { - public static final field INSTANCE Ldev/kord/gateway/IntentsSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/gateway/Intents; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/gateway/Intents;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V -} - public final class dev/kord/gateway/InteractionCreate : dev/kord/gateway/DispatchEvent { public fun (Ldev/kord/common/entity/DiscordInteraction;Ljava/lang/Integer;)V public final fun component1 ()Ldev/kord/common/entity/DiscordInteraction; @@ -1522,7 +1483,6 @@ public final class dev/kord/gateway/OpCode : java/lang/Enum { public static final field Hello Ldev/kord/gateway/OpCode; public static final field Identify Ldev/kord/gateway/OpCode; public static final field InvalidSession Ldev/kord/gateway/OpCode; - public static final field OpCodeSerializer Ldev/kord/gateway/OpCode$OpCodeSerializer; public static final field Reconnect Ldev/kord/gateway/OpCode; public static final field RequestGuildMembers Ldev/kord/gateway/OpCode; public static final field Resume Ldev/kord/gateway/OpCode; @@ -1539,15 +1499,6 @@ public final class dev/kord/gateway/OpCode$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class dev/kord/gateway/OpCode$OpCodeSerializer : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/kord/gateway/OpCode; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/kord/gateway/OpCode;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - public final class dev/kord/gateway/PresenceUpdate : dev/kord/gateway/DispatchEvent { public fun (Ldev/kord/common/entity/DiscordPresenceUpdate;Ljava/lang/Integer;)V public final fun component1 ()Ldev/kord/common/entity/DiscordPresenceUpdate; @@ -1972,8 +1923,8 @@ public final class dev/kord/gateway/builder/LoginBuilder { public final fun getIntents ()Ldev/kord/gateway/Intents; public final fun getName ()Ljava/lang/String; public final fun getPresence ()Ldev/kord/gateway/DiscordPresence; - public final synthetic fun intents (Lkotlin/jvm/functions/Function1;)V - public final fun intents0 (Lkotlin/jvm/functions/Function1;)V + public final fun intents (Lkotlin/jvm/functions/Function1;)V + public final synthetic fun intents0 (Lkotlin/jvm/functions/Function1;)V public final fun presence (Lkotlin/jvm/functions/Function1;)V public final fun setIntents (Ldev/kord/gateway/Intents;)V public final fun setName (Ljava/lang/String;)V diff --git a/gateway/src/commonMain/kotlin/Intent.kt b/gateway/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/gateway/Intent.kt similarity index 75% rename from gateway/src/commonMain/kotlin/Intent.kt rename to gateway/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/gateway/Intent.kt index c3ffc92c478b..c3c12993ab6a 100644 --- a/gateway/src/commonMain/kotlin/Intent.kt +++ b/gateway/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/gateway/Intent.kt @@ -1,3 +1,4 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! @file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) @@ -54,8 +55,8 @@ public sealed class Intent( final override fun hashCode(): Int = shift.hashCode() - final override fun toString(): String = if (this is Unknown) "Intent.Unknown(shift=$shift)" else - "Intent.${this::class.simpleName}" + final override fun toString(): String = if (this is Unknown) "Intent.Unknown(shift=$shift)" + else "Intent.${this::class.simpleName}" /** * An unknown [Intent]. @@ -99,13 +100,6 @@ public sealed class Intent( @PrivilegedIntent public object GuildMembers : Intent(1) - @Deprecated( - "Renamed to 'GuildModeration'.", - ReplaceWith("Intent.GuildModeration", imports = ["dev.kord.gateway.Intent"]), - DeprecationLevel.HIDDEN, - ) - public object GuildBans : Intent(2) - /** * Enables the following events: * - [GuildAuditLogEntryCreate] @@ -278,14 +272,6 @@ public sealed class Intent( ) } - // TODO uncomment annotation in Intents.kt and delete this file when this property is removed after deprecation - // cycle - @Deprecated( - "Renamed to 'entries'.", - ReplaceWith("Intent.entries", imports = ["dev.kord.gateway.Intent"]), - DeprecationLevel.HIDDEN, - ) - public val values: Set get() = entries.toSet() /** * Returns an instance of [Intent] with [Intent.shift] equal to the specified [shift]. @@ -432,21 +418,18 @@ public class Intents internal constructor( /** * Returns a copy of this instance of [Intents] modified with [builder]. */ - @JvmName("copy0") // TODO other name when deprecated overload is removed public inline fun copy(builder: Builder.() -> Unit): Intents { contract { callsInPlace(builder, EXACTLY_ONCE) } return Builder(code.copy()).apply(builder).build() } - @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") @Deprecated( - "'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN, + message = "Binary compatibility, keep for some releases.", ) - @kotlin.internal.LowPriorityInOverloadResolution - public inline fun copy(block: IntentsBuilder.() -> Unit): Intents { - contract { callsInPlace(block, EXACTLY_ONCE) } - return IntentsBuilder(code.copy()).apply(block).flags() + public inline fun copy0(builder: Builder.() -> Unit): Intents { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return copy(builder) } override fun equals(other: Any?): Boolean = this === other || @@ -456,37 +439,6 @@ public class Intents internal constructor( override fun toString(): String = "Intents(values=$values)" - /** - * @suppress - */ - @Deprecated( - message = "Intents is no longer a data class.", - replaceWith = ReplaceWith(expression = "this.code", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public operator fun component1(): DiscordBitSet = code - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = "Intents is no longer a data class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun copy(code: DiscordBitSet = this.code): Intents = Intents(code) - - @Deprecated( - "Renamed to 'Builder'.", - ReplaceWith("Intents.Builder", imports = ["dev.kord.gateway.Intents"]), - DeprecationLevel.HIDDEN, - ) - public class IntentsBuilder(code: DiscordBitSet = EmptyBitSet()) { - private val delegate = Builder(code) - public operator fun Intents.unaryPlus(): Unit = with(delegate) { unaryPlus() } - public operator fun Intent.unaryPlus(): Unit = with(delegate) { unaryPlus() } - public operator fun Intent.unaryMinus(): Unit = with(delegate) { unaryMinus() } - public operator fun Intents.unaryMinus(): Unit = with(delegate) { unaryMinus() } - public fun flags(): Intents = delegate.build() - } - public class Builder( private val code: DiscordBitSet = EmptyBitSet(), ) { @@ -538,65 +490,24 @@ public class Intents internal constructor( override fun deserialize(decoder: Decoder): Intents = Intents(decoder.decodeSerializableValue(delegate)) } - - public companion object { - @Deprecated( - "Renamed to 'ALL'", - ReplaceWith("Intents.ALL", imports = [" dev.kord.gateway.Intents", " dev.kord.gateway.ALL"]), - DeprecationLevel.HIDDEN, - ) - @PrivilegedIntent - public val all: Intents get() = ALL - - @Deprecated( - "Renamed to 'PRIVILEGED'", - ReplaceWith("Intents.PRIVILEGED", imports = [" dev.kord.gateway.Intents", " dev.kord.gateway.PRIVILEGED"]), - DeprecationLevel.HIDDEN, - ) - @PrivilegedIntent - public val privileged: Intents get() = PRIVILEGED - - @Deprecated( - "Renamed to 'NON_PRIVILEGED'", - ReplaceWith( - "Intents.NON_PRIVILEGED", - imports = [" dev.kord.gateway.Intents", " dev.kord.gateway.NON_PRIVILEGED"], - ), - DeprecationLevel.HIDDEN, - ) - public val nonPrivileged: Intents get() = NON_PRIVILEGED - - @Deprecated( - "Renamed to 'NONE'", - ReplaceWith("Intents.NONE", imports = [" dev.kord.gateway.Intents", " dev.kord.gateway.NONE"]), - DeprecationLevel.HIDDEN, - ) - public val none: Intents get() = NONE - } } -@Deprecated( - "Replaced by 'Intents.serializer()'.", - ReplaceWith("Intents.serializer()", imports = ["dev.kord.gateway.Intents"]), - DeprecationLevel.HIDDEN, -) -public object IntentsSerializer : KSerializer by Intents.Serializer - /** * Returns an instance of [Intents] built with [Intents.Builder]. */ -@JvmName("Intents0") // TODO other name when deprecated overload is removed public inline fun Intents(builder: Intents.Builder.() -> Unit = {}): Intents { contract { callsInPlace(builder, EXACTLY_ONCE) } return Intents.Builder().apply(builder).build() } -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR") -@Deprecated("'Intents.IntentsBuilder' is deprecated, use 'Intents.Builder' instead.", level = DeprecationLevel.HIDDEN) -@kotlin.internal.LowPriorityInOverloadResolution -public inline fun Intents(builder: Intents.IntentsBuilder.() -> Unit = {}): Intents { +@Suppress(names = arrayOf("FunctionName")) +@Deprecated( + level = DeprecationLevel.HIDDEN, + message = "Binary compatibility, keep for some releases.", +) +public inline fun Intents0(builder: Intents.Builder.() -> Unit = {}): Intents { contract { callsInPlace(builder, EXACTLY_ONCE) } - return Intents.IntentsBuilder().apply(builder).flags() + return Intents(builder) } /** @@ -627,19 +538,3 @@ public fun Intents(flags: Iterable): Intents = Intents { public fun Intents(flags: Iterable): Intents = Intents { flags.forEach { +it } } - -// TODO uncomment annotation in Intents.kt and delete this file when these functions are removed after deprecation cycle -@Suppress("FunctionName") -@Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun IntentsWithIterable(flags: Iterable): Intents = Intents(flags) - -@Deprecated( - "Don't construct an instance of 'Intents' from a raw value. Use the factory functions described in the " + - "documentation instead.", - ReplaceWith( - "Intents.Builder(DiscordBitSet(value)).build()", - imports = ["dev.kord.gateway.Intents", "dev.kord.common.DiscordBitSet"], - ), - DeprecationLevel.HIDDEN, -) -public fun Intents(value: String): Intents = Intents(DiscordBitSet(value)) diff --git a/gateway/src/commonMain/kotlin/Event.kt b/gateway/src/commonMain/kotlin/Event.kt index 7fcbf145600a..6ff21779fc09 100644 --- a/gateway/src/commonMain/kotlin/Event.kt +++ b/gateway/src/commonMain/kotlin/Event.kt @@ -591,24 +591,24 @@ public data class Heartbeat(val data: Long) : Event() { override fun deserialize(decoder: Decoder) = Heartbeat(decoder.decodeLong()) } - public companion object NewCompanion { - @Suppress("DEPRECATION_ERROR") + public companion object { + @Suppress("DEPRECATION") @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("Heartbeat.serializer()", imports = ["dev.kord.gateway.Heartbeat"]), - DeprecationLevel.HIDDEN, + "Renamed to 'Companion'.", + ReplaceWith("Heartbeat.Companion", imports = ["dev.kord.gateway.Heartbeat"]), + DeprecationLevel.WARNING, ) @JvmField - public val Companion: Companion = Companion() + public val NewCompanion: NewCompanion = NewCompanion() } @Deprecated( - "Renamed to 'NewCompanion', which no longer implements 'KSerializer'.", - ReplaceWith("Heartbeat.serializer()", imports = ["dev.kord.gateway.Heartbeat"]), - DeprecationLevel.HIDDEN, + "Renamed to 'Companion'.", + ReplaceWith("Heartbeat.Companion", imports = ["dev.kord.gateway.Heartbeat"]), + DeprecationLevel.WARNING, ) - public class Companion internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this + public class NewCompanion internal constructor() { + public fun serializer(): KSerializer = Heartbeat.serializer() } } diff --git a/gateway/src/commonMain/kotlin/Gateway.kt b/gateway/src/commonMain/kotlin/Gateway.kt index 886c874bc223..577e260e31ee 100644 --- a/gateway/src/commonMain/kotlin/Gateway.kt +++ b/gateway/src/commonMain/kotlin/Gateway.kt @@ -140,7 +140,7 @@ public suspend inline fun Gateway.start(token: String, config: GatewayConfigurat } @Suppress("unused") -@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.WARNING) +@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR) @PublishedApi internal val gatewayOnLogger: mu.KLogger = mu.KotlinLogging.logger("Gateway.on") diff --git a/gateway/src/commonMain/kotlin/Intents.kt b/gateway/src/commonMain/kotlin/Intents.kt index e6c8223c1cd7..07a4a41410dc 100644 --- a/gateway/src/commonMain/kotlin/Intents.kt +++ b/gateway/src/commonMain/kotlin/Intents.kt @@ -1,6 +1,6 @@ -/* @file:Generate( BIT_SET_FLAGS, name = "Intent", valueName = "code", + collectionHadCopy0 = true, hadBuilderFactoryFunction0 = true, kDoc = "Values that enable a group of events as defined by Discord.", docUrl = "https://discord.com/developers/docs/topics/gateway#gateway-intents", entries = [ @@ -204,14 +204,7 @@ import kotlin.annotation.AnnotationRetention.BINARY import kotlin.annotation.AnnotationTarget.* private const val privilegedIntentAnnotation = "dev.kord.gateway.PrivilegedIntent" -*/ -package dev.kord.gateway - -import dev.kord.gateway.Intent.* -import kotlin.RequiresOptIn.Level.ERROR -import kotlin.annotation.AnnotationRetention.BINARY -import kotlin.annotation.AnnotationTarget.* /** * Some [Intent]s are defined as "privileged" due to the sensitive nature of the data and cannot be used by Kord without diff --git a/gateway/src/commonMain/kotlin/OpCode.kt b/gateway/src/commonMain/kotlin/OpCode.kt index 20d722d50788..1cd07f46d862 100644 --- a/gateway/src/commonMain/kotlin/OpCode.kt +++ b/gateway/src/commonMain/kotlin/OpCode.kt @@ -6,7 +6,6 @@ import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import kotlin.jvm.JvmField @Serializable(with = OpCode.Serializer::class) public enum class OpCode(public val code: Int) { @@ -74,24 +73,4 @@ public enum class OpCode(public val code: Int) { private val entriesByCode = entries.associateBy { it.code } override fun deserialize(decoder: Decoder) = entriesByCode[decoder.decodeInt()] ?: Unknown } - - public companion object { - @Suppress("DEPRECATION_ERROR") - @Deprecated( - "Renamed to 'Companion', which no longer implements 'KSerializer'.", - ReplaceWith("OpCode.serializer()", imports = ["dev.kord.gateway.OpCode"]), - DeprecationLevel.HIDDEN, - ) - @JvmField - public val OpCodeSerializer: OpCodeSerializer = OpCodeSerializer() - } - - @Deprecated( - "Renamed to 'Companion', which no longer implements 'KSerializer'.", - ReplaceWith("OpCode.serializer()", imports = ["dev.kord.gateway.OpCode"]), - DeprecationLevel.HIDDEN, - ) - public class OpCodeSerializer internal constructor() : KSerializer by Serializer { - public fun serializer(): KSerializer = this - } } diff --git a/gateway/src/commonMain/kotlin/Utils.kt b/gateway/src/commonMain/kotlin/Utils.kt index 7240b425b3c6..18cca4075a0e 100644 --- a/gateway/src/commonMain/kotlin/Utils.kt +++ b/gateway/src/commonMain/kotlin/Utils.kt @@ -3,6 +3,6 @@ package dev.kord.gateway import mu.KLogger @Suppress("DeprecatedCallableAddReplaceWith") -@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.WARNING) +@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR) @PublishedApi internal fun KLogger.error(throwable: Throwable): Unit = error(throwable) { "" } diff --git a/gateway/src/commonMain/kotlin/builder/LoginBuilder.kt b/gateway/src/commonMain/kotlin/builder/LoginBuilder.kt index 37c3065488ca..d52f91c4a982 100644 --- a/gateway/src/commonMain/kotlin/builder/LoginBuilder.kt +++ b/gateway/src/commonMain/kotlin/builder/LoginBuilder.kt @@ -7,7 +7,6 @@ import dev.kord.gateway.Intents import dev.kord.gateway.NON_PRIVILEGED import kotlin.contracts.InvocationKind import kotlin.contracts.contract -import kotlin.jvm.JvmName public data class Shards(val totalShards: Int, val indices: Iterable = 0.. Unit) { + public inline fun intents(builder: Intents.Builder.() -> Unit) { contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - this.intents = Intents.IntentsBuilder().apply(builder).flags() + this.intents = Intents(builder) } - @JvmName("intents0") // TODO other name when deprecated overload is removed - public inline fun intents(builder: Intents.Builder.() -> Unit) { + @Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN) + public inline fun intents0(builder: Intents.Builder.() -> Unit) { contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) } - this.intents = Intents(builder) + intents(builder) } } diff --git a/ksp-annotations/src/commonMain/kotlin/Generate.kt b/ksp-annotations/src/commonMain/kotlin/Generate.kt index 07183ec10fdb..cfdb7ce71878 100644 --- a/ksp-annotations/src/commonMain/kotlin/Generate.kt +++ b/ksp-annotations/src/commonMain/kotlin/Generate.kt @@ -24,12 +24,9 @@ annotation class Generate( val valueName: String = "value", // for migration only, will be removed eventually - val wasEnum: Boolean = false, - val collectionWasDataClass: Boolean = false, - val hadFlagsProperty: Boolean = false, - val flagsPropertyWasSet: Boolean = false, - val builderHadFlagsFunction: Boolean = false, - val unknownConstructorWasPublic: Boolean = true, + val collectionHadCopy0: Boolean = false, + val collectionHadNewCompanion: Boolean = false, + val hadBuilderFactoryFunction0: Boolean = false, ) { enum class EntityType { INT_KORD_ENUM, STRING_KORD_ENUM, INT_FLAGS, BIT_SET_FLAGS } @@ -50,8 +47,5 @@ annotation class Generate( val deprecated: Deprecated = Deprecated(""), /** [RequiresOptIn] annotations to add to this entry. */ val requiresOptInAnnotations: Array = [], - - // for migration only, will be removed eventually - val noStaticFieldIfEntityWasEnum: Boolean = false, ) } diff --git a/ksp-processors/src/main/kotlin/generation/GenerationEntity.kt b/ksp-processors/src/main/kotlin/generation/GenerationEntity.kt index cc690783fd04..1d887e879b7c 100644 --- a/ksp-processors/src/main/kotlin/generation/GenerationEntity.kt +++ b/ksp-processors/src/main/kotlin/generation/GenerationEntity.kt @@ -26,7 +26,6 @@ internal sealed class GenerationEntity( class KordEnum( name: String, kDoc: String?, docUrl: String, valueName: String, entries: List, override val valueType: ValueType, - val unknownConstructorWasPublic: Boolean, ) : GenerationEntity(name, kDoc, docUrl, valueName, entries) { enum class ValueType : GenerationEntity.ValueType { INT, STRING } } @@ -34,11 +33,9 @@ internal sealed class GenerationEntity( class BitFlags( name: String, kDoc: String?, docUrl: String, valueName: String, entries: List, override val valueType: ValueType, - val wasEnum: Boolean, - val collectionWasDataClass: Boolean, - val hadFlagsProperty: Boolean, - val flagsPropertyWasSet: Boolean, - val builderHadFlagsFunction: Boolean, + val collectionHadCopy0: Boolean, + val collectionHadNewCompanion: Boolean, + val hadBuilderFactoryFunction0: Boolean, ) : GenerationEntity(name, kDoc, docUrl, valueName, entries) { enum class ValueType : GenerationEntity.ValueType { INT, BIT_SET } } @@ -49,7 +46,6 @@ internal sealed class GenerationEntity( val value: Comparable<*>, val deprecated: Deprecated?, val requiresOptInAnnotations: List, - val noStaticFieldIfEntityWasEnum: Boolean, ) } @@ -70,10 +66,9 @@ internal fun Generate.toGenerationEntityOrNull(logger: KSPLogger, annotation: KS val validParameters = when (entityType) { INT_KORD_ENUM, STRING_KORD_ENUM -> areNotSpecified( - Generate::wasEnum, Generate::collectionWasDataClass, Generate::hadFlagsProperty, - Generate::flagsPropertyWasSet, Generate::builderHadFlagsFunction, + Generate::collectionHadCopy0, Generate::collectionHadNewCompanion, Generate::hadBuilderFactoryFunction0, ) - INT_FLAGS, BIT_SET_FLAGS -> areNotSpecified(Generate::unknownConstructorWasPublic) + INT_FLAGS, BIT_SET_FLAGS -> true } val mappedEntries = (entries zip args[Generate::entries]!!).mapNotNull { (entry, annotation) -> @@ -85,19 +80,15 @@ internal fun Generate.toGenerationEntityOrNull(logger: KSPLogger, annotation: KS } else { val kDoc = kDoc.toKDoc() when (entityType) { - INT_KORD_ENUM -> KordEnum( - name, kDoc, docUrl, valueName, mappedEntries, KordEnum.ValueType.INT, unknownConstructorWasPublic, - ) - STRING_KORD_ENUM -> KordEnum( - name, kDoc, docUrl, valueName, mappedEntries, KordEnum.ValueType.STRING, unknownConstructorWasPublic, - ) + INT_KORD_ENUM -> KordEnum(name, kDoc, docUrl, valueName, mappedEntries, KordEnum.ValueType.INT) + STRING_KORD_ENUM -> KordEnum(name, kDoc, docUrl, valueName, mappedEntries, KordEnum.ValueType.STRING) INT_FLAGS -> BitFlags( - name, kDoc, docUrl, valueName, mappedEntries, BitFlags.ValueType.INT, wasEnum, collectionWasDataClass, - hadFlagsProperty, flagsPropertyWasSet, builderHadFlagsFunction, + name, kDoc, docUrl, valueName, mappedEntries, BitFlags.ValueType.INT, collectionHadCopy0, + collectionHadNewCompanion, hadBuilderFactoryFunction0, ) BIT_SET_FLAGS -> BitFlags( - name, kDoc, docUrl, valueName, mappedEntries, BitFlags.ValueType.BIT_SET, wasEnum, - collectionWasDataClass, hadFlagsProperty, flagsPropertyWasSet, builderHadFlagsFunction, + name, kDoc, docUrl, valueName, mappedEntries, BitFlags.ValueType.BIT_SET, collectionHadCopy0, + collectionHadNewCompanion, hadBuilderFactoryFunction0, ) } } @@ -165,6 +156,5 @@ private fun Entry.toGenerationEntityEntryOrNull( } else { requiresOptInAnnotations.toList() }, - noStaticFieldIfEntityWasEnum, ) } diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/BitFlagsGeneration.kt b/ksp-processors/src/main/kotlin/generation/bitflags/BitFlagsGeneration.kt index 276d69b79390..10ae5f009c25 100644 --- a/ksp-processors/src/main/kotlin/generation/bitflags/BitFlagsGeneration.kt +++ b/ksp-processors/src/main/kotlin/generation/bitflags/BitFlagsGeneration.kt @@ -1,9 +1,10 @@ package dev.kord.ksp.generation.bitflags import com.google.devtools.ksp.symbol.KSFile -import com.squareup.kotlinpoet.* +import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.KModifier.* import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy +import com.squareup.kotlinpoet.SET import com.squareup.kotlinpoet.ksp.addOriginatingKSFile import dev.kord.ksp.* import dev.kord.ksp.generation.GenerationEntity.BitFlags @@ -11,6 +12,7 @@ import dev.kord.ksp.generation.GenerationEntity.BitFlags.ValueType.BIT_SET import dev.kord.ksp.generation.GenerationEntity.BitFlags.ValueType.INT import dev.kord.ksp.generation.shared.* import kotlinx.serialization.Serializable +import com.squareup.kotlinpoet.INT as INT_CN context(GenerationContext) internal val BitFlags.collectionCN @@ -53,17 +55,7 @@ internal fun BitFlags.generateFileSpec(originatingFile: KSFile) = fileSpecForGen addPlus(parameterName = "flags", parameterType = collectionCN) addEqualsAndHashCodeBasedOnClassAndSingleProperty(entityCN, property = "shift", isFinal = true) addEntityToString(property = "shift") - if (wasEnum) { - addDeprecatedEntityEnumArtifacts() - } - addClass("Unknown") { - addSharedUnknownClassContent() - primaryConstructor { - addModifiers(INTERNAL) - addParameter("shift") - } - addSuperclassConstructorParameter("shift") - } + addUnknownClass(constructorParameterName = "shift", constructorParameterType = INT_CN) addEntityEntries() addCompanionObject { addSharedCompanionObjectContent() @@ -83,9 +75,6 @@ internal fun BitFlags.generateFileSpec(originatingFile: KSFile) = fileSpecForGen addStatement("else·->·Unknown(shift)") } } - if (wasEnum) { - addDeprecatedEntityCompanionObjectEnumArtifacts() - } } } addClass(collectionCN) { @@ -122,23 +111,6 @@ internal fun BitFlags.generateFileSpec(originatingFile: KSFile) = fileSpecForGen } } } - if (hadFlagsProperty) { - val type = (if (flagsPropertyWasSet) SET else LIST).parameterizedBy(entityCN) - addProperty("flags", type, PUBLIC) { - addKdoc("@suppress") - @OptIn(DelicateKotlinPoetApi::class) - addAnnotation( - Deprecated( - "Renamed to 'values'.", - ReplaceWith("this.values", imports = emptyArray()), - DeprecationLevel.HIDDEN, - ) - ) - getter { - addStatement(if (flagsPropertyWasSet) "return values" else "return values.toList()") - } - } - } addContains(parameterName = "flag", parameterType = entityCN) addContains(parameterName = "flags", parameterType = collectionCN) addPlus(parameterName = "flag", parameterType = entityCN) @@ -146,17 +118,20 @@ internal fun BitFlags.generateFileSpec(originatingFile: KSFile) = fileSpecForGen addMinus(parameterName = "flag", parameterType = entityCN) addMinus(parameterName = "flags", parameterType = collectionCN) addCopy() + if (collectionHadCopy0) { + addCopy0() + } addEqualsAndHashCodeBasedOnClassAndSingleProperty(collectionCN, property = valueName) addFunction("toString") { addModifiers(OVERRIDE) returns() addStatement("return \"${collectionCN.simpleName}(values=\$values)\"") } - if (collectionWasDataClass) { - addDeprecatedDataClassArtifacts() - } addBuilder() addSerializer() + if (collectionHadNewCompanion) { + addDeprecatedNewCompanion() + } } addFactoryFunctions() } diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/Builder.kt b/ksp-processors/src/main/kotlin/generation/bitflags/Builder.kt index e422f48472dd..5bccf4fe2b39 100644 --- a/ksp-processors/src/main/kotlin/generation/bitflags/Builder.kt +++ b/ksp-processors/src/main/kotlin/generation/bitflags/Builder.kt @@ -1,7 +1,6 @@ package dev.kord.ksp.generation.bitflags import com.squareup.kotlinpoet.ClassName -import com.squareup.kotlinpoet.DelicateKotlinPoetApi import com.squareup.kotlinpoet.KModifier.* import com.squareup.kotlinpoet.TypeSpec import dev.kord.ksp.* @@ -47,21 +46,6 @@ internal fun TypeSpec.Builder.addBuilder() = addClass(builderCN) { } addStatement("return %T($valueName$valueCopy)", collectionCN) } - if (builderHadFlagsFunction) { - addFunction("flags") { - addKdoc("@suppress") - @OptIn(DelicateKotlinPoetApi::class) - addAnnotation( - Deprecated( - "Renamed to 'build'", - ReplaceWith("this.build()", imports = emptyArray()), - DeprecationLevel.HIDDEN, - ) - ) - returns(collectionCN) - addStatement("return build()") - } - } } context(GenerationContext) diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/ContainsPlusMinusCopy.kt b/ksp-processors/src/main/kotlin/generation/bitflags/ContainsPlusMinusCopy.kt index 51c4fb730af6..2ab53bcd7106 100644 --- a/ksp-processors/src/main/kotlin/generation/bitflags/ContainsPlusMinusCopy.kt +++ b/ksp-processors/src/main/kotlin/generation/bitflags/ContainsPlusMinusCopy.kt @@ -1,10 +1,8 @@ package dev.kord.ksp.generation.bitflags +import com.squareup.kotlinpoet.* import com.squareup.kotlinpoet.KModifier.* -import com.squareup.kotlinpoet.LambdaTypeName -import com.squareup.kotlinpoet.TypeName -import com.squareup.kotlinpoet.TypeSpec -import com.squareup.kotlinpoet.UNIT +import dev.kord.ksp.addAnnotation import dev.kord.ksp.addFunction import dev.kord.ksp.generation.GenerationEntity.BitFlags import dev.kord.ksp.generation.GenerationEntity.BitFlags.ValueType.BIT_SET @@ -78,3 +76,15 @@ internal fun TypeSpec.Builder.addCopy() = addFunction("copy") { } addStatement("return·%T($valueName$valueCopy).apply(builder).build()", builderCN) } + +// TODO remove eventually +context(BitFlags, GenerationContext) +internal fun TypeSpec.Builder.addCopy0() = addFunction("copy0") { + @OptIn(DelicateKotlinPoetApi::class) + addAnnotation(Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN)) + addModifiers(PUBLIC, INLINE) + addParameter("builder", type = LambdaTypeName.get(receiver = builderCN, returnType = UNIT)) + returns(collectionCN) + addStatement("%M·{·callsInPlace(builder,·%M)·}", CONTRACT, EXACTLY_ONCE) + addStatement("return·copy(builder)") +} diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/DataClassArtifacts.kt b/ksp-processors/src/main/kotlin/generation/bitflags/DataClassArtifacts.kt deleted file mode 100644 index 7fcce1b78c83..000000000000 --- a/ksp-processors/src/main/kotlin/generation/bitflags/DataClassArtifacts.kt +++ /dev/null @@ -1,47 +0,0 @@ -package dev.kord.ksp.generation.bitflags - -import com.squareup.kotlinpoet.DelicateKotlinPoetApi -import com.squareup.kotlinpoet.KModifier.OPERATOR -import com.squareup.kotlinpoet.KModifier.PUBLIC -import com.squareup.kotlinpoet.TypeSpec -import dev.kord.ksp.addAnnotation -import dev.kord.ksp.addFunction -import dev.kord.ksp.addParameter -import dev.kord.ksp.generation.GenerationEntity.BitFlags -import dev.kord.ksp.generation.shared.GenerationContext - -// TODO bump LEVEL and remove this file eventually -private val LEVEL = DeprecationLevel.HIDDEN - -context(BitFlags, GenerationContext) -@OptIn(DelicateKotlinPoetApi::class) -internal fun TypeSpec.Builder.addDeprecatedDataClassArtifacts() { - addFunction("component1") { - addKdoc("@suppress") - addAnnotation( - Deprecated( - "${collectionCN.simpleName} is no longer a data class.", - ReplaceWith("this.$valueName", imports = emptyArray()), - LEVEL, - ) - ) - addModifiers(PUBLIC, OPERATOR) - returns(valueCN) - addStatement("return $valueName") - } - addFunction("copy") { - addKdoc("@suppress") - addAnnotation(Suppress("DeprecatedCallableAddReplaceWith")) - addAnnotation( - Deprecated( - "${collectionCN.simpleName} is no longer a data class. Deprecated without a replacement.", - level = LEVEL, - ) - ) - addParameter(valueName, valueCN) { - defaultValue("this.$valueName") - } - returns(collectionCN) - addStatement("return %T($valueName)", collectionCN) - } -} diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/DeprecatedNewCompanion.kt b/ksp-processors/src/main/kotlin/generation/bitflags/DeprecatedNewCompanion.kt new file mode 100644 index 000000000000..f7aea6ff1884 --- /dev/null +++ b/ksp-processors/src/main/kotlin/generation/bitflags/DeprecatedNewCompanion.kt @@ -0,0 +1,42 @@ +package dev.kord.ksp.generation.bitflags + +import com.squareup.kotlinpoet.DelicateKotlinPoetApi +import com.squareup.kotlinpoet.KModifier +import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy +import com.squareup.kotlinpoet.TypeSpec +import com.squareup.kotlinpoet.jvm.jvmField +import dev.kord.ksp.* +import dev.kord.ksp.generation.GenerationEntity.BitFlags +import dev.kord.ksp.generation.shared.GenerationContext +import dev.kord.ksp.generation.shared.K_SERIALIZER + +// TODO bump LEVEL and remove this file eventually +private val LEVEL = DeprecationLevel.WARNING + +context(BitFlags, GenerationContext) +@OptIn(DelicateKotlinPoetApi::class) +internal fun TypeSpec.Builder.addDeprecatedNewCompanion() { + val newCompanion = collectionCN.nestedClass("NewCompanion") + val deprecated = Deprecated( + "Renamed to 'Companion'.", + ReplaceWith("${collectionCN.simpleName}.Companion", imports = arrayOf(collectionCN.canonicalName)), + LEVEL, + ) + addCompanionObject { + addProperty(newCompanion.simpleName, type = newCompanion) { + addAnnotation(Suppress("DEPRECATION")) + addAnnotation(deprecated) + jvmField() + initializer("%T()", newCompanion) + } + } + addClass(newCompanion) { + addAnnotation(deprecated) + primaryConstructor { addModifiers(KModifier.INTERNAL) } + addFunction("serializer") { + addModifiers(KModifier.PUBLIC) + returns(K_SERIALIZER.parameterizedBy(collectionCN)) + addStatement("return %T.serializer()", collectionCN) + } + } +} diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/EnumArtifacts.kt b/ksp-processors/src/main/kotlin/generation/bitflags/EnumArtifacts.kt deleted file mode 100644 index a66e73890952..000000000000 --- a/ksp-processors/src/main/kotlin/generation/bitflags/EnumArtifacts.kt +++ /dev/null @@ -1,112 +0,0 @@ -package dev.kord.ksp.generation.bitflags - -import com.squareup.kotlinpoet.* -import com.squareup.kotlinpoet.KModifier.OPEN -import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy -import com.squareup.kotlinpoet.jvm.jvmField -import com.squareup.kotlinpoet.jvm.jvmStatic -import dev.kord.ksp.* -import dev.kord.ksp.generation.GenerationEntity.BitFlags -import dev.kord.ksp.generation.shared.GenerationContext -import dev.kord.ksp.generation.shared.nameWithSuppressedDeprecation -import kotlin.DeprecationLevel.HIDDEN - -// TODO bump LEVEL and remove this file eventually -private val LEVEL = HIDDEN -private val CLASS = ClassName("dev.kord.common", "Class") -private val JAVA = MemberName("dev.kord.common", "java") - -context(BitFlags, GenerationContext) -@OptIn(DelicateKotlinPoetApi::class) -internal fun TypeSpec.Builder.addDeprecatedEntityEnumArtifacts() { - val deprecatedWithoutReplacement = - Deprecated("$entityName is no longer an enum class. Deprecated without a replacement.", level = LEVEL) - addFunction("name") { - addKdoc("@suppress") - addAnnotation(Suppress("DeprecatedCallableAddReplaceWith")) - addAnnotation(deprecatedWithoutReplacement) - returns() - addStatement("return this::class.simpleName!!") - } - addFunction("ordinal") { - addKdoc("@suppress") - val deprecation = entries.mapNotNull { - when (it.deprecated?.level) { - null -> null - DeprecationLevel.WARNING -> "DEPRECATION" - DeprecationLevel.ERROR, HIDDEN -> "DEPRECATION_ERROR" - } - }.distinct().toTypedArray() - addAnnotation(Suppress("DeprecatedCallableAddReplaceWith", *deprecation)) - addAnnotation(deprecatedWithoutReplacement) - returns() - withControlFlow("return when·(this)") { - entries.forEachIndexed { index, entry -> - addStatement("${entry.name}·->·%L", index) - } - addStatement("is·Unknown·->·Int.MAX_VALUE") - } - } - addFunction("getDeclaringClass") { - addKdoc("@suppress") - addAnnotation( - Deprecated( - "$entityName is no longer an enum class.", - ReplaceWith("$entityName::class.java", entityCN.canonicalName), - LEVEL, - ) - ) - returns(CLASS.parameterizedBy(entityCN)) - addStatement("return $entityName::class.%M", JAVA) - } -} - -context(BitFlags, GenerationContext) -@OptIn(DelicateKotlinPoetApi::class) -internal fun TypeSpec.Builder.addDeprecatedEntityCompanionObjectEnumArtifacts() { - entries.forEach { entry -> - if (entry.noStaticFieldIfEntityWasEnum) return@forEach - addProperty(entry.name, entityCN) { - when (entry.deprecated?.level) { - null -> {} - DeprecationLevel.WARNING -> addAnnotation(Suppress("DEPRECATION")) - DeprecationLevel.ERROR, HIDDEN -> addAnnotation(Suppress("DEPRECATION_ERROR")) - } - addAnnotation(Deprecated("Binary compatibility", level = HIDDEN)) - jvmField() - initializer(entry.name) - } - } - addFunction("valueOf") { - addKdoc("@suppress") - addAnnotation(Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - addAnnotation( - Deprecated("$entityName is no longer an enum class. Deprecated without a replacement.", level = LEVEL) - ) - jvmStatic() - addModifiers(OPEN) - addParameter("name") - returns(entityCN) - withControlFlow("return when·(name)") { - entries.forEach { entry -> - addStatement("%S·->·${entry.nameWithSuppressedDeprecation}", entry.name) - } - addStatement("else·->·throw·IllegalArgumentException(name)") - } - } - addFunction("values") { - addKdoc("@suppress") - addAnnotation(Suppress("NON_FINAL_MEMBER_IN_OBJECT")) - addAnnotation( - Deprecated( - "$entityName is no longer an enum class.", - ReplaceWith("$entityName.entries.toTypedArray()", entityCN.canonicalName), - LEVEL, - ) - ) - jvmStatic() - addModifiers(OPEN) - returns(ARRAY.parameterizedBy(entityCN)) - addStatement("return entries.toTypedArray()") - } -} diff --git a/ksp-processors/src/main/kotlin/generation/bitflags/FactoryFunctions.kt b/ksp-processors/src/main/kotlin/generation/bitflags/FactoryFunctions.kt index 0fb9b14ab45b..796e02c2750b 100644 --- a/ksp-processors/src/main/kotlin/generation/bitflags/FactoryFunctions.kt +++ b/ksp-processors/src/main/kotlin/generation/bitflags/FactoryFunctions.kt @@ -4,6 +4,7 @@ import com.squareup.kotlinpoet.* import com.squareup.kotlinpoet.KModifier.* import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy import com.squareup.kotlinpoet.jvm.jvmName +import dev.kord.ksp.addAnnotation import dev.kord.ksp.addFunction import dev.kord.ksp.addParameter import dev.kord.ksp.generation.GenerationEntity.BitFlags @@ -28,6 +29,21 @@ internal fun FileSpec.Builder.addFactoryFunctions() { addStatement("%M·{·callsInPlace(builder,·%M)·}", CONTRACT, EXACTLY_ONCE) addStatement("return·%T().apply(builder).build()", builderCN) } + // TODO remove eventually + if (hadBuilderFactoryFunction0) { + @OptIn(DelicateKotlinPoetApi::class) + addFunction(factoryFunctionName + '0') { + addAnnotation(Suppress("FunctionName")) + addAnnotation(Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN)) + addModifiers(PUBLIC, INLINE) + addParameter("builder", type = LambdaTypeName.get(receiver = builderCN, returnType = UNIT)) { + defaultValue("{}") + } + returns(collectionCN) + addStatement("%M·{·callsInPlace(builder,·%M)·}", CONTRACT, EXACTLY_ONCE) + addStatement("return·$factoryFunctionName(builder)", builderCN) + } + } addFactoryFunctionForIterable(baseParameterType = entityCN, IterableType.VARARG) addFactoryFunctionForIterable(baseParameterType = collectionCN, IterableType.VARARG) addFactoryFunctionForIterable(baseParameterType = entityCN, IterableType.ITERABLE) diff --git a/ksp-processors/src/main/kotlin/generation/kordenum/KordEnumGeneration.kt b/ksp-processors/src/main/kotlin/generation/kordenum/KordEnumGeneration.kt index 19dbd2fc510a..a13724fbf579 100644 --- a/ksp-processors/src/main/kotlin/generation/kordenum/KordEnumGeneration.kt +++ b/ksp-processors/src/main/kotlin/generation/kordenum/KordEnumGeneration.kt @@ -1,9 +1,8 @@ package dev.kord.ksp.generation.kordenum import com.google.devtools.ksp.symbol.KSFile -import com.squareup.kotlinpoet.DelicateKotlinPoetApi -import com.squareup.kotlinpoet.KModifier.* -import com.squareup.kotlinpoet.NOTHING +import com.squareup.kotlinpoet.KModifier.PUBLIC +import com.squareup.kotlinpoet.KModifier.SEALED import com.squareup.kotlinpoet.ksp.addOriginatingKSFile import dev.kord.ksp.* import dev.kord.ksp.generation.GenerationEntity.KordEnum @@ -28,32 +27,7 @@ internal fun KordEnum.generateFileSpec(originatingFile: KSFile) = fileSpecForGen } addEqualsAndHashCodeBasedOnClassAndSingleProperty(entityCN, property = valueName, isFinal = true) addEntityToString(property = valueName) - addClass("Unknown") { - addSharedUnknownClassContent() - primaryConstructor { - addModifiers(INTERNAL) - addParameter(valueName, valueCN) - if (unknownConstructorWasPublic) addParameter("unused", type = NOTHING.copy(nullable = true)) { - @OptIn(DelicateKotlinPoetApi::class) - addAnnotation(Suppress("UNUSED_PARAMETER")) - } - } - addSuperclassConstructorParameter(valueName) - // TODO bump deprecation level and remove eventually (also share code with bit flags then) - if (unknownConstructorWasPublic) addConstructor { - @OptIn(DelicateKotlinPoetApi::class) - addAnnotation( - Deprecated( - "Replaced by '$entityName.from()'.", - ReplaceWith("$entityName.from($valueName)", entityCN.canonicalName), - DeprecationLevel.HIDDEN, - ) - ) - addModifiers(PUBLIC) - addParameter(valueName, valueCN) - callThisConstructor(valueName, "null") - } - } + addUnknownClass(constructorParameterName = valueName, constructorParameterType = valueCN) addEntityEntries() addSerializer() addCompanionObject { @@ -69,7 +43,7 @@ internal fun KordEnum.generateFileSpec(originatingFile: KSFile) = fileSpecForGen for (entry in entriesDistinctByValue) { addStatement("$valueFormat·->·${entry.nameWithSuppressedDeprecation}", entry.value) } - addStatement(if (unknownConstructorWasPublic) "else·->·Unknown($valueName,·null)" else "else·->·Unknown($valueName)") + addStatement("else·->·Unknown($valueName)") } } } diff --git a/ksp-processors/src/main/kotlin/generation/shared/SharedContent.kt b/ksp-processors/src/main/kotlin/generation/shared/SharedContent.kt index cadbd0dd0ed4..342e075e2538 100644 --- a/ksp-processors/src/main/kotlin/generation/shared/SharedContent.kt +++ b/ksp-processors/src/main/kotlin/generation/shared/SharedContent.kt @@ -15,14 +15,20 @@ internal fun TypeSpec.Builder.addEntityKDoc() { } context(GenerationEntity, GenerationContext) -internal fun TypeSpec.Builder.addSharedUnknownClassContent() { - addKdoc( - "An unknown [%1T].\n\nThis is used as a fallback for [%1T]s that haven't been added to Kord yet.", - entityCN, - ) - addModifiers(PUBLIC) - superclass(entityCN) -} +internal fun TypeSpec.Builder.addUnknownClass(constructorParameterName: String, constructorParameterType: TypeName) = + addClass("Unknown") { + addKdoc( + "An unknown [%1T].\n\nThis is used as a fallback for [%1T]s that haven't been added to Kord yet.", + entityCN, + ) + addModifiers(PUBLIC) + primaryConstructor { + addModifiers(INTERNAL) + addParameter(constructorParameterName, constructorParameterType) + } + superclass(entityCN) + addSuperclassConstructorParameter(constructorParameterName) + } context(GenerationEntity, GenerationContext) internal fun TypeSpec.Builder.addEntityEntries() { diff --git a/rest/api/rest.api b/rest/api/rest.api index 536e30e325ff..aeaff92dea9c 100644 --- a/rest/api/rest.api +++ b/rest/api/rest.api @@ -1089,10 +1089,8 @@ public abstract class dev/kord/rest/builder/component/SelectMenuBuilder : dev/ko public final class dev/kord/rest/builder/component/SelectMenuBuilderKt { public static final fun channelType (Ldev/kord/rest/builder/component/ChannelSelectBuilder;Ldev/kord/common/entity/ChannelType;)V - public static final synthetic fun getOptions (Ldev/kord/rest/builder/component/StringSelectBuilder;)Ljava/util/List; public static final fun option (Ldev/kord/rest/builder/component/StringSelectBuilder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public static synthetic fun option$default (Ldev/kord/rest/builder/component/StringSelectBuilder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static final synthetic fun setOptions (Ldev/kord/rest/builder/component/StringSelectBuilder;Ljava/util/List;)V } public final class dev/kord/rest/builder/component/SelectOptionBuilder { @@ -2224,21 +2222,21 @@ public final class dev/kord/rest/builder/message/create/MessageCreateBuilder$Def } public final class dev/kord/rest/builder/message/create/MessageCreateBuilderJvmKt { - public static final fun addFile (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ljava/nio/file/Path;)Ldev/kord/rest/NamedFile; + public static final synthetic fun addFile (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ljava/nio/file/Path;)Ldev/kord/rest/NamedFile; } public final class dev/kord/rest/builder/message/create/MessageCreateBuilderKt { - public static final fun actionRow (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V - public static final fun allowedMentions (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun actionRow (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun allowedMentions (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V public static synthetic fun allowedMentions$default (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static final fun embed (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V - public static final fun messageFlags (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun embed (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun messageFlags (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Lkotlin/jvm/functions/Function1;)V } public final class dev/kord/rest/builder/message/create/UpdateMessageInteractionResponseCreateBuilder : dev/kord/rest/builder/message/create/AbstractMessageCreateBuilder, dev/kord/rest/builder/RequestBuilder { public fun ()V public fun getFiles ()Ljava/util/List; - public fun setFiles (Ljava/util/List;)V + public synthetic fun setFiles (Ljava/util/List;)V public fun toRequest ()Ldev/kord/rest/json/request/MultipartInteractionResponseCreateRequest; public synthetic fun toRequest ()Ljava/lang/Object; } @@ -2294,7 +2292,7 @@ public abstract class dev/kord/rest/builder/message/modify/AbstractMessageModify public final fun setComponents (Ljava/util/List;)V public final fun setContent (Ljava/lang/String;)V public final fun setEmbeds (Ljava/util/List;)V - public final fun setFiles (Ljava/util/List;)V + public final synthetic fun setFiles (Ljava/util/List;)V public final fun setFlags (Ldev/kord/common/entity/MessageFlags;)V public final fun setSuppressEmbeds (Ljava/lang/Boolean;)V } @@ -2313,7 +2311,7 @@ public final class dev/kord/rest/builder/message/modify/InteractionResponseModif public abstract interface class dev/kord/rest/builder/message/modify/MessageModifyBuilder : dev/kord/rest/builder/message/MessageBuilder { public abstract fun getFiles ()Ljava/util/List; - public abstract fun setFiles (Ljava/util/List;)V + public abstract synthetic fun setFiles (Ljava/util/List;)V } public final class dev/kord/rest/builder/message/modify/MessageModifyBuilder$DefaultImpls { @@ -2321,17 +2319,17 @@ public final class dev/kord/rest/builder/message/modify/MessageModifyBuilder$Def } public final class dev/kord/rest/builder/message/modify/MessageModifyBuilderJvmKt { - public static final fun addFile (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ljava/nio/file/Path;)Ldev/kord/rest/NamedFile; + public static final synthetic fun addFile (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ljava/nio/file/Path;)Ldev/kord/rest/NamedFile; } public final class dev/kord/rest/builder/message/modify/MessageModifyBuilderKt { - public static final fun actionRow (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V - public static final fun allowedMentions (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun actionRow (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun allowedMentions (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V public static synthetic fun allowedMentions$default (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static final fun embed (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun embed (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V public static final fun keepAttachment (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;)V public static synthetic fun keepAttachment$default (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static final fun messageFlags (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V + public static final synthetic fun messageFlags (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Lkotlin/jvm/functions/Function1;)V } public final class dev/kord/rest/builder/message/modify/UserMessageModifyBuilder : dev/kord/rest/builder/message/modify/AbstractMessageModifyBuilder, dev/kord/rest/builder/RequestBuilder { @@ -2916,7 +2914,6 @@ public final class dev/kord/rest/json/request/AutoCompleteResponseCreateRequest$ public final class dev/kord/rest/json/request/AutoCompleteResponseCreateRequest$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; - public final synthetic fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } public final class dev/kord/rest/json/request/AutoModerationRuleCreateRequest { diff --git a/rest/src/commonMain/kotlin/builder/component/SelectMenuBuilder.kt b/rest/src/commonMain/kotlin/builder/component/SelectMenuBuilder.kt index 657a1d079f11..85fa37aa0e08 100644 --- a/rest/src/commonMain/kotlin/builder/component/SelectMenuBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/component/SelectMenuBuilder.kt @@ -63,15 +63,6 @@ public class StringSelectBuilder(customId: String) : SelectMenuBuilder(customId) override fun buildOptions(): Optional> = Optional(options.map { it.build() }) } -/** The choices in the select, max 25. */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -@Deprecated("Replaced by member in StringSelectBuilder.", ReplaceWith("this.options"), DeprecationLevel.HIDDEN) -public var StringSelectBuilder.options: MutableList - get() = options - set(value) { - options = value - } - /** * Adds a new option to the select menu with the given [label] and [value] that can be configured by the [builder]. * diff --git a/rest/src/commonMain/kotlin/builder/message/create/MessageCreateBuilder.kt b/rest/src/commonMain/kotlin/builder/message/create/MessageCreateBuilder.kt index a099a98fffd8..958fc148ba5d 100644 --- a/rest/src/commonMain/kotlin/builder/message/create/MessageCreateBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/message/create/MessageCreateBuilder.kt @@ -82,7 +82,7 @@ public sealed class AbstractMessageCreateBuilder : MessageCreateBuilder { @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.embed'.", ReplaceWith("this.embed(block)", imports = ["dev.kord.rest.builder.message.embed"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageCreateBuilder.embed(block: EmbedBuilder.() -> Unit) { contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) } @@ -99,7 +99,7 @@ public inline fun MessageCreateBuilder.embed(block: EmbedBuilder.() -> Unit) { @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.allowedMentions'.", ReplaceWith("this.allowedMentions(block)", imports = ["dev.kord.rest.builder.message.allowedMentions"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageCreateBuilder.allowedMentions(block: AllowedMentionsBuilder.() -> Unit = {}) { contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) } @@ -114,7 +114,7 @@ public inline fun MessageCreateBuilder.allowedMentions(block: AllowedMentionsBui @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.actionRow'.", ReplaceWith("this.actionRow(builder)", imports = ["dev.kord.rest.builder.message.actionRow"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageCreateBuilder.actionRow(builder: ActionRowBuilder.() -> Unit) { contract { @@ -133,7 +133,7 @@ public inline fun MessageCreateBuilder.actionRow(builder: ActionRowBuilder.() -> @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.messageFlags'.", ReplaceWith("this.messageFlags(builder)", imports = ["dev.kord.rest.builder.message.messageFlags"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageCreateBuilder.messageFlags(builder: MessageFlags.Builder.() -> Unit) { contract { diff --git a/rest/src/commonMain/kotlin/builder/message/create/UpdateMessageInteractionResponseCreateBuilder.kt b/rest/src/commonMain/kotlin/builder/message/create/UpdateMessageInteractionResponseCreateBuilder.kt index 747da458b1ea..0dee53d773bc 100644 --- a/rest/src/commonMain/kotlin/builder/message/create/UpdateMessageInteractionResponseCreateBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/message/create/UpdateMessageInteractionResponseCreateBuilder.kt @@ -22,7 +22,7 @@ public class UpdateMessageInteractionResponseCreateBuilder : @set:Deprecated( "This setter will be removed in the future, replace with files.clear() followed by files.addAll(...).", ReplaceWith("this.files.clear()\nthis.files.addAll(value)"), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) override var files: MutableList = mutableListOf() diff --git a/rest/src/commonMain/kotlin/builder/message/modify/MessageModifyBuilder.kt b/rest/src/commonMain/kotlin/builder/message/modify/MessageModifyBuilder.kt index 2ae3fe71f2a4..1ae0da708dfb 100644 --- a/rest/src/commonMain/kotlin/builder/message/modify/MessageModifyBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/message/modify/MessageModifyBuilder.kt @@ -24,7 +24,7 @@ public sealed interface MessageModifyBuilder : MessageBuilder { @set:Deprecated( "This setter will be removed in the future, replace with files.clear() followed by files.addAll(...).", ReplaceWith("this.files.clear()\nthis.files.addAll(value)"), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) override var files: MutableList } @@ -68,7 +68,7 @@ public sealed class AbstractMessageModifyBuilder : MessageModifyBuilder { @set:Deprecated( "This setter will be removed in the future, replace with files.clear() followed by files.addAll(...).", ReplaceWith("this.files.clear()\nthis.files.addAll(value)"), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) final override var files: MutableList = mutableListOf() @@ -82,7 +82,7 @@ public sealed class AbstractMessageModifyBuilder : MessageModifyBuilder { @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.embed'.", ReplaceWith("this.embed(block)", imports = ["dev.kord.rest.builder.message.embed"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageModifyBuilder.embed(block: EmbedBuilder.() -> Unit) { contract { @@ -101,7 +101,7 @@ public inline fun MessageModifyBuilder.embed(block: EmbedBuilder.() -> Unit) { @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.allowedMentions'.", ReplaceWith("this.allowedMentions(block)", imports = ["dev.kord.rest.builder.message.allowedMentions"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageModifyBuilder.allowedMentions(block: AllowedMentionsBuilder.() -> Unit = {}) { contract { @@ -115,7 +115,7 @@ public inline fun MessageModifyBuilder.allowedMentions(block: AllowedMentionsBui @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.actionRow'.", ReplaceWith("this.actionRow(builder)", imports = ["dev.kord.rest.builder.message.actionRow"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageModifyBuilder.actionRow(builder: ActionRowBuilder.() -> Unit) { contract { @@ -134,7 +134,7 @@ public inline fun MessageModifyBuilder.actionRow(builder: ActionRowBuilder.() -> @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.messageFlags'.", ReplaceWith("this.messageFlags(builder)", imports = ["dev.kord.rest.builder.message.messageFlags"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public inline fun MessageModifyBuilder.messageFlags(builder: MessageFlags.Builder.() -> Unit) { contract { diff --git a/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt b/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt index e0aa77e812ab..f48beda6d53d 100644 --- a/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt +++ b/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt @@ -5,7 +5,6 @@ import dev.kord.common.entity.* import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.OptionalBoolean import dev.kord.rest.NamedFile -import kotlinx.serialization.KSerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -74,18 +73,7 @@ public data class InteractionResponseCreateRequest( public data class AutoCompleteResponseCreateRequest( val type: InteractionResponseType, val data: DiscordAutoComplete, -) { - public companion object { - @Suppress("UNUSED_PARAMETER") - @Deprecated( - "AutoCompleteResponseCreateRequest is no longer generic", - ReplaceWith("this.serializer()"), - DeprecationLevel.HIDDEN, - ) - public fun serializer(typeSerial0: KSerializer): KSerializer = - serializer() - } -} +) @Serializable public data class ModalResponseCreateRequest( diff --git a/rest/src/commonMain/kotlin/route/DiscordCdn.kt b/rest/src/commonMain/kotlin/route/DiscordCdn.kt index 7b6f7359e283..25812952c4aa 100644 --- a/rest/src/commonMain/kotlin/route/DiscordCdn.kt +++ b/rest/src/commonMain/kotlin/route/DiscordCdn.kt @@ -23,7 +23,7 @@ public object DiscordCdn { @Deprecated( "Renamed to 'defaultUserAvatar' to align name with documentation and overload taking Snowflake.", ReplaceWith("DiscordCdn.defaultUserAvatar(discriminator)", imports = ["dev.kord.rest.route.DiscordCdn"]), - DeprecationLevel.WARNING, + DeprecationLevel.ERROR, ) public fun defaultAvatar(discriminator: Int): CdnUrl = defaultUserAvatar(discriminator) diff --git a/rest/src/commonMain/kotlin/service/InteractionService.kt b/rest/src/commonMain/kotlin/service/InteractionService.kt index 4ae5f1deaf5b..95cf13d8390b 100644 --- a/rest/src/commonMain/kotlin/service/InteractionService.kt +++ b/rest/src/commonMain/kotlin/service/InteractionService.kt @@ -13,9 +13,7 @@ import dev.kord.rest.json.request.* import dev.kord.rest.request.RequestBuilder import dev.kord.rest.request.RequestHandler import dev.kord.rest.route.Route -import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.ListSerializer -import kotlinx.serialization.serializer import kotlin.collections.set import kotlin.contracts.InvocationKind import kotlin.contracts.contract @@ -122,19 +120,6 @@ public class InteractionService(requestHandler: RequestHandler) : RestService(re body(InteractionResponseCreateRequest.serializer(), request) } - @Suppress("UNUSED_PARAMETER") - @Deprecated( - "DiscordAutoComplete is no longer generic and the typeSerializer argument is no longer needed.", - ReplaceWith("this.createAutoCompleteInteractionResponse(interactionId, interactionToken, autoComplete)"), - DeprecationLevel.HIDDEN, - ) - public suspend inline fun createAutoCompleteInteractionResponse( - interactionId: Snowflake, - interactionToken: String, - autoComplete: DiscordAutoComplete, - typeSerializer: KSerializer = serializer(), - ): Unit = createAutoCompleteInteractionResponse(interactionId, interactionToken, autoComplete) - public suspend fun createAutoCompleteInteractionResponse( interactionId: Snowflake, interactionToken: String, diff --git a/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/create/MessageCreateBuilderJvm.kt b/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/create/MessageCreateBuilderJvm.kt index a50a2c395858..b2e845c183fd 100644 --- a/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/create/MessageCreateBuilderJvm.kt +++ b/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/create/MessageCreateBuilderJvm.kt @@ -12,7 +12,7 @@ import dev.kord.rest.builder.message.addFile as addFileExtensionOnNewSupertype @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.addFile'.", ReplaceWith("this.addFile(path)", imports = ["dev.kord.rest.builder.message.addFile"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public fun MessageCreateBuilder.addFile(path: Path): NamedFile = addFileExtensionOnNewSupertype(path) diff --git a/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/modify/MessageModifyBuilderJvm.kt b/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/modify/MessageModifyBuilderJvm.kt index 9547a078dda4..9eaafab53fef 100644 --- a/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/modify/MessageModifyBuilderJvm.kt +++ b/rest/src/jvmMain/kotlin/dev/kord/rest/builder/message/modify/MessageModifyBuilderJvm.kt @@ -12,7 +12,7 @@ import dev.kord.rest.builder.message.addFile as addFileExtensionOnNewSupertype @Deprecated( "Replaced by extension on 'MessageBuilder'. Change import to 'dev.kord.rest.builder.message.addFile'.", ReplaceWith("this.addFile(path)", imports = ["dev.kord.rest.builder.message.addFile"]), - DeprecationLevel.ERROR, + DeprecationLevel.HIDDEN, ) public fun MessageModifyBuilder.addFile(path: Path): NamedFile = addFileExtensionOnNewSupertype(path) diff --git a/voice/api/voice.api b/voice/api/voice.api index ba7fad45ce44..e213650a0dc9 100644 --- a/voice/api/voice.api +++ b/voice/api/voice.api @@ -211,7 +211,6 @@ public final class dev/kord/voice/EncryptionMode$Companion { } public final class dev/kord/voice/EncryptionMode$Unknown : dev/kord/voice/EncryptionMode { - public synthetic fun (Ljava/lang/String;)V } public final class dev/kord/voice/EncryptionMode$XSalsa20Poly1305 : dev/kord/voice/EncryptionMode { @@ -247,29 +246,19 @@ public final class dev/kord/voice/FrameInterceptorConfiguration { public abstract class dev/kord/voice/SpeakingFlag { public static final field Companion Ldev/kord/voice/SpeakingFlag$Companion; - public static final field Microphone Ldev/kord/voice/SpeakingFlag; - public static final field Priority Ldev/kord/voice/SpeakingFlag; - public static final field Soundshare Ldev/kord/voice/SpeakingFlag; public synthetic fun (ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getDeclaringClass ()Ljava/lang/Class; public final fun getShift ()I public final fun hashCode ()I - public final synthetic fun name ()Ljava/lang/String; - public final synthetic fun ordinal ()I public final fun plus (Ldev/kord/voice/SpeakingFlag;)Ldev/kord/voice/SpeakingFlags; public final fun plus (Ldev/kord/voice/SpeakingFlags;)Ldev/kord/voice/SpeakingFlags; public final fun toString ()Ljava/lang/String; - public static synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/voice/SpeakingFlag; - public static synthetic fun values ()[Ldev/kord/voice/SpeakingFlag; } public final class dev/kord/voice/SpeakingFlag$Companion { public final fun fromShift (I)Ldev/kord/voice/SpeakingFlag; public final fun getEntries ()Ljava/util/List; - public synthetic fun valueOf (Ljava/lang/String;)Ldev/kord/voice/SpeakingFlag; - public synthetic fun values ()[Ldev/kord/voice/SpeakingFlag; } public final class dev/kord/voice/SpeakingFlag$Microphone : dev/kord/voice/SpeakingFlag { @@ -294,7 +283,6 @@ public final class dev/kord/voice/SpeakingFlagKt { public static final fun SpeakingFlags ([Ldev/kord/voice/SpeakingFlags;)Ldev/kord/voice/SpeakingFlags; public static synthetic fun SpeakingFlags$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/kord/voice/SpeakingFlags; public static final fun SpeakingFlags0 (Ljava/lang/Iterable;)Ldev/kord/voice/SpeakingFlags; - public static final synthetic fun SpeakingFlagsWithIterable (Ljava/lang/Iterable;)Ldev/kord/voice/SpeakingFlags; } public final class dev/kord/voice/SpeakingFlags { @@ -304,7 +292,6 @@ public final class dev/kord/voice/SpeakingFlags { public final fun copy (Lkotlin/jvm/functions/Function1;)Ldev/kord/voice/SpeakingFlags; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final synthetic fun getFlags ()Ljava/util/List; public final fun getValues ()Ljava/util/Set; public fun hashCode ()I public final fun minus (Ldev/kord/voice/SpeakingFlag;)Ldev/kord/voice/SpeakingFlags; @@ -319,7 +306,6 @@ public final class dev/kord/voice/SpeakingFlags$Builder { public fun (I)V public synthetic fun (IILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Ldev/kord/voice/SpeakingFlags; - public final synthetic fun flags ()Ldev/kord/voice/SpeakingFlags; public final fun unaryMinus (Ldev/kord/voice/SpeakingFlag;)V public final fun unaryMinus (Ldev/kord/voice/SpeakingFlags;)V public final fun unaryPlus (Ldev/kord/voice/SpeakingFlag;)V diff --git a/voice/build/generated/ksp/main/kotlin/dev/kord/voice/EncryptionMode.kt b/voice/build/generated/ksp/main/kotlin/dev/kord/voice/EncryptionMode.kt index 62711149222a..5f7f80847d59 100644 --- a/voice/build/generated/ksp/main/kotlin/dev/kord/voice/EncryptionMode.kt +++ b/voice/build/generated/ksp/main/kotlin/dev/kord/voice/EncryptionMode.kt @@ -40,17 +40,7 @@ public sealed class EncryptionMode( */ public class Unknown internal constructor( `value`: String, - @Suppress(names = arrayOf("UNUSED_PARAMETER")) - unused: Nothing?, - ) : EncryptionMode(value) { - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Replaced by 'EncryptionMode.from()'.", - replaceWith = ReplaceWith(expression = "EncryptionMode.from(value)", imports = - arrayOf("dev.kord.voice.EncryptionMode")), - ) - public constructor(`value`: String) : this(value, null) - } + ) : EncryptionMode(value) public object XSalsa20Poly1305 : EncryptionMode("xsalsa20_poly1305") @@ -90,7 +80,7 @@ public sealed class EncryptionMode( "xsalsa20_poly1305" -> XSalsa20Poly1305 "xsalsa20_poly1305_suffix" -> XSalsa20Poly1305Suffix "xsalsa20_poly1305_lite" -> XSalsa20Poly1305Lite - else -> Unknown(value, null) + else -> Unknown(value) } } } diff --git a/voice/build/generated/ksp/main/kotlin/dev/kord/voice/SpeakingFlag.kt b/voice/build/generated/ksp/main/kotlin/dev/kord/voice/SpeakingFlag.kt new file mode 100644 index 000000000000..d44d4c8c8b96 --- /dev/null +++ b/voice/build/generated/ksp/main/kotlin/dev/kord/voice/SpeakingFlag.kt @@ -0,0 +1,346 @@ +// THIS FILE IS AUTO-GENERATED, DO NOT EDIT! +@file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", + "SpellCheckingInspection", "GrazieInspection")) + +package dev.kord.voice + +import kotlin.LazyThreadSafetyMode.PUBLICATION +import kotlin.contracts.InvocationKind.EXACTLY_ONCE +import kotlin.contracts.contract +import kotlin.jvm.JvmName +import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializable +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.descriptors.PrimitiveKind +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder + +/** + * See [SpeakingFlag]s in the + * [Discord Developer Documentation](https://discord.com/developers/docs/topics/voice-connections#speaking). + */ +public sealed class SpeakingFlag( + /** + * The position of the bit that is set in this [SpeakingFlag]. This is always in 0..30. + */ + public val shift: Int, +) { + init { + require(shift in 0..30) { """shift has to be in 0..30 but was $shift""" } + } + + /** + * The raw code used by Discord. + */ + public val code: Int + get() = 1 shl shift + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and + * [flag]. + */ + public operator fun plus(flag: SpeakingFlag): SpeakingFlags = + SpeakingFlags(this.code or flag.code) + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and + * [flags]. + */ + public operator fun plus(flags: SpeakingFlags): SpeakingFlags = + SpeakingFlags(this.code or flags.code) + + final override fun equals(other: Any?): Boolean = this === other || + (other is SpeakingFlag && this.shift == other.shift) + + final override fun hashCode(): Int = shift.hashCode() + + final override fun toString(): String = + if (this is Unknown) "SpeakingFlag.Unknown(shift=$shift)" + else "SpeakingFlag.${this::class.simpleName}" + + /** + * An unknown [SpeakingFlag]. + * + * This is used as a fallback for [SpeakingFlag]s that haven't been added to Kord yet. + */ + public class Unknown internal constructor( + shift: Int, + ) : SpeakingFlag(shift) + + /** + * Normal transmission of voice audio. + */ + public object Microphone : SpeakingFlag(0) + + /** + * Transmission of context audio for video, no speaking indicator. + */ + public object Soundshare : SpeakingFlag(1) + + /** + * Priority speaker, lowering audio of other speakers. + */ + public object Priority : SpeakingFlag(2) + + public companion object { + /** + * A [List] of all known [SpeakingFlag]s. + */ + public val entries: List by lazy(mode = PUBLICATION) { + listOf( + Microphone, + Soundshare, + Priority, + ) + } + + + /** + * Returns an instance of [SpeakingFlag] with [SpeakingFlag.shift] equal to the specified + * [shift]. + * + * @throws IllegalArgumentException if [shift] is not in 0..30. + */ + public fun fromShift(shift: Int): SpeakingFlag = when (shift) { + 0 -> Microphone + 1 -> Soundshare + 2 -> Priority + else -> Unknown(shift) + } + } +} + +/** + * A collection of multiple [SpeakingFlag]s. + * + * ## Creating an instance of [SpeakingFlags] + * + * You can create an instance of [SpeakingFlags] using the following methods: + * ```kotlin + * // from individual SpeakingFlags + * val speakingFlags1 = SpeakingFlags(SpeakingFlag.Microphone, SpeakingFlag.Soundshare) + * + * // from an Iterable + * val iterable: Iterable = TODO() + * val speakingFlags2 = SpeakingFlags(iterable) + * + * // using a builder + * val speakingFlags3 = SpeakingFlags { + * +speakingFlags2 + * +SpeakingFlag.Microphone + * -SpeakingFlag.Soundshare + * } + * ``` + * + * ## Modifying an existing instance of [SpeakingFlags] + * + * You can create a modified copy of an existing instance of [SpeakingFlags] using the [copy] + * method: + * ```kotlin + * speakingFlags.copy { + * +SpeakingFlag.Microphone + * } + * ``` + * + * ## Mathematical operators + * + * All [SpeakingFlags] objects can use `+`/`-` operators: + * ```kotlin + * val speakingFlags1 = speakingFlags + SpeakingFlag.Microphone + * val speakingFlags2 = speakingFlags - SpeakingFlag.Soundshare + * val speakingFlags3 = speakingFlags1 + speakingFlags2 + * ``` + * + * ## Checking for [SpeakingFlag]s + * + * You can use the [contains] operator to check whether an instance of [SpeakingFlags] contains + * specific [SpeakingFlag]s: + * ```kotlin + * val hasSpeakingFlag = SpeakingFlag.Microphone in speakingFlags + * val hasSpeakingFlags = SpeakingFlags(SpeakingFlag.Microphone, SpeakingFlag.Soundshare) in speakingFlags + * ``` + * + * ## Unknown [SpeakingFlag]s + * + * Whenever [SpeakingFlag]s haven't been added to Kord yet, they will be deserialized as instances + * of [SpeakingFlag.Unknown]. + * + * You can also use [SpeakingFlag.fromShift] to check for [unknown][SpeakingFlag.Unknown] + * [SpeakingFlag]s. + * ```kotlin + * val hasUnknownSpeakingFlag = SpeakingFlag.fromShift(23) in speakingFlags + * ``` + * + * @see SpeakingFlag + * @see SpeakingFlags.Builder + */ +@Serializable(with = SpeakingFlags.Serializer::class) +public class SpeakingFlags internal constructor( + /** + * The raw code used by Discord. + */ + public val code: Int, +) { + /** + * A [Set] of all [SpeakingFlag]s contained in this instance of [SpeakingFlags]. + */ + public val values: Set + get() = buildSet { + var remaining = code + var shift = 0 + while (remaining != 0) { + if ((remaining and 1) != 0) add(SpeakingFlag.fromShift(shift)) + remaining = remaining ushr 1 + shift++ + } + } + + /** + * Checks if this instance of [SpeakingFlags] has all bits set that are set in [flag]. + */ + public operator fun contains(flag: SpeakingFlag): Boolean = this.code and flag.code == flag.code + + /** + * Checks if this instance of [SpeakingFlags] has all bits set that are set in [flags]. + */ + public operator fun contains(flags: SpeakingFlags): Boolean = + this.code and flags.code == flags.code + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and + * [flag]. + */ + public operator fun plus(flag: SpeakingFlag): SpeakingFlags = + SpeakingFlags(this.code or flag.code) + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and + * [flags]. + */ + public operator fun plus(flags: SpeakingFlags): SpeakingFlags = + SpeakingFlags(this.code or flags.code) + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` except + * the bits that are set in [flag]. + */ + public operator fun minus(flag: SpeakingFlag): SpeakingFlags = + SpeakingFlags(this.code and flag.code.inv()) + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` except + * the bits that are set in [flags]. + */ + public operator fun minus(flags: SpeakingFlags): SpeakingFlags = + SpeakingFlags(this.code and flags.code.inv()) + + /** + * Returns a copy of this instance of [SpeakingFlags] modified with [builder]. + */ + public inline fun copy(builder: Builder.() -> Unit): SpeakingFlags { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return Builder(code).apply(builder).build() + } + + override fun equals(other: Any?): Boolean = this === other || + (other is SpeakingFlags && this.code == other.code) + + override fun hashCode(): Int = code.hashCode() + + override fun toString(): String = "SpeakingFlags(values=$values)" + + public class Builder( + private var code: Int = 0, + ) { + /** + * Sets all bits in the [Builder] that are set in this [SpeakingFlag]. + */ + public operator fun SpeakingFlag.unaryPlus() { + this@Builder.code = this@Builder.code or this.code + } + + /** + * Sets all bits in the [Builder] that are set in this [SpeakingFlags]. + */ + public operator fun SpeakingFlags.unaryPlus() { + this@Builder.code = this@Builder.code or this.code + } + + /** + * Unsets all bits in the [Builder] that are set in this [SpeakingFlag]. + */ + public operator fun SpeakingFlag.unaryMinus() { + this@Builder.code = this@Builder.code and this.code.inv() + } + + /** + * Unsets all bits in the [Builder] that are set in this [SpeakingFlags]. + */ + public operator fun SpeakingFlags.unaryMinus() { + this@Builder.code = this@Builder.code and this.code.inv() + } + + /** + * Returns an instance of [SpeakingFlags] that has all bits set that are currently set in + * this [Builder]. + */ + public fun build(): SpeakingFlags = SpeakingFlags(code) + } + + internal object Serializer : KSerializer { + override val descriptor: SerialDescriptor = + PrimitiveSerialDescriptor("dev.kord.voice.SpeakingFlags", PrimitiveKind.INT) + + private val `delegate`: KSerializer = Int.serializer() + + override fun serialize(encoder: Encoder, `value`: SpeakingFlags) { + encoder.encodeSerializableValue(delegate, value.code) + } + + override fun deserialize(decoder: Decoder): SpeakingFlags = + SpeakingFlags(decoder.decodeSerializableValue(delegate)) + } +} + +/** + * Returns an instance of [SpeakingFlags] built with [SpeakingFlags.Builder]. + */ +public inline fun SpeakingFlags(builder: SpeakingFlags.Builder.() -> Unit = {}): SpeakingFlags { + contract { callsInPlace(builder, EXACTLY_ONCE) } + return SpeakingFlags.Builder().apply(builder).build() +} + +/** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of + * [flags]. + */ +public fun SpeakingFlags(vararg flags: SpeakingFlag): SpeakingFlags = SpeakingFlags { + flags.forEach { +it } +} + +/** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of + * [flags]. + */ +public fun SpeakingFlags(vararg flags: SpeakingFlags): SpeakingFlags = SpeakingFlags { + flags.forEach { +it } +} + +/** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of + * [flags]. + */ +public fun SpeakingFlags(flags: Iterable): SpeakingFlags = SpeakingFlags { + flags.forEach { +it } +} + +/** + * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of + * [flags]. + */ +@JvmName("SpeakingFlags0") +public fun SpeakingFlags(flags: Iterable): SpeakingFlags = SpeakingFlags { + flags.forEach { +it } +} diff --git a/voice/src/main/kotlin/SpeakingFlag.kt b/voice/src/main/kotlin/SpeakingFlag.kt index 38461994cf20..953309683a21 100644 --- a/voice/src/main/kotlin/SpeakingFlag.kt +++ b/voice/src/main/kotlin/SpeakingFlag.kt @@ -1,6 +1,3 @@ -// TODO uncomment start and remove rest of the file after deprecation cycle - -/* @file:Generate( INT_FLAGS, name = "SpeakingFlag", valueName = "code", docUrl = "https://discord.com/developers/docs/topics/voice-connections#speaking", @@ -16,454 +13,3 @@ package dev.kord.voice import dev.kord.ksp.Generate import dev.kord.ksp.Generate.EntityType.INT_FLAGS import dev.kord.ksp.Generate.Entry -*/ - -@file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", - "SpellCheckingInspection", "GrazieInspection")) - -package dev.kord.voice - -import kotlin.LazyThreadSafetyMode.PUBLICATION -import kotlin.contracts.InvocationKind.EXACTLY_ONCE -import kotlin.contracts.contract -import kotlinx.serialization.KSerializer -import kotlinx.serialization.Serializable -import kotlinx.serialization.builtins.serializer -import kotlinx.serialization.descriptors.PrimitiveKind -import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor -import kotlinx.serialization.descriptors.SerialDescriptor -import kotlinx.serialization.encoding.Decoder -import kotlinx.serialization.encoding.Encoder - -/** - * See [SpeakingFlag]s in the - * [Discord Developer Documentation](https://discord.com/developers/docs/topics/voice-connections#speaking). - */ -public sealed class SpeakingFlag( - /** - * The position of the bit that is set in this [SpeakingFlag]. This is always in 0..30. - */ - public val shift: Int, -) { - init { - require(shift in 0..30) { """shift has to be in 0..30 but was $shift""" } - } - - /** - * The raw code used by Discord. - */ - public val code: Int - get() = 1 shl shift - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and - * [flag]. - */ - public operator fun plus(flag: SpeakingFlag): SpeakingFlags = - SpeakingFlags(this.code or flag.code) - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and - * [flags]. - */ - public operator fun plus(flags: SpeakingFlags): SpeakingFlags = - SpeakingFlags(this.code or flags.code) - - final override fun equals(other: Any?): Boolean = this === other || - (other is SpeakingFlag && this.shift == other.shift) - - final override fun hashCode(): Int = shift.hashCode() - - final override fun toString(): String = if (this is Unknown) - "SpeakingFlag.Unknown(shift=$shift)" else "SpeakingFlag.${this::class.simpleName}" - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SpeakingFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun name(): String = this::class.simpleName!! - - /** - * @suppress - */ - @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SpeakingFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - public fun ordinal(): Int = when (this) { - Microphone -> 0 - Soundshare -> 1 - Priority -> 2 - is Unknown -> Int.MAX_VALUE - } - - /** - * @suppress - */ - @Deprecated( - message = "SpeakingFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "SpeakingFlag::class.java", imports = - arrayOf("dev.kord.voice.SpeakingFlag")), - DeprecationLevel.HIDDEN, - ) - public fun getDeclaringClass(): Class = SpeakingFlag::class.java - - /** - * An unknown [SpeakingFlag]. - * - * This is used as a fallback for [SpeakingFlag]s that haven't been added to Kord yet. - */ - public class Unknown internal constructor( - shift: Int, - ) : SpeakingFlag(shift) - - /** - * Normal transmission of voice audio. - */ - public object Microphone : SpeakingFlag(0) - - /** - * Transmission of context audio for video, no speaking indicator. - */ - public object Soundshare : SpeakingFlag(1) - - /** - * Priority speaker, lowering audio of other speakers. - */ - public object Priority : SpeakingFlag(2) - - public companion object { - /** - * A [List] of all known [SpeakingFlag]s. - */ - public val entries: List by lazy(mode = PUBLICATION) { - listOf( - Microphone, - Soundshare, - Priority, - ) - } - - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Microphone: SpeakingFlag = Microphone - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Soundshare: SpeakingFlag = Soundshare - - @Deprecated( - level = DeprecationLevel.HIDDEN, - message = "Binary compatibility", - ) - @JvmField - public val Priority: SpeakingFlag = Priority - - /** - * Returns an instance of [SpeakingFlag] with [SpeakingFlag.shift] equal to the specified - * [shift]. - * - * @throws IllegalArgumentException if [shift] is not in 0..30. - */ - public fun fromShift(shift: Int): SpeakingFlag = when (shift) { - 0 -> Microphone - 1 -> Soundshare - 2 -> Priority - else -> Unknown(shift) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")) - @Deprecated(message = - "SpeakingFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.HIDDEN) - @JvmStatic - public open fun valueOf(name: String): SpeakingFlag = when (name) { - "Microphone" -> Microphone - "Soundshare" -> Soundshare - "Priority" -> Priority - else -> throw IllegalArgumentException(name) - } - - /** - * @suppress - */ - @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT")) - @Deprecated( - message = "SpeakingFlag is no longer an enum class.", - replaceWith = ReplaceWith(expression = "SpeakingFlag.entries.toTypedArray()", imports = - arrayOf("dev.kord.voice.SpeakingFlag")), - DeprecationLevel.HIDDEN, - ) - @JvmStatic - public open fun values(): Array = entries.toTypedArray() - } -} - -/** - * A collection of multiple [SpeakingFlag]s. - * - * ## Creating an instance of [SpeakingFlags] - * - * You can create an instance of [SpeakingFlags] using the following methods: - * ```kotlin - * // from individual SpeakingFlags - * val speakingFlags1 = SpeakingFlags(SpeakingFlag.Microphone, SpeakingFlag.Soundshare) - * - * // from an Iterable - * val iterable: Iterable = TODO() - * val speakingFlags2 = SpeakingFlags(iterable) - * - * // using a builder - * val speakingFlags3 = SpeakingFlags { - * +speakingFlags2 - * +SpeakingFlag.Microphone - * -SpeakingFlag.Soundshare - * } - * ``` - * - * ## Modifying an existing instance of [SpeakingFlags] - * - * You can create a modified copy of an existing instance of [SpeakingFlags] using the [copy] - * method: - * ```kotlin - * speakingFlags.copy { - * +SpeakingFlag.Microphone - * } - * ``` - * - * ## Mathematical operators - * - * All [SpeakingFlags] objects can use `+`/`-` operators: - * ```kotlin - * val speakingFlags1 = speakingFlags + SpeakingFlag.Microphone - * val speakingFlags2 = speakingFlags - SpeakingFlag.Soundshare - * val speakingFlags3 = speakingFlags1 + speakingFlags2 - * ``` - * - * ## Checking for [SpeakingFlag]s - * - * You can use the [contains] operator to check whether an instance of [SpeakingFlags] contains - * specific [SpeakingFlag]s: - * ```kotlin - * val hasSpeakingFlag = SpeakingFlag.Microphone in speakingFlags - * val hasSpeakingFlags = SpeakingFlags(SpeakingFlag.Microphone, - * SpeakingFlag.Soundshare) in speakingFlags - * ``` - * - * ## Unknown [SpeakingFlag]s - * - * Whenever [SpeakingFlag]s haven't been added to Kord yet, they will be deserialized as instances - * of [SpeakingFlag.Unknown]. - * - * You can also use [SpeakingFlag.fromShift] to check for [unknown][SpeakingFlag.Unknown] - * [SpeakingFlag]s. - * ```kotlin - * val hasUnknownSpeakingFlag = SpeakingFlag.fromShift(23) in speakingFlags - * ``` - * - * @see SpeakingFlag - * @see SpeakingFlags.Builder - */ -@Serializable(with = SpeakingFlags.Serializer::class) -public class SpeakingFlags internal constructor( - /** - * The raw code used by Discord. - */ - public val code: Int, -) { - /** - * A [Set] of all [SpeakingFlag]s contained in this instance of [SpeakingFlags]. - */ - public val values: Set - get() = buildSet { - var remaining = code - var shift = 0 - while (remaining != 0) { - if ((remaining and 1) != 0) add(SpeakingFlag.fromShift(shift)) - remaining = remaining ushr 1 - shift++ - } - } - - /** - * @suppress - */ - @Deprecated( - message = "Renamed to 'values'.", - replaceWith = ReplaceWith(expression = "this.values", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public val flags: List - get() = values.toList() - - /** - * Checks if this instance of [SpeakingFlags] has all bits set that are set in [flag]. - */ - public operator fun contains(flag: SpeakingFlag): Boolean = this.code and flag.code == flag.code - - /** - * Checks if this instance of [SpeakingFlags] has all bits set that are set in [flags]. - */ - public operator fun contains(flags: SpeakingFlags): Boolean = - this.code and flags.code == flags.code - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and - * [flag]. - */ - public operator fun plus(flag: SpeakingFlag): SpeakingFlags = - SpeakingFlags(this.code or flag.code) - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` and - * [flags]. - */ - public operator fun plus(flags: SpeakingFlags): SpeakingFlags = - SpeakingFlags(this.code or flags.code) - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` except - * the bits that are set in [flag]. - */ - public operator fun minus(flag: SpeakingFlag): SpeakingFlags = - SpeakingFlags(this.code and flag.code.inv()) - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in `this` except - * the bits that are set in [flags]. - */ - public operator fun minus(flags: SpeakingFlags): SpeakingFlags = - SpeakingFlags(this.code and flags.code.inv()) - - /** - * Returns a copy of this instance of [SpeakingFlags] modified with [builder]. - */ - public inline fun copy(builder: Builder.() -> Unit): SpeakingFlags { - contract { callsInPlace(builder, EXACTLY_ONCE) } - return Builder(code).apply(builder).build() - } - - override fun equals(other: Any?): Boolean = this === other || - (other is SpeakingFlags && this.code == other.code) - - override fun hashCode(): Int = code.hashCode() - - override fun toString(): String = "SpeakingFlags(values=$values)" - - public class Builder( - private var code: Int = 0, - ) { - /** - * Sets all bits in the [Builder] that are set in this [SpeakingFlag]. - */ - public operator fun SpeakingFlag.unaryPlus() { - this@Builder.code = this@Builder.code or this.code - } - - /** - * Sets all bits in the [Builder] that are set in this [SpeakingFlags]. - */ - public operator fun SpeakingFlags.unaryPlus() { - this@Builder.code = this@Builder.code or this.code - } - - /** - * Unsets all bits in the [Builder] that are set in this [SpeakingFlag]. - */ - public operator fun SpeakingFlag.unaryMinus() { - this@Builder.code = this@Builder.code and this.code.inv() - } - - /** - * Unsets all bits in the [Builder] that are set in this [SpeakingFlags]. - */ - public operator fun SpeakingFlags.unaryMinus() { - this@Builder.code = this@Builder.code and this.code.inv() - } - - /** - * Returns an instance of [SpeakingFlags] that has all bits set that are currently set in - * this [Builder]. - */ - public fun build(): SpeakingFlags = SpeakingFlags(code) - - /** - * @suppress - */ - @Deprecated( - message = "Renamed to 'build'", - replaceWith = ReplaceWith(expression = "this.build()", imports = arrayOf()), - DeprecationLevel.HIDDEN, - ) - public fun flags(): SpeakingFlags = build() - } - - internal object Serializer : KSerializer { - override val descriptor: SerialDescriptor = - PrimitiveSerialDescriptor("dev.kord.voice.SpeakingFlags", PrimitiveKind.INT) - - private val `delegate`: KSerializer = Int.serializer() - - override fun serialize(encoder: Encoder, `value`: SpeakingFlags) { - encoder.encodeSerializableValue(delegate, value.code) - } - - override fun deserialize(decoder: Decoder): SpeakingFlags = - SpeakingFlags(decoder.decodeSerializableValue(delegate)) - } -} - -/** - * Returns an instance of [SpeakingFlags] built with [SpeakingFlags.Builder]. - */ -public inline fun SpeakingFlags(builder: SpeakingFlags.Builder.() -> Unit = {}): SpeakingFlags { - contract { callsInPlace(builder, EXACTLY_ONCE) } - return SpeakingFlags.Builder().apply(builder).build() -} - -/** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of - * [flags]. - */ -public fun SpeakingFlags(vararg flags: SpeakingFlag): SpeakingFlags = SpeakingFlags { - flags.forEach { +it } -} - -/** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of - * [flags]. - */ -public fun SpeakingFlags(vararg flags: SpeakingFlags): SpeakingFlags = SpeakingFlags { - flags.forEach { +it } -} - -/** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of - * [flags]. - */ -public fun SpeakingFlags(flags: Iterable): SpeakingFlags = SpeakingFlags { - flags.forEach { +it } -} - -/** - * Returns an instance of [SpeakingFlags] that has all bits set that are set in any element of - * [flags]. - */ -@JvmName("SpeakingFlags0") -public fun SpeakingFlags(flags: Iterable): SpeakingFlags = SpeakingFlags { - flags.forEach { +it } -} - -@Suppress("FunctionName") -@Deprecated("Binary compatibility, keep for some releases.", level = DeprecationLevel.HIDDEN) -public fun SpeakingFlagsWithIterable(flags: Iterable): SpeakingFlags = SpeakingFlags(flags) diff --git a/voice/src/main/kotlin/gateway/VoiceGateway.kt b/voice/src/main/kotlin/gateway/VoiceGateway.kt index 9745812ed005..f058e0fee365 100644 --- a/voice/src/main/kotlin/gateway/VoiceGateway.kt +++ b/voice/src/main/kotlin/gateway/VoiceGateway.kt @@ -87,7 +87,7 @@ public interface VoiceGateway { @Suppress("unused") -@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.WARNING) +@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR) @PublishedApi internal val voiceGatewayOnLogger: mu.KLogger = mu.KotlinLogging.logger("Gateway.on")