mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2025-10-28 10:40:23 +00:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 66934c823d | |||
| 90870c225c | |||
| 106d01775c | |||
| cea2f7dc6e | |||
| 7d461edc9b | |||
| c52c6cb633 | |||
| 6db1755ee7 | |||
| ccf60c95ca | |||
| 4057d5167f | |||
| f19664da58 | |||
| 646a551b15 |
@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.libraries.cache.admins
|
|||||||
import korlibs.time.minutes
|
import korlibs.time.minutes
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.Seconds
|
import dev.inmo.tgbotapi.types.Seconds
|
||||||
|
import korlibs.time.seconds
|
||||||
import kotlinx.coroutines.flow.SharedFlow
|
import kotlinx.coroutines.flow.SharedFlow
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import dev.inmo.tgbotapi.types.*
|
|||||||
import dev.inmo.tgbotapi.types.chat.ExtendedBot
|
import dev.inmo.tgbotapi.types.chat.ExtendedBot
|
||||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
||||||
import dev.inmo.tgbotapi.types.message.abstracts.*
|
import dev.inmo.tgbotapi.types.message.abstracts.*
|
||||||
|
import korlibs.time.seconds
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
interface DefaultAdminsCacheAPIRepo {
|
interface DefaultAdminsCacheAPIRepo {
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ kotlin.incremental.js=true
|
|||||||
kotlin_version=1.9.22
|
kotlin_version=1.9.22
|
||||||
kotlin_serialisation_core_version=1.6.2
|
kotlin_serialisation_core_version=1.6.2
|
||||||
|
|
||||||
github_release_plugin_version=2.4.1
|
github_release_plugin_version=2.5.2
|
||||||
|
|
||||||
tgbotapi_version=9.4.3
|
tgbotapi_version=10.1.0
|
||||||
micro_utils_version=0.20.23
|
micro_utils_version=0.20.35
|
||||||
exposed_version=0.45.0
|
exposed_version=0.47.0
|
||||||
plagubot_version=7.4.2
|
plagubot_version=8.2.0
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
@@ -23,4 +23,4 @@ dokka_version=1.9.10
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.17.2
|
version=0.18.3
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ package dev.inmo.tgbotapi.libraries.resender
|
|||||||
import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
|
import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.MessageId
|
import dev.inmo.tgbotapi.types.MessageId
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
|
||||||
import dev.inmo.tgbotapi.types.message.abstracts.Message
|
import dev.inmo.tgbotapi.types.message.abstracts.Message
|
||||||
import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
|
import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
@@ -13,7 +15,20 @@ data class MessageMetaInfo(
|
|||||||
val chatId: IdChatIdentifier,
|
val chatId: IdChatIdentifier,
|
||||||
val messageId: MessageId,
|
val messageId: MessageId,
|
||||||
val group: String? = null
|
val group: String? = null
|
||||||
)
|
) {
|
||||||
|
val metaInfo: Message.MetaInfo
|
||||||
|
get() = Message.MetaInfo(chatId, messageId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Message.asMessageMetaInfos(): List<MessageMetaInfo> {
|
||||||
|
return if (this is ContentMessage<*>) {
|
||||||
|
(content as? MediaGroupContent<*>) ?.group ?.map {
|
||||||
|
MessageMetaInfo(it.sourceMessage.chat.id, it.sourceMessage.messageId, it.sourceMessage.mediaGroupId)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
} ?: listOf(MessageMetaInfo(chat.id, messageId, (this as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId))
|
||||||
|
}
|
||||||
|
|
||||||
operator fun MessageMetaInfo.Companion.invoke(
|
operator fun MessageMetaInfo.Companion.invoke(
|
||||||
message: Message
|
message: Message
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.resender
|
package dev.inmo.tgbotapi.libraries.resender
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.common.applyDiff
|
||||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||||
import dev.inmo.tgbotapi.requests.ForwardMessage
|
import dev.inmo.tgbotapi.requests.ForwardMessage
|
||||||
|
import dev.inmo.tgbotapi.requests.ForwardMessages
|
||||||
import dev.inmo.tgbotapi.requests.send.CopyMessage
|
import dev.inmo.tgbotapi.requests.send.CopyMessage
|
||||||
|
import dev.inmo.tgbotapi.requests.send.CopyMessages
|
||||||
import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
|
import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
|
||||||
import dev.inmo.tgbotapi.types.ChatIdentifier
|
import dev.inmo.tgbotapi.types.ChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
@@ -80,13 +83,13 @@ class MessagesResender(
|
|||||||
else -> {
|
else -> {
|
||||||
val resultContents = contents.mapNotNull {
|
val resultContents = contents.mapNotNull {
|
||||||
it to (
|
it to (
|
||||||
bot.execute(
|
bot.execute(
|
||||||
ForwardMessage(
|
ForwardMessage(
|
||||||
toChatId = cacheChatId,
|
toChatId = cacheChatId,
|
||||||
fromChatId = it.chatId,
|
fromChatId = it.chatId,
|
||||||
messageId = it.messageId
|
messageId = it.messageId
|
||||||
)
|
)
|
||||||
) as? ContentMessage<*> ?: return@mapNotNull null)
|
) as? ContentMessage<*> ?: return@mapNotNull null)
|
||||||
}.mapNotNull { (src, forwardedMessage) ->
|
}.mapNotNull { (src, forwardedMessage) ->
|
||||||
val forwardedMessageAsMediaPartMessage = forwardedMessage.takeIf {
|
val forwardedMessageAsMediaPartMessage = forwardedMessage.takeIf {
|
||||||
it.content is MediaGroupPartContent
|
it.content is MediaGroupPartContent
|
||||||
|
|||||||
Reference in New Issue
Block a user