mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2026-06-18 01:05:21 +00:00
small improvement in message hierarchy
This commit is contained in:
@@ -7,6 +7,7 @@ import dev.inmo.tgbotapi.types.chat.PreviewChat
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.FromUserMessage
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.ChatMessage
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.FromUserChatMessage
|
||||
import dev.inmo.tgbotapi.types.passport.PassportData
|
||||
|
||||
data class PassportMessage(
|
||||
@@ -15,4 +16,4 @@ data class PassportMessage(
|
||||
override val from: User,
|
||||
override val date: DateTime,
|
||||
val passportData: PassportData
|
||||
) : ChatMessage, FromUserMessage
|
||||
) : FromUserChatMessage
|
||||
|
||||
@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.chat.PreviewBot
|
||||
import dev.inmo.tgbotapi.types.chat.PreviewBusinessChat
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
|
||||
interface BusinessContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage,
|
||||
interface BusinessContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserChatMessage,
|
||||
WithBusinessConnectionId {
|
||||
override val chat: PreviewBusinessChat
|
||||
override val businessConnectionId: BusinessConnectionId
|
||||
|
||||
@@ -6,3 +6,5 @@ import dev.inmo.tgbotapi.abstracts.OptionallyFromUser
|
||||
interface OptionallyFromUserMessage : OptionallyFromUser, Message
|
||||
|
||||
interface FromUserMessage : OptionallyFromUserMessage, FromUser
|
||||
|
||||
interface FromUserChatMessage : FromUserMessage, ChatMessage
|
||||
|
||||
@@ -4,6 +4,6 @@ import dev.inmo.tgbotapi.types.chat.PreviewChat
|
||||
import dev.inmo.tgbotapi.types.chat.PreviewGroupChat
|
||||
import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
|
||||
|
||||
interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserMessage {
|
||||
interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserChatMessage {
|
||||
override val chat: PreviewGroupChat
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage
|
||||
get() = chat
|
||||
}
|
||||
|
||||
interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserMessage, PossiblyGuestAnswerMessage
|
||||
interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserChatMessage, PossiblyGuestAnswerMessage
|
||||
|
||||
interface FromChannelForumContentMessage<T: MessageContent> : FromChannelGroupContentMessage<T>, ForumContentMessage<T>
|
||||
|
||||
@@ -62,8 +62,8 @@ interface AnonymousForumContentMessage<T : MessageContent> : ForumContentMessage
|
||||
get() = chat
|
||||
}
|
||||
|
||||
interface CommonForumContentMessage<T : MessageContent> : ForumContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserMessage, PossiblyGuestAnswerMessage
|
||||
interface CommonForumContentMessage<T : MessageContent> : ForumContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserChatMessage, PossiblyGuestAnswerMessage
|
||||
|
||||
interface CommonChannelDirectMessagesContentMessage<T : MessageContent> : ChannelDirectMessagesContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserMessage
|
||||
interface CommonChannelDirectMessagesContentMessage<T : MessageContent> : ChannelDirectMessagesContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserChatMessage
|
||||
|
||||
interface CommonSuggestedChannelDirectMessagesContentMessage<T : MessageContent> : SuggestedChannelDirectMessagesContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserMessage
|
||||
interface CommonSuggestedChannelDirectMessagesContentMessage<T : MessageContent> : SuggestedChannelDirectMessagesContentMessage<T>, PotentiallyFromUserGroupContentMessage<T>, FromUserChatMessage
|
||||
|
||||
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.types.chat.PreviewPrivateChat
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
|
||||
interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>,
|
||||
FromUserMessage,
|
||||
FromUserChatMessage,
|
||||
PossiblyOfflineMessage,
|
||||
PossiblyWithEffectMessage,
|
||||
PossiblyGuestAnswerMessage {
|
||||
|
||||
Reference in New Issue
Block a user