From 87ed66e3ad2d70e4e0129baf1a9659036ae09a27 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 30 Aug 2024 19:04:10 +0600 Subject: [PATCH] update ChatMember to use PreviewUser instead of User --- CHANGELOG.md | 1 + tgbotapi.core/api/tgbotapi.core.api | 104 ++++++++++-------- .../member/AdministratorChatMemberImpl.kt | 3 +- .../tgbotapi/types/chat/member/ChatMember.kt | 3 + .../types/chat/member/ChatMemberUpdated.kt | 8 +- .../types/chat/member/KickedChatMember.kt | 3 +- .../types/chat/member/LeftChatMemberImpl.kt | 3 +- .../types/chat/member/MemberChatMemberImpl.kt | 3 +- .../types/chat/member/OwnerChatMember.kt | 3 +- .../types/chat/member/RestrictedChatMember.kt | 3 +- .../chat/member/RestrictedMemberChatMember.kt | 3 +- .../SubscriptionMemberChatMemberImpl.kt | 3 +- 12 files changed, 83 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10538e2ddc..2b992b8530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ Replace in a whole project: * `RestrictedChatMember` has been renamed to `RestrictedMemberChatMember` * `BannedChatMember` has been renamed to `RestrictedChatMember` * `KickedChatMember` now implements `RestrictedChatMember` (due to rename) + * All `ChatMember`s now use `PreviewUser`s instead of `User`s * `Utils`: * Add a lot of extensions like `ChatMember.isMember` * Add a lot of extensions like `ChatMemberUpdated.joinedChat` diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index 65674292f3..a1bc0be9f2 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -15610,9 +15610,9 @@ public final class dev/inmo/tgbotapi/types/chat/member/AdministratorChatMember$D public final class dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl : dev/inmo/tgbotapi/types/chat/member/AdministratorChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;ZZZZZZZZZZZZLjava/lang/String;ZZZZ)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/User;ZZZZZZZZZZZZLjava/lang/String;ZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZZZZZZZZZZZZLjava/lang/String;ZZZZ)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZZZZZZZZZZZZLjava/lang/String;ZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component10 ()Z public final fun component11 ()Z public final fun component12 ()Z @@ -15630,8 +15630,8 @@ public final class dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberIm public final fun component7 ()Z public final fun component8 ()Z public final fun component9 ()Z - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;ZZZZZZZZZZZZLjava/lang/String;ZZZZ)Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/User;ZZZZZZZZZZZZLjava/lang/String;ZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZZZZZZZZZZZZLjava/lang/String;ZZZZ)Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZZZZZZZZZZZZLjava/lang/String;ZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl; public fun equals (Ljava/lang/Object;)Z public fun getCanBeEdited ()Z public fun getCanChangeInfo ()Z @@ -15651,7 +15651,8 @@ public final class dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberIm public fun getCanRestrictMembers ()Z public fun getCustomTitle ()Ljava/lang/String; public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun isAnonymous ()Z public fun toString ()Ljava/lang/String; @@ -15761,6 +15762,7 @@ public final class dev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRi public abstract interface class dev/inmo/tgbotapi/types/chat/member/ChatMember : dev/inmo/tgbotapi/abstracts/WithUser { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Companion; public abstract fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; + public abstract fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; } public final class dev/inmo/tgbotapi/types/chat/member/ChatMember$Companion { @@ -15808,25 +15810,27 @@ public final class dev/inmo/tgbotapi/types/chat/member/ChatMemberSerializer : ko public final class dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated : dev/inmo/tgbotapi/abstracts/WithPreviewChat, dev/inmo/tgbotapi/abstracts/WithUser { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; - public final fun component2 ()Ldev/inmo/tgbotapi/types/chat/User; + public final fun component2 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component3 ()Ldev/inmo/tgbotapi/types/TelegramDate; public final fun component4 ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember; public final fun component5 ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember; public final fun component6 ()Ldev/inmo/tgbotapi/types/ChatInviteLink; public final fun component7 ()Ljava/lang/Boolean; public final fun component8 ()Ljava/lang/Boolean; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated;Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated;Ldev/inmo/tgbotapi/types/chat/PreviewChat;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/chat/member/ChatMember;Ldev/inmo/tgbotapi/types/ChatInviteLink;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated; public fun equals (Ljava/lang/Object;)Z public fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public final fun getDate ()Ldev/inmo/tgbotapi/types/TelegramDate; public final fun getInviteLink ()Ldev/inmo/tgbotapi/types/ChatInviteLink; + public final fun getMember ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun getNewChatMemberState ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember; public final fun getOldChatMemberState ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public final fun getViaChatFolderInviteLink ()Ljava/lang/Boolean; public final fun getViaJoinRequest ()Ljava/lang/Boolean; public fun hashCode ()I @@ -15850,16 +15854,17 @@ public final class dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated$Compani public final class dev/inmo/tgbotapi/types/chat/member/KickedChatMember : dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component2 ()Ldev/inmo/tgbotapi/types/TelegramDate; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;)Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;)Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/KickedChatMember; public fun equals (Ljava/lang/Object;)Z public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; public fun getUntilDate ()Ldev/inmo/tgbotapi/types/TelegramDate; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -15889,13 +15894,14 @@ public final class dev/inmo/tgbotapi/types/chat/member/LeftChatMember$Companion public final class dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl : dev/inmo/tgbotapi/types/chat/member/LeftChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/User;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;)Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/PreviewUser;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl; public fun equals (Ljava/lang/Object;)Z public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -15925,13 +15931,14 @@ public final class dev/inmo/tgbotapi/types/chat/member/MemberChatMember$Companio public final class dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl : dev/inmo/tgbotapi/types/chat/member/MemberChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/User;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;)Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/PreviewUser;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl; public fun equals (Ljava/lang/Object;)Z public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -15953,13 +15960,13 @@ public final class dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl$Comp public final class dev/inmo/tgbotapi/types/chat/member/OwnerChatMember : dev/inmo/tgbotapi/types/chat/member/AdministratorChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;ZLjava/lang/String;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/User;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZLjava/lang/String;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component2 ()Z public final fun component3 ()Ljava/lang/String; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;ZLjava/lang/String;)Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember;Ldev/inmo/tgbotapi/types/chat/User;ZLjava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZLjava/lang/String;)Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember;Ldev/inmo/tgbotapi/types/chat/PreviewUser;ZLjava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/OwnerChatMember; public fun equals (Ljava/lang/Object;)Z public fun getCanBeEdited ()Z public fun getCanChangeInfo ()Z @@ -15979,7 +15986,8 @@ public final class dev/inmo/tgbotapi/types/chat/member/OwnerChatMember : dev/inm public fun getCanRestrictMembers ()Z public fun getCustomTitle ()Ljava/lang/String; public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun isAnonymous ()Z public fun toString ()Ljava/lang/String; @@ -16005,16 +16013,16 @@ public abstract interface class dev/inmo/tgbotapi/types/chat/member/RestrictedCh } public final class dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember$Companion { - public final fun invoke (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; - public static synthetic fun invoke$default (Ldev/inmo/tgbotapi/types/chat/member/RestrictedChatMember$Companion;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; + public final fun invoke (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; + public static synthetic fun invoke$default (Ldev/inmo/tgbotapi/types/chat/member/RestrictedChatMember$Companion;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember : dev/inmo/tgbotapi/types/chat/ChatPermissions, dev/inmo/tgbotapi/types/chat/member/MemberChatMember, dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember, dev/inmo/tgbotapi/types/chat/member/SpecialRightsChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component10 ()Z public final fun component11 ()Z public final fun component12 ()Z @@ -16031,8 +16039,8 @@ public final class dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMembe public final fun component7 ()Z public final fun component8 ()Z public final fun component9 ()Z - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZ)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ZZZZZZZZZZZZZZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember; public fun copyCommon (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/chat/ChatPermissions; public fun copyGranular (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/chat/ChatPermissions; public fun equals (Ljava/lang/Object;)Z @@ -16057,7 +16065,8 @@ public final class dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMembe public fun getCanSendVoiceNotes ()Ljava/lang/Boolean; public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; public fun getUntilDate ()Ldev/inmo/tgbotapi/types/TelegramDate; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun isGranular ()Z public final fun isMember ()Z @@ -16110,16 +16119,17 @@ public final class dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMem public final class dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl : dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMember { public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl$Companion; - public fun (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;)V - public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/User; + public fun (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;)V + public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; public final fun component2 ()Ldev/inmo/tgbotapi/types/TelegramDate; - public final fun copy (Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;)Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/TelegramDate;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl; + public final fun copy (Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;)Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl; + public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl;Ldev/inmo/tgbotapi/types/chat/PreviewUser;Ldev/inmo/tgbotapi/types/TelegramDate;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl; public fun equals (Ljava/lang/Object;)Z public fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; public fun getUntil-Wg0KzQs ()D public fun getUntilDate ()Ldev/inmo/tgbotapi/types/TelegramDate; - public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; + public fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl.kt index 757cacf244..16d2207c81 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl.kt @@ -1,13 +1,14 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @Serializable data class AdministratorChatMemberImpl( @SerialName(userField) - override val user: User, + override val user: PreviewUser, @SerialName(canBeEditedField) override val canBeEdited: Boolean = false, @SerialName(canChangeInfoField) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt index 29325c1a94..dff68e08c4 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt @@ -1,6 +1,8 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.abstracts.WithUser +import dev.inmo.tgbotapi.types.chat.PreviewUser +import dev.inmo.tgbotapi.types.chat.User import dev.inmo.tgbotapi.types.statusField import dev.inmo.tgbotapi.types.untilDateField import dev.inmo.tgbotapi.utils.RiskFeature @@ -17,6 +19,7 @@ import kotlinx.serialization.json.jsonPrimitive @Serializable(ChatMemberSerializer::class) sealed interface ChatMember : WithUser { + override val user: PreviewUser @Serializable(StatusSerializer::class) enum class Status( val status: String, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt index 068c817ded..09feaab826 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt @@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.abstracts.WithUser import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.chat.Chat import dev.inmo.tgbotapi.types.chat.PreviewChat +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -14,7 +15,7 @@ data class ChatMemberUpdated( @SerialName(chatField) override val chat: PreviewChat, @SerialName(fromField) - override val user: User, + override val user: PreviewUser, @SerialName(dateField) val date: TelegramDate, @SerialName(oldChatMemberField) @@ -27,4 +28,7 @@ data class ChatMemberUpdated( val viaChatFolderInviteLink: Boolean? = false, @SerialName(viaJoinRequestField) val viaJoinRequest: Boolean? = false -) : WithPreviewChat, WithUser +) : WithPreviewChat, WithUser { + val member: PreviewUser + get() = newChatMemberState.user +} diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/KickedChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/KickedChatMember.kt index 91d0655db0..567678b50a 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/KickedChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/KickedChatMember.kt @@ -1,13 +1,14 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @Serializable data class KickedChatMember( @SerialName(userField) - override val user: User, + override val user: PreviewUser, @SerialName(untilDateField) override val untilDate: TelegramDate? = null ) : RestrictedChatMember { diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl.kt index 1060213cd0..3d4b77091d 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl.kt @@ -1,13 +1,14 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @Serializable data class LeftChatMemberImpl( @SerialName(userField) - override val user: User + override val user: PreviewUser ) : LeftChatMember { @SerialName(statusField) @Required diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl.kt index 19030de711..615882bd1c 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl.kt @@ -1,6 +1,7 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import korlibs.time.DateTime import kotlinx.serialization.* @@ -8,7 +9,7 @@ import kotlinx.serialization.* @Serializable data class MemberChatMemberImpl( @SerialName(userField) - override val user: User + override val user: PreviewUser ) : MemberChatMember { @SerialName(statusField) @Required diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt index 666fa2b8b5..fad044dfa0 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt @@ -1,12 +1,13 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @Serializable data class OwnerChatMember( - override val user: User, + override val user: PreviewUser, @SerialName(isAnonymousField) override val isAnonymous: Boolean = false, @SerialName(customTitleField) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember.kt index f0002d1a96..5a9612716a 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember.kt @@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.abstracts.types.UntilDate import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.Serializable @@ -17,7 +18,7 @@ sealed interface RestrictedChatMember : ChatMember, UntilDate { ) ) operator fun invoke( - user: User, + user: PreviewUser, untilDate: TelegramDate? = null, isMember: Boolean = false, canSendMessages: Boolean = false, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember.kt index ed92eb7f8c..0aff1393e9 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedMemberChatMember.kt @@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.chat.ChatPermissions +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @@ -12,7 +13,7 @@ import kotlinx.serialization.* @Serializable data class RestrictedMemberChatMember( @SerialName(userField) - override val user: User, + override val user: PreviewUser, @SerialName(untilDateField) override val untilDate: TelegramDate? = null, @SerialName(isMemberField) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl.kt index e36f884394..dcfb1ddae9 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/SubscriptionMemberChatMemberImpl.kt @@ -1,6 +1,7 @@ package dev.inmo.tgbotapi.types.chat.member import dev.inmo.tgbotapi.types.* +import dev.inmo.tgbotapi.types.chat.PreviewUser import dev.inmo.tgbotapi.types.chat.User import korlibs.time.DateTime import kotlinx.serialization.* @@ -8,7 +9,7 @@ import kotlinx.serialization.* @Serializable data class SubscriptionMemberChatMemberImpl( @SerialName(userField) - override val user: User, + override val user: PreviewUser, @SerialName(untilDateField) @Serializable(TelegramDateSerializer::class) override val untilDate: TelegramDate