diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index fee0a52a8c..5bf03a6242 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -23147,39 +23147,38 @@ public final class dev/inmo/tgbotapi/types/message/ChatEvents/voice/VideoChatSta } public final class dev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl : dev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage { - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; - public final fun component10 ()Ldev/inmo/tgbotapi/types/ReplyInfo; - public final fun component11 ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup; - public final fun component12 ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; - public final fun component13 ()Ldev/inmo/tgbotapi/types/chat/CommonBot; - public final fun component14-CsYhHCU ()Ljava/lang/String; - public final fun component15 ()Ljava/lang/Integer; - public final fun component16 ()Z - public final fun component17 ()Ljava/lang/Integer; + public final fun component10 ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup; + public final fun component11 ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; + public final fun component12 ()Ldev/inmo/tgbotapi/types/chat/CommonBot; + public final fun component13-CsYhHCU ()Ljava/lang/String; + public final fun component14 ()Ljava/lang/Integer; + public final fun component15 ()Z + public final fun component16 ()Ljava/lang/Integer; public final fun component2-APLFQys ()J - public final fun component3-hDmiKeI ()J - public final fun component4 ()Ldev/inmo/tgbotapi/types/chat/User; - public final fun component5-Wg0KzQs ()D - public final fun component6 ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; - public final fun component7 ()Ldev/inmo/tgbotapi/types/message/MessageOrigin; - public final fun component8-Ivn3T5g ()Lkorlibs/time/DateTime; - public final fun component9 ()Z - public final fun copy-I4QeWRE (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;)Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl; - public static synthetic fun copy-I4QeWRE$default (Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl;Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JJLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl; + public final fun component3 ()Ldev/inmo/tgbotapi/types/chat/User; + public final fun component4-Wg0KzQs ()D + public final fun component5 ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; + public final fun component6 ()Ldev/inmo/tgbotapi/types/message/MessageOrigin; + public final fun component7-Ivn3T5g ()Lkorlibs/time/DateTime; + public final fun component8 ()Z + public final fun component9 ()Ldev/inmo/tgbotapi/types/ReplyInfo; + public final fun copy-ZKlzU5U (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;)Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl; + public static synthetic fun copy-ZKlzU5U$default (Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl;Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;JLdev/inmo/tgbotapi/types/chat/User;DLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesContentMessageImpl; public fun equals (Ljava/lang/Object;)Z public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; public fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; - public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewForumChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; public fun getContent ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; public fun getCost ()Ljava/lang/Integer; public fun getDate-Wg0KzQs ()D + public fun getDirectMessageThreadId-_JBF_Q4 ()J public fun getDirectMessageTopic ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; public fun getEditDate-Ivn3T5g ()Lkorlibs/time/DateTime; public fun getForwardInfo ()Ldev/inmo/tgbotapi/types/message/ForwardInfo; @@ -23196,9 +23195,6 @@ public final class dev/inmo/tgbotapi/types/message/CommonChannelDirectMessagesCo public fun getReplyTo ()Ldev/inmo/tgbotapi/types/message/abstracts/Message; public fun getSenderBoostsCount ()Ljava/lang/Integer; public fun getSenderBot ()Ldev/inmo/tgbotapi/types/chat/CommonBot; - public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; - public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; - public fun getThreadId-hDmiKeI ()J public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; @@ -23525,41 +23521,40 @@ public final class dev/inmo/tgbotapi/types/message/ForwardInfoKt { } public final class dev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl : dev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage { - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/ForwardInfo;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; - public final fun component10 ()Ldev/inmo/tgbotapi/types/ReplyInfo; - public final fun component11 ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup; - public final fun component12 ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; - public final fun component13 ()Ldev/inmo/tgbotapi/types/chat/CommonBot; - public final fun component14 ()Ljava/lang/String; - public final fun component15-CsYhHCU ()Ljava/lang/String; - public final fun component16 ()Z - public final fun component17 ()Ljava/lang/Integer; + public final fun component10 ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup; + public final fun component11 ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; + public final fun component12 ()Ldev/inmo/tgbotapi/types/chat/CommonBot; + public final fun component13 ()Ljava/lang/String; + public final fun component14-CsYhHCU ()Ljava/lang/String; + public final fun component15 ()Z + public final fun component16 ()Ljava/lang/Integer; public final fun component2 ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat; public final fun component3-APLFQys ()J - public final fun component4-hDmiKeI ()J - public final fun component5-Wg0KzQs ()D - public final fun component6 ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; - public final fun component7 ()Ldev/inmo/tgbotapi/types/message/MessageOrigin; - public final fun component8-Ivn3T5g ()Lkorlibs/time/DateTime; - public final fun component9 ()Z - public final fun copy-q-JDLes (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;)Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl; - public static synthetic fun copy-q-JDLes$default (Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl;Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JJDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl; + public final fun component4-Wg0KzQs ()D + public final fun component5 ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; + public final fun component6 ()Ldev/inmo/tgbotapi/types/message/MessageOrigin; + public final fun component7-Ivn3T5g ()Lkorlibs/time/DateTime; + public final fun component8 ()Z + public final fun component9 ()Ldev/inmo/tgbotapi/types/ReplyInfo; + public final fun copy-ccPaxwY (Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;)Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl; + public static synthetic fun copy-ccPaxwY$default (Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl;Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat;Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;JDLdev/inmo/tgbotapi/types/chat/DirectMessagesTopic;Ldev/inmo/tgbotapi/types/message/MessageOrigin;Lkorlibs/time/DateTime;ZLdev/inmo/tgbotapi/types/ReplyInfo;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Ldev/inmo/tgbotapi/types/message/content/MessageContent;Ldev/inmo/tgbotapi/types/chat/CommonBot;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessagesContentMessageImpl; public fun equals (Ljava/lang/Object;)Z public fun getAuthorSignature ()Ljava/lang/String; public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; public fun getChannel ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat; public fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; - public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewForumChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; public fun getContent ()Ldev/inmo/tgbotapi/types/message/content/MessageContent; public fun getCost ()Ljava/lang/Integer; public fun getDate-Wg0KzQs ()D + public fun getDirectMessageThreadId-_JBF_Q4 ()J public fun getDirectMessageTopic ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; public fun getEditDate-Ivn3T5g ()Lkorlibs/time/DateTime; public fun getForwardInfo ()Ldev/inmo/tgbotapi/types/message/ForwardInfo; @@ -23576,9 +23571,6 @@ public final class dev/inmo/tgbotapi/types/message/FromChannelChannelDirectMessa public fun getSenderBot ()Ldev/inmo/tgbotapi/types/chat/CommonBot; public fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat; public synthetic fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; - public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; - public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; - public fun getThreadId-hDmiKeI ()J public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -24160,18 +24152,19 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ChannelContentMessa public static fun getUser (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelContentMessage;)Ldev/inmo/tgbotapi/types/chat/User; } -public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage : dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyTopicMessage { +public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage { public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; + public fun getDirectMessageThreadId-_JBF_Q4 ()J public abstract fun getDirectMessageTopic ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; } public final class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage$DefaultImpls { public static fun getBusinessConnectionId-nXr5wdE (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Ljava/lang/String; + public static fun getDirectMessageThreadId-_JBF_Q4 (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)J public static fun getForwardInfo (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ForwardInfo; public static fun getForwardable (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Z public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Lkotlin/Triple; public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message; - public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesEventMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage { @@ -24213,11 +24206,11 @@ public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/Common public final class dev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage$DefaultImpls { public static fun getBusinessConnectionId-nXr5wdE (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Ljava/lang/String; + public static fun getDirectMessageThreadId-_JBF_Q4 (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)J public static fun getForwardInfo (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ForwardInfo; public static fun getForwardable (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Z public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Lkotlin/Triple; public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message; - public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; public static fun getUser (Ldev/inmo/tgbotapi/types/message/abstracts/CommonChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/chat/User; } @@ -24301,12 +24294,12 @@ public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/FromCh public final class dev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage$DefaultImpls { public static fun getBusinessConnectionId-nXr5wdE (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Ljava/lang/String; + public static fun getDirectMessageThreadId-_JBF_Q4 (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)J public static fun getForwardInfo (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ForwardInfo; public static fun getForwardable (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Z public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Lkotlin/Triple; public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message; public static fun getSenderChat (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat; - public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelChannelDirectMessagesContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage : dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage, dev/inmo/tgbotapi/types/message/abstracts/FromChannelGroupContentMessage { diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt index 5dcfcc0d46..a296693fe4 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt @@ -280,7 +280,6 @@ data class FromChannelChannelDirectMessagesContentMessageImpl override val chat: PreviewChannelDirectMessagesChat, override val channel: PreviewChannelChat, override val messageId: MessageId, - override val threadId: MessageThreadId, override val date: DateTime, override val directMessageTopic: DirectMessagesTopic, override val forwardOrigin: MessageOrigin?, @@ -300,7 +299,6 @@ data class FromChannelChannelDirectMessagesContentMessageImpl chat: PreviewChannelDirectMessagesChat, channel: PreviewChannelChat, messageId: MessageId, - threadId: MessageThreadId, date: DateTime, directMessageTopic: DirectMessagesTopic, forwardInfo: ForwardInfo, @@ -318,7 +316,6 @@ data class FromChannelChannelDirectMessagesContentMessageImpl chat = chat, channel = channel, messageId = messageId, - threadId = threadId, date = date, directMessageTopic = directMessageTopic, forwardOrigin = forwardInfo.messageOrigin(), @@ -448,7 +445,6 @@ data class CommonForumContentMessageImpl( data class CommonChannelDirectMessagesContentMessageImpl( override val chat: PreviewChannelDirectMessagesChat, override val messageId: MessageId, - override val threadId: MessageThreadId, override val from: User, override val date: DateTime, override val directMessageTopic: DirectMessagesTopic, @@ -468,7 +464,6 @@ data class CommonChannelDirectMessagesContentMessageImpl( constructor( chat: PreviewChannelDirectMessagesChat, messageId: MessageId, - threadId: MessageThreadId, from: User, date: DateTime, directMessageTopic: DirectMessagesTopic, @@ -486,7 +481,6 @@ data class CommonChannelDirectMessagesContentMessageImpl( ) : this( chat = chat, messageId = messageId, - threadId = threadId, from = from, date = date, directMessageTopic = directMessageTopic, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt index 151add37eb..09305c7bf5 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt @@ -452,7 +452,6 @@ internal data class RawMessage( chat = actualForumChat, channel = sender_chat, messageId = messageId, - threadId = messageThreadId, date = date.asDate, directMessageTopic = direct_messages_topic ?: error("direct_messages_topic must be presented for FromChannelChannelDirectMessagesContentMessage"), forwardOrigin = forward_origin, @@ -471,7 +470,6 @@ internal data class RawMessage( null -> CommonChannelDirectMessagesContentMessageImpl( chat = actualForumChat, messageId = messageId, - threadId = messageThreadId, from = checkedFrom ?: from ?: error("It is expected that in direct channel messages from non anonymous channels user must be specified"), date = date.asDate, directMessageTopic = direct_messages_topic ?: error("direct_messages_topic must be presented for CommonChannelDirectMessagesContentMessage"), @@ -490,8 +488,8 @@ internal data class RawMessage( } } else { when (sender_chat) { - is PreviewChannelChat -> if (is_automatic_forward == true) { - ConnectedFromChannelGroupContentMessageImpl( + is PreviewChannelChat -> when { + is_automatic_forward == true -> ConnectedFromChannelGroupContentMessageImpl( chat = chat, channel = sender_chat, messageId = messageId, @@ -508,8 +506,32 @@ internal data class RawMessage( fromOffline = is_from_offline, cost = paid_star_count, ) - } else { - UnconnectedFromChannelGroupContentMessageImpl( + direct_messages_topic != null -> CommonChannelDirectMessagesContentMessageImpl( + chat = when (chat) { + is ChannelDirectMessagesChatImpl -> chat.copy( + id = ChatIdWithChannelDirectMessageThreadId( + chat.id.chatId, + direct_messages_topic.threadId + ) + ) + }, + messageId = messageId, + from = checkedFrom ?: from ?: error("It is expected that in direct channel messages from non anonymous channels user must be specified"), + date = date.asDate, + directMessageTopic = direct_messages_topic ?: error("direct_messages_topic must be presented for CommonChannelDirectMessagesContentMessage"), + forwardOrigin = forward_origin, + editDate = edit_date ?.asDate, + hasProtectedContent = has_protected_content == true, + replyInfo = replyInfo, + replyMarkup = reply_markup, + content = content, + senderBot = via_bot, + mediaGroupId = media_group_id, + senderBoostsCount = sender_boost_count, + fromOffline = is_from_offline, + cost = paid_star_count, + ) + else -> UnconnectedFromChannelGroupContentMessageImpl( chat = chat, channel = sender_chat, messageId = messageId, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt index 3e917810c4..ff9c4d814a 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt @@ -1,6 +1,7 @@ package dev.inmo.tgbotapi.types.message.abstracts import dev.inmo.tgbotapi.requests.chat.forum.CreateForumTopic +import dev.inmo.tgbotapi.types.DirectMessageThreadId import dev.inmo.tgbotapi.types.MessageThreadId import dev.inmo.tgbotapi.types.chat.* import dev.inmo.tgbotapi.types.message.ChatEvents.forum.ForumTopicCreated @@ -22,9 +23,11 @@ sealed interface ForumContentMessage : GroupContentMessage) ?.chatEvent as? ForumTopicCreated } -sealed interface ChannelDirectMessagesContentMessage : ForumContentMessage, PossiblyTopicMessage { +sealed interface ChannelDirectMessagesContentMessage : GroupContentMessage { override val chat: PreviewChannelDirectMessagesChat val directMessageTopic: DirectMessagesTopic + val directMessageThreadId: DirectMessageThreadId + get() = directMessageTopic.threadId } sealed interface FromChannelGroupContentMessage : GroupContentMessage, SignedMessage, WithSenderChatMessage { diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt index 6d35213263..d1691d55e3 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/MediaGroupContentMessageCreator.kt @@ -172,7 +172,6 @@ fun List>.asMedia is CommonChannelDirectMessagesContentMessage -> CommonChannelDirectMessagesContentMessageImpl( chat = sourceMessage.chat, messageId = sourceMessage.messageId, - threadId = sourceMessage.threadId, from = sourceMessage.user, date = sourceMessage.date, directMessageTopic = sourceMessage.directMessageTopic, @@ -211,7 +210,6 @@ fun List>.asMedia chat = sourceMessage.chat, channel = sourceMessage.channel, messageId = sourceMessage.messageId, - threadId = sourceMessage.threadId, date = sourceMessage.date, directMessageTopic = sourceMessage.directMessageTopic, forwardOrigin = sourceMessage.forwardOrigin,