mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2024-11-26 12:08:43 +00:00
remove deprecations
This commit is contained in:
parent
f9e3e57f24
commit
0adee13cba
@ -20,5 +20,3 @@ data class ChannelContentMessageImpl<T: MessageContent>(
|
|||||||
override val senderBot: CommonBot?,
|
override val senderBot: CommonBot?,
|
||||||
override val authorSignature: AuthorSignature?
|
override val authorSignature: AuthorSignature?
|
||||||
) : ChannelContentMessage<T>
|
) : ChannelContentMessage<T>
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl"))
|
|
||||||
typealias ChannelMessageImpl<T> = ChannelContentMessageImpl<T>
|
|
||||||
|
@ -21,8 +21,6 @@ data class FromChannelGroupContentMessageImpl<T : MessageContent>(
|
|||||||
override val senderBot: CommonBot?,
|
override val senderBot: CommonBot?,
|
||||||
override val authorSignature: AuthorSignature?
|
override val authorSignature: AuthorSignature?
|
||||||
) : FromChannelGroupContentMessage<T>
|
) : FromChannelGroupContentMessage<T>
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.FromChannelGroupContentMessageImpl"))
|
|
||||||
typealias FromChannelGroupMessageImpl<T> = FromChannelGroupContentMessageImpl<T>
|
|
||||||
|
|
||||||
data class AnonymousGroupContentMessageImpl<T : MessageContent>(
|
data class AnonymousGroupContentMessageImpl<T : MessageContent>(
|
||||||
override val chat: GroupChat,
|
override val chat: GroupChat,
|
||||||
@ -36,8 +34,6 @@ data class AnonymousGroupContentMessageImpl<T : MessageContent>(
|
|||||||
override val senderBot: CommonBot?,
|
override val senderBot: CommonBot?,
|
||||||
override val authorSignature: AuthorSignature?
|
override val authorSignature: AuthorSignature?
|
||||||
) : AnonymousGroupContentMessage<T>
|
) : AnonymousGroupContentMessage<T>
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl"))
|
|
||||||
typealias AnonymousGroupMessageImpl<T> = AnonymousGroupContentMessageImpl<T>
|
|
||||||
|
|
||||||
data class CommonGroupContentMessageImpl<T : MessageContent>(
|
data class CommonGroupContentMessageImpl<T : MessageContent>(
|
||||||
override val chat: GroupChat,
|
override val chat: GroupChat,
|
||||||
@ -51,5 +47,3 @@ data class CommonGroupContentMessageImpl<T : MessageContent>(
|
|||||||
override val content: T,
|
override val content: T,
|
||||||
override val senderBot: CommonBot?
|
override val senderBot: CommonBot?
|
||||||
) : CommonGroupContentMessage<T>
|
) : CommonGroupContentMessage<T>
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl"))
|
|
||||||
typealias CommonGroupMessageImpl<T> = CommonGroupContentMessageImpl<T>
|
|
||||||
|
@ -22,5 +22,3 @@ data class PrivateContentMessageImpl<T: MessageContent>(
|
|||||||
override val senderBot: CommonBot?,
|
override val senderBot: CommonBot?,
|
||||||
val paymentInfo: SuccessfulPaymentInfo?
|
val paymentInfo: SuccessfulPaymentInfo?
|
||||||
) : PrivateContentMessage<T>
|
) : PrivateContentMessage<T>
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl"))
|
|
||||||
typealias PrivateMessageImpl<T> = PrivateContentMessageImpl<T>
|
|
||||||
|
@ -9,5 +9,3 @@ interface ChannelContentMessage<T: MessageContent> : PossiblySentViaBotCommonMes
|
|||||||
override val senderChat: ChannelChat
|
override val senderChat: ChannelChat
|
||||||
get() = chat
|
get() = chat
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage"))
|
|
||||||
typealias ChannelMessage<T> = ChannelContentMessage<T>
|
|
||||||
|
@ -7,8 +7,6 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
|||||||
interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
|
interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
|
||||||
override val chat: GroupChat
|
override val chat: GroupChat
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("GroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage"))
|
|
||||||
typealias GroupMessage<T> = GroupContentMessage<T>
|
|
||||||
|
|
||||||
|
|
||||||
interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
|
interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
|
||||||
@ -16,16 +14,10 @@ interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessa
|
|||||||
override val senderChat: ChannelChat
|
override val senderChat: ChannelChat
|
||||||
get() = channel
|
get() = channel
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.FromChannelGroupContentMessage"))
|
|
||||||
typealias FromChannelGroupMessage<T> = FromChannelGroupContentMessage<T>
|
|
||||||
|
|
||||||
interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
|
interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
|
||||||
override val senderChat: GroupChat
|
override val senderChat: GroupChat
|
||||||
get() = chat
|
get() = chat
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage"))
|
|
||||||
typealias AnonymousGroupMessage<T> = AnonymousGroupContentMessage<T>
|
|
||||||
|
|
||||||
interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, FromUserMessage
|
interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, FromUserMessage
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage"))
|
|
||||||
typealias CommonGroupMessage<T> = CommonGroupContentMessage<T>
|
|
||||||
|
@ -4,5 +4,3 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
|||||||
import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage
|
import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage
|
||||||
|
|
||||||
interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
|
interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage"))
|
|
||||||
typealias PrivateMessage<T> = PrivateContentMessage<T>
|
|
||||||
|
@ -7,5 +7,3 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommo
|
|||||||
interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
|
interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
|
||||||
override val chat: PublicChat
|
override val chat: PublicChat
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PublicContentMessage", "dev.inmo.tgbotapi.types.message.PublicContentMessage"))
|
|
||||||
typealias PublicMessage<T> = PublicContentMessage<T>
|
|
||||||
|
@ -30,37 +30,4 @@ data class TextContent(
|
|||||||
allowSendingWithoutReply,
|
allowSendingWithoutReply,
|
||||||
replyMarkup
|
replyMarkup
|
||||||
)
|
)
|
||||||
|
|
||||||
@Deprecated(
|
|
||||||
"Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
|
|
||||||
ReplaceWith("createResend")
|
|
||||||
)
|
|
||||||
override fun createResends(
|
|
||||||
chatId: ChatIdentifier,
|
|
||||||
disableNotification: Boolean,
|
|
||||||
replyToMessageId: MessageIdentifier?,
|
|
||||||
allowSendingWithoutReply: Boolean?,
|
|
||||||
replyMarkup: KeyboardMarkup?
|
|
||||||
): List<Request<ContentMessage<TextContent>>> = listOf(
|
|
||||||
createResend(
|
|
||||||
chatId,
|
|
||||||
disableNotification,
|
|
||||||
replyToMessageId,
|
|
||||||
allowSendingWithoutReply,
|
|
||||||
replyMarkup
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
@Deprecated(
|
|
||||||
"Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
|
|
||||||
ReplaceWith("createResend")
|
|
||||||
)
|
|
||||||
fun createResends(
|
|
||||||
chatId: ChatIdentifier,
|
|
||||||
disableNotification: Boolean,
|
|
||||||
replyToMessageId: MessageIdentifier?,
|
|
||||||
allowSendingWithoutReply: Boolean?,
|
|
||||||
replyMarkup: KeyboardMarkup?,
|
|
||||||
parseMode: ParseMode = defaultParseMode
|
|
||||||
): List<Request<ContentMessage<TextContent>>> = createResends(chatId, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
|
|
||||||
}
|
}
|
||||||
|
@ -14,12 +14,4 @@ interface ResendableContent {
|
|||||||
allowSendingWithoutReply: Boolean? = null,
|
allowSendingWithoutReply: Boolean? = null,
|
||||||
replyMarkup: KeyboardMarkup? = null
|
replyMarkup: KeyboardMarkup? = null
|
||||||
): Request<out Message>
|
): Request<out Message>
|
||||||
|
|
||||||
fun createResends(
|
|
||||||
chatId: ChatIdentifier,
|
|
||||||
disableNotification: Boolean = false,
|
|
||||||
replyToMessageId: MessageIdentifier? = null,
|
|
||||||
allowSendingWithoutReply: Boolean? = null,
|
|
||||||
replyMarkup: KeyboardMarkup? = null
|
|
||||||
): List<Request<out Message>> = listOf(createResend(chatId, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup))
|
|
||||||
}
|
}
|
@ -37,8 +37,6 @@ data class StorageFile(
|
|||||||
) {
|
) {
|
||||||
val input: Input
|
val input: Input
|
||||||
get() = inputSource()
|
get() = inputSource()
|
||||||
@Deprecated("This method will be fully replaced with input property", ReplaceWith("input"))
|
|
||||||
fun asInput() = input
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("NOTHING_TO_INLINE")
|
@Suppress("NOTHING_TO_INLINE")
|
||||||
|
@ -398,40 +398,24 @@ inline fun SecureValue.asSecureValueWithTranslations(): SecureValueWithTranslati
|
|||||||
inline fun SecureValue.requireSecureValueWithTranslations(): SecureValueWithTranslations = this as SecureValueWithTranslations
|
inline fun SecureValue.requireSecureValueWithTranslations(): SecureValueWithTranslations = this as SecureValueWithTranslations
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent>? = this as? AnonymousGroupContentMessageImpl<MessageContent>
|
inline fun Message.asAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent>? = this as? AnonymousGroupContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessageImpl"))
|
|
||||||
inline fun Message.asAnonymousGroupMessageImpl() = asAnonymousGroupContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent> = this as AnonymousGroupContentMessageImpl<MessageContent>
|
inline fun Message.requireAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent> = this as AnonymousGroupContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessageImpl"))
|
|
||||||
inline fun Message.requireAnonymousGroupMessageImpl() = requireAnonymousGroupContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
|
inline fun Message.asChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessageImpl"))
|
|
||||||
inline fun Message.asChannelMessageImpl() = asChannelContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
|
inline fun Message.requireChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessageImpl"))
|
|
||||||
inline fun Message.requireChannelMessageImpl() = requireChannelContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent>? = this as? FromChannelGroupContentMessageImpl<MessageContent>
|
inline fun Message.asFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent>? = this as? FromChannelGroupContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessageImpl"))
|
|
||||||
inline fun Message.asFromChannelGroupMessageImpl() = asFromChannelGroupContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent> = this as FromChannelGroupContentMessageImpl<MessageContent>
|
inline fun Message.requireFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent> = this as FromChannelGroupContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessageImpl"))
|
|
||||||
inline fun Message.requireFromChannelGroupMessageImpl() = requireFromChannelGroupContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asPassportMessage(): PassportMessage? = this as? PassportMessage
|
inline fun Message.asPassportMessage(): PassportMessage? = this as? PassportMessage
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requirePassportMessage(): PassportMessage = this as PassportMessage
|
inline fun Message.requirePassportMessage(): PassportMessage = this as PassportMessage
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asPrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent>? = this as? PrivateContentMessageImpl<MessageContent>
|
inline fun Message.asPrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent>? = this as? PrivateContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asPrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessageImpl"))
|
|
||||||
inline fun Message.asPrivateMessageImpl() = asPrivateContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requirePrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent> = this as PrivateContentMessageImpl<MessageContent>
|
inline fun Message.requirePrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent> = this as PrivateContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessageImpl"))
|
|
||||||
inline fun Message.requirePrivateMessageImpl() = requirePrivateContentMessageImpl()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? = this as? ChannelEventMessage<ChannelEvent>
|
inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? = this as? ChannelEventMessage<ChannelEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
@ -454,32 +438,20 @@ inline fun Message.asCommonSupergroupEventMessage(): CommonSupergroupEventMessag
|
|||||||
inline fun Message.requireCommonSupergroupEventMessage(): CommonSupergroupEventMessage<SupergroupEvent> = this as CommonSupergroupEventMessage<SupergroupEvent>
|
inline fun Message.requireCommonSupergroupEventMessage(): CommonSupergroupEventMessage<SupergroupEvent> = this as CommonSupergroupEventMessage<SupergroupEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent>? = this as? AnonymousGroupContentMessage<MessageContent>
|
inline fun Message.asAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent>? = this as? AnonymousGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessage"))
|
|
||||||
inline fun Message.asAnonymousGroupMessage() = asAnonymousGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent> = this as AnonymousGroupContentMessage<MessageContent>
|
inline fun Message.requireAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent> = this as AnonymousGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessage"))
|
|
||||||
inline fun Message.requireAnonymousGroupMessage() = requireAnonymousGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asChannelContentMessage(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
|
inline fun Message.asChannelContentMessage(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessage"))
|
|
||||||
inline fun Message.asChannelMessage() = asChannelContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireChannelContentMessage(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
|
inline fun Message.requireChannelContentMessage(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessage"))
|
|
||||||
inline fun Message.requireChannelMessage() = requireChannelContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asChatEventMessage(): ChatEventMessage<ChatEvent>? = this as? ChatEventMessage<ChatEvent>
|
inline fun Message.asChatEventMessage(): ChatEventMessage<ChatEvent>? = this as? ChatEventMessage<ChatEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireChatEventMessage(): ChatEventMessage<ChatEvent> = this as ChatEventMessage<ChatEvent>
|
inline fun Message.requireChatEventMessage(): ChatEventMessage<ChatEvent> = this as ChatEventMessage<ChatEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent>? = this as? CommonGroupContentMessage<MessageContent>
|
inline fun Message.asCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent>? = this as? CommonGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asCommonGroupContentMessage"))
|
|
||||||
inline fun Message.asCommonGroupMessage() = asCommonGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent> = this as CommonGroupContentMessage<MessageContent>
|
inline fun Message.requireCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent> = this as CommonGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireCommonGroupContentMessage"))
|
|
||||||
inline fun Message.requireCommonGroupMessage() = requireCommonGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asCommonMessage(): CommonMessage<MessageContent>? = this as? CommonMessage<MessageContent>
|
inline fun Message.asCommonMessage(): CommonMessage<MessageContent>? = this as? CommonMessage<MessageContent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
@ -490,24 +462,16 @@ inline fun Message.asContentMessage(): ContentMessage<MessageContent>? = this as
|
|||||||
inline fun Message.requireContentMessage(): ContentMessage<MessageContent> = this as ContentMessage<MessageContent>
|
inline fun Message.requireContentMessage(): ContentMessage<MessageContent> = this as ContentMessage<MessageContent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent>? = this as? FromChannelGroupContentMessage<MessageContent>
|
inline fun Message.asFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent>? = this as? FromChannelGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessage"))
|
|
||||||
inline fun Message.asFromChannelGroupMessage() = asFromChannelGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent> = this as FromChannelGroupContentMessage<MessageContent>
|
inline fun Message.requireFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent> = this as FromChannelGroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessage"))
|
|
||||||
inline fun Message.requireFromChannelGroupMessage() = requireFromChannelGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asGroupEventMessage(): GroupEventMessage<GroupEvent>? = this as? GroupEventMessage<GroupEvent>
|
inline fun Message.asGroupEventMessage(): GroupEventMessage<GroupEvent>? = this as? GroupEventMessage<GroupEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireGroupEventMessage(): GroupEventMessage<GroupEvent> = this as GroupEventMessage<GroupEvent>
|
inline fun Message.requireGroupEventMessage(): GroupEventMessage<GroupEvent> = this as GroupEventMessage<GroupEvent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asGroupContentMessage(): GroupContentMessage<MessageContent>? = this as? GroupContentMessage<MessageContent>
|
inline fun Message.asGroupContentMessage(): GroupContentMessage<MessageContent>? = this as? GroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage"))
|
|
||||||
inline fun Message.asGroupMessage() = asGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requireGroupContentMessage(): GroupContentMessage<MessageContent> = this as GroupContentMessage<MessageContent>
|
inline fun Message.requireGroupContentMessage(): GroupContentMessage<MessageContent> = this as GroupContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requireGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireGroupContentMessage"))
|
|
||||||
inline fun Message.requireGroupMessage() = requireGroupContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupContent>? = this as? MediaGroupMessage<MediaGroupContent>
|
inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupContent>? = this as? MediaGroupMessage<MediaGroupContent>
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
@ -526,20 +490,12 @@ inline fun Message.asPossiblyPaymentMessage(): PossiblyPaymentMessage? = this as
|
|||||||
inline fun Message.requirePossiblyPaymentMessage(): PossiblyPaymentMessage = this as PossiblyPaymentMessage
|
inline fun Message.requirePossiblyPaymentMessage(): PossiblyPaymentMessage = this as PossiblyPaymentMessage
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asPrivateContentMessage(): PrivateContentMessage<MessageContent>? = this as? PrivateContentMessage<MessageContent>
|
inline fun Message.asPrivateContentMessage(): PrivateContentMessage<MessageContent>? = this as? PrivateContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asPrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage"))
|
|
||||||
inline fun Message.asPrivateMessage() = asPrivateContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requirePrivateContentMessage(): PrivateContentMessage<MessageContent> = this as PrivateContentMessage<MessageContent>
|
inline fun Message.requirePrivateContentMessage(): PrivateContentMessage<MessageContent> = this as PrivateContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessage"))
|
|
||||||
inline fun Message.requirePrivateMessage() = requirePrivateContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asPublicContentMessage(): PublicContentMessage<MessageContent>? = this as? PublicContentMessage<MessageContent>
|
inline fun Message.asPublicContentMessage(): PublicContentMessage<MessageContent>? = this as? PublicContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("asPublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPublicContentMessage"))
|
|
||||||
inline fun Message.asPublicMessage() = asPublicContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.requirePublicContentMessage(): PublicContentMessage<MessageContent> = this as PublicContentMessage<MessageContent>
|
inline fun Message.requirePublicContentMessage(): PublicContentMessage<MessageContent> = this as PublicContentMessage<MessageContent>
|
||||||
@Deprecated("Renamed", ReplaceWith("requirePublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePublicContentMessage"))
|
|
||||||
inline fun Message.requirePublicMessage() = requirePublicContentMessage()
|
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
inline fun Message.asSignedMessage(): SignedMessage? = this as? SignedMessage
|
inline fun Message.asSignedMessage(): SignedMessage? = this as? SignedMessage
|
||||||
@PreviewFeature
|
@PreviewFeature
|
||||||
|
@ -13,16 +13,6 @@ private inline fun <reified T : MessageContent> Flow<ContentMessage<*>>.withCont
|
|||||||
it.withContent<T>()
|
it.withContent<T>()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("This method will be removed in next major update")
|
|
||||||
fun <T : MessageContent> Flow<ContentMessage<*>>.withContentType(contentType: KClass<T>) = mapNotNull {
|
|
||||||
if (contentType.isInstance(it.content)) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
it as ContentMessage<T>
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Flow<ContentMessage<*>>.onlyAnimationContentMessages() = withContentType<AnimationContent>()
|
fun Flow<ContentMessage<*>>.onlyAnimationContentMessages() = withContentType<AnimationContent>()
|
||||||
fun Flow<ContentMessage<*>>.onlyAudioContentMessages() = withContentType<AudioContent>()
|
fun Flow<ContentMessage<*>>.onlyAudioContentMessages() = withContentType<AudioContent>()
|
||||||
fun Flow<ContentMessage<*>>.onlyContactContentMessages() = withContentType<ContactContent>()
|
fun Flow<ContentMessage<*>>.onlyContactContentMessages() = withContentType<ContactContent>()
|
||||||
|
@ -16,8 +16,6 @@ enum class SlotMachineReelImage(val text: String, val number: Int) {
|
|||||||
LEMON("\uD83C\uDF4B", 2),
|
LEMON("\uD83C\uDF4B", 2),
|
||||||
SEVEN("7", 3)
|
SEVEN("7", 3)
|
||||||
}
|
}
|
||||||
@Deprecated("Renamed", ReplaceWith("SlotMachineReelImage", "dev.inmo.tgbotapi.extensions.utils.SlotMachineReelImage"))
|
|
||||||
typealias SlotMachineReelImages = SlotMachineReelImage
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return First [SlotMachineReelImage] with [SlotMachineReelImage.number] equal to receiver OR [SlotMachineReelImage.SEVEN]
|
* @return First [SlotMachineReelImage] with [SlotMachineReelImage.number] equal to receiver OR [SlotMachineReelImage.SEVEN]
|
||||||
|
@ -158,26 +158,6 @@ fun TelegramBot.longPolling(
|
|||||||
flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit
|
flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit
|
||||||
): Job = longPolling(FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply(flowUpdatesPreset), timeoutSeconds, scope, exceptionsHandler)
|
): Job = longPolling(FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply(flowUpdatesPreset), timeoutSeconds, scope, exceptionsHandler)
|
||||||
|
|
||||||
/**
|
|
||||||
* This method will create a new one [FlowsUpdatesFilter]. This method could be unsafe due to the fact that it will start
|
|
||||||
* getting updates IMMEDIATELY. That means that your bot will be able to skip some of them until you will call
|
|
||||||
* [kotlinx.coroutines.flow.Flow.collect] on one of [FlowsUpdatesFilter] flows. To avoid it, you can pass
|
|
||||||
* [flowUpdatesPreset] lambda - it will be called BEFORE starting updates getting
|
|
||||||
*/
|
|
||||||
@FlowPreview
|
|
||||||
@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
|
|
||||||
@Suppress("unused")
|
|
||||||
fun RequestsExecutor.startGettingFlowsUpdatesByLongPolling(
|
|
||||||
timeoutSeconds: Seconds = 30,
|
|
||||||
scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
|
|
||||||
exceptionsHandler: ExceptionHandler<Unit>? = null,
|
|
||||||
flowsUpdatesFilterUpdatesKeeperCount: Int = 100,
|
|
||||||
flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit = {}
|
|
||||||
): FlowsUpdatesFilter = FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply {
|
|
||||||
flowUpdatesPreset()
|
|
||||||
startGettingOfUpdatesByLongPolling(timeoutSeconds, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
|
fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
|
||||||
updatesFilter: UpdatesFilter,
|
updatesFilter: UpdatesFilter,
|
||||||
timeoutSeconds: Seconds = 30,
|
timeoutSeconds: Seconds = 30,
|
||||||
@ -190,88 +170,3 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
|
|||||||
updatesFilter.allowedUpdates,
|
updatesFilter.allowedUpdates,
|
||||||
updatesFilter.asUpdateReceiver
|
updatesFilter.asUpdateReceiver
|
||||||
)
|
)
|
||||||
|
|
||||||
@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
|
|
||||||
fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
|
|
||||||
messageCallback: UpdateReceiver<MessageUpdate>? = null,
|
|
||||||
messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
|
|
||||||
editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
|
|
||||||
editedMessageMediaGroupCallback: UpdateReceiver<EditMessageMediaGroupUpdate>? = null,
|
|
||||||
channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
|
|
||||||
channelPostMediaGroupCallback: UpdateReceiver<ChannelPostMediaGroupUpdate>? = null,
|
|
||||||
editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
|
|
||||||
editedChannelPostMediaGroupCallback: UpdateReceiver<EditChannelPostMediaGroupUpdate>? = null,
|
|
||||||
chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
|
|
||||||
inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
|
|
||||||
callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
|
|
||||||
shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
|
|
||||||
preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
|
|
||||||
pollCallback: UpdateReceiver<PollUpdate>? = null,
|
|
||||||
pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
|
|
||||||
timeoutSeconds: Seconds = 30,
|
|
||||||
exceptionsHandler: ExceptionHandler<Unit>? = null,
|
|
||||||
scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
|
|
||||||
): Job {
|
|
||||||
return startGettingOfUpdatesByLongPolling(
|
|
||||||
SimpleUpdatesFilter(
|
|
||||||
messageCallback,
|
|
||||||
messageMediaGroupCallback,
|
|
||||||
editedMessageCallback,
|
|
||||||
editedMessageMediaGroupCallback,
|
|
||||||
channelPostCallback,
|
|
||||||
channelPostMediaGroupCallback,
|
|
||||||
editedChannelPostCallback,
|
|
||||||
editedChannelPostMediaGroupCallback,
|
|
||||||
chosenInlineResultCallback,
|
|
||||||
inlineQueryCallback,
|
|
||||||
callbackQueryCallback,
|
|
||||||
shippingQueryCallback,
|
|
||||||
preCheckoutQueryCallback,
|
|
||||||
pollCallback,
|
|
||||||
pollAnswerCallback
|
|
||||||
),
|
|
||||||
timeoutSeconds,
|
|
||||||
exceptionsHandler,
|
|
||||||
scope
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
|
|
||||||
@Suppress("unused")
|
|
||||||
fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
|
|
||||||
messageCallback: UpdateReceiver<MessageUpdate>? = null,
|
|
||||||
mediaGroupCallback: UpdateReceiver<MediaGroupUpdate>? = null,
|
|
||||||
editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
|
|
||||||
channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
|
|
||||||
editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
|
|
||||||
chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
|
|
||||||
inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
|
|
||||||
callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
|
|
||||||
shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
|
|
||||||
preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
|
|
||||||
pollCallback: UpdateReceiver<PollUpdate>? = null,
|
|
||||||
pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
|
|
||||||
timeoutSeconds: Seconds = 30,
|
|
||||||
exceptionsHandler: ExceptionHandler<Unit>? = null,
|
|
||||||
scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
|
|
||||||
): Job = startGettingOfUpdatesByLongPolling(
|
|
||||||
messageCallback = messageCallback,
|
|
||||||
messageMediaGroupCallback = mediaGroupCallback,
|
|
||||||
editedMessageCallback = editedMessageCallback,
|
|
||||||
editedMessageMediaGroupCallback = mediaGroupCallback,
|
|
||||||
channelPostCallback = channelPostCallback,
|
|
||||||
channelPostMediaGroupCallback = mediaGroupCallback,
|
|
||||||
editedChannelPostCallback = editedChannelPostCallback,
|
|
||||||
editedChannelPostMediaGroupCallback = mediaGroupCallback,
|
|
||||||
chosenInlineResultCallback = chosenInlineResultCallback,
|
|
||||||
inlineQueryCallback = inlineQueryCallback,
|
|
||||||
callbackQueryCallback = callbackQueryCallback,
|
|
||||||
shippingQueryCallback = shippingQueryCallback,
|
|
||||||
preCheckoutQueryCallback = preCheckoutQueryCallback,
|
|
||||||
pollCallback = pollCallback,
|
|
||||||
pollAnswerCallback = pollAnswerCallback,
|
|
||||||
timeoutSeconds = timeoutSeconds,
|
|
||||||
exceptionsHandler = exceptionsHandler,
|
|
||||||
scope = scope
|
|
||||||
)
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user