From d12cba2343d706ee79dd746a1f9386859c1912e6 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Sat, 30 Jan 2021 20:59:26 +0600
Subject: [PATCH] replacing of withContent and requireWithContent and extending
 of extensions receivers types

---
 .../utils/CommonMessageConversations.kt       | 11 ------
 .../utils/ContentMessageConversations.kt      | 10 -----
 .../tgbotapi/extensions/utils/WithContent.kt  | 39 +++++++++++++++++++
 3 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt

diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt
index dfda0819a1..2909aa9637 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/CommonMessageConversations.kt
@@ -5,17 +5,6 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage
 import kotlinx.coroutines.flow.*
 
-
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T : MessageContent> CommonMessage<*>.withContent() = if (content is T) {
-    this as CommonMessage<T>
-} else {
-    null
-}
-
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T : MessageContent> CommonMessage<*>.requireWithContent() = this as CommonMessage<T>
-
 /**
  * Simple factory to convert [ContentMessage] to a [CommonMessage]
  */
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt
index 0bec218656..bcdff2ce59 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ContentMessageConversations.kt
@@ -9,16 +9,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 import kotlin.reflect.KClass
 
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T : MessageContent> ContentMessage<*>.withContent() = if (content is T) {
-    this as ContentMessage<T>
-} else {
-    null
-}
-
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T : MessageContent> ContentMessage<*>.requireWithContent() = this as ContentMessage<T>
-
 private inline fun <reified T : MessageContent> Flow<ContentMessage<*>>.withContentType() = mapNotNull {
     it.withContent<T>()
 }
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt
new file mode 100644
index 0000000000..be45e0b6f1
--- /dev/null
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt
@@ -0,0 +1,39 @@
+@file:Suppress("UNCHECKED_CAST")
+
+package dev.inmo.tgbotapi.extensions.utils
+
+import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+
+inline fun <reified T : MessageContent> ContentMessage<*>.withContent() = if (content is T) { this as ContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> ContentMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> CommonMessage<*>.withContent() = if (content is T) { this as CommonMessage<T> } else { null }
+inline fun <reified T : MessageContent> CommonMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> PossiblySentViaBotCommonMessage<*>.withContent() = if (content is T) { this as PossiblySentViaBotCommonMessage<T> } else { null }
+inline fun <reified T : MessageContent> PossiblySentViaBotCommonMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> ChannelMessage<*>.withContent() = if (content is T) { this as ChannelMessage<T> } else { null }
+inline fun <reified T : MessageContent> ChannelMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> PrivateMessage<*>.withContent() = if (content is T) { this as PrivateMessage<T> } else { null }
+inline fun <reified T : MessageContent> PrivateMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> PublicMessage<*>.withContent() = if (content is T) { this as PublicMessage<T> } else { null }
+inline fun <reified T : MessageContent> PublicMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> GroupMessage<*>.withContent() = if (content is T) { this as GroupMessage<T> } else { null }
+inline fun <reified T : MessageContent> GroupMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> FromChannelGroupMessage<*>.withContent() = if (content is T) { this as FromChannelGroupMessage<T> } else { null }
+inline fun <reified T : MessageContent> FromChannelGroupMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> AnonymousGroupMessage<*>.withContent() = if (content is T) { this as AnonymousGroupMessage<T> } else { null }
+inline fun <reified T : MessageContent> AnonymousGroupMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MessageContent> CommonGroupMessage<*>.withContent() = if (content is T) { this as CommonGroupMessage<T> } else { null }
+inline fun <reified T : MessageContent> CommonGroupMessage<*>.requireWithContent() = withContent<T>()!!
+
+inline fun <reified T : MediaGroupContent> MediaGroupMessage<*>.withContent() = if (content is T) { this as MediaGroupMessage<T> } else { null }
+inline fun <reified T : MediaGroupContent> MediaGroupMessage<*>.requireWithContent() = withContent<T>()!!