replaces of CommonAbstracts

CHANGELOG.md

@@ -33,9 +33,10 @@ __All the `tgbotapi.extensions.*` packages have been removed__
     * **Edit live location requests have been replaced:**
         * `dev.inmo.tgbotapi.requests.edit.LiveLocation` -> `dev.inmo.tgbotapi.requests.edit.location.live`
         * `dev.inmo.tgbotapi.extensions.api.edit.LiveLocation` -> `dev.inmo.tgbotapi.extensions.api.edit.location.live`
-  * **Edit reply markup requests have been replaced:**
+    * **Edit reply markup requests have been replaced:**
-      * `dev.inmo.tgbotapi.requests.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.requests.edit.reply_markup`
+        * `dev.inmo.tgbotapi.requests.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.requests.edit.reply_markup`
-      * `dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.extensions.api.edit.reply_markup`
+        * `dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup` -> `dev.inmo.tgbotapi.extensions.api.edit.reply_markup`
+    * **Common abstracts have been replaced: `dev.inmo.tgbotapi.CommonAbstracts` -> `dev.inmo.tgbotapi.abstracts`**
     * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json` ([#563](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/563))
     * All the interfaces from `dev.inmo.tgbotapi.types.files.abstracts` have been replaced to `dev.inmo.tgbotapi.types.files` and converted to sealed ([#550](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/550))
     * `PassportFile` has been replaced to `dev.inmo.tgbotapi.types.files`

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditChatMessageCaption.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.edit.caption
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextedWithTextSources
+import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.edit.caption.EditChatMessageCaption
 import dev.inmo.tgbotapi.types.ChatIdentifier

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonContactData.kt

@@ -1,8 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-interface CommonContactData {
+@Deprecated("Replaced", ReplaceWith("CommonContactData", "dev.inmo.tgbotapi.abstracts.CommonContactData"))
-    val phoneNumber: String
+typealias CommonContactData = dev.inmo.tgbotapi.abstracts.CommonContactData
-    val firstName: String
-    val lastName: String?
-    val vcard: String? // TODO:: Replace by some vCard abstraction
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonSendInvoiceData.kt

@@ -1,36 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.payments.abstracts.Currencied
+@Deprecated("Replaced", ReplaceWith("CommonSendInvoiceData", "dev.inmo.tgbotapi.abstracts.CommonSendInvoiceData"))
-import dev.inmo.tgbotapi.types.payments.abstracts.Priced
+typealias CommonSendInvoiceData = dev.inmo.tgbotapi.abstracts.CommonSendInvoiceData
-
-interface CommonSendInvoiceData : Titled, Currencied, Priced {
-    val description: String
-    val payload: String
-    val providerToken: String
-    val maxTipAmount: Int?
-    val suggestedTipAmounts: List<Int>?
-    val providerData: String?
-    val requireName: Boolean
-    val requirePhoneNumber: Boolean
-    val requireEmail: Boolean
-    val requireShippingAddress: Boolean
-    val shouldSendPhoneNumberToProvider: Boolean
-    val shouldSendEmailToProvider: Boolean
-    val priceDependOnShipAddress: Boolean
-
-    val photoUrl: String?
-    val photoSize: Long?
-    val photoWidth: Int?
-    val photoHeight: Int?
-
-
-
-    fun setPhoto(
-        photoUrl: String,
-        photoSize: Long? = null,
-        photoWidth: Int? = null,
-        photoHeight: Int? = null
-    )
-
-    fun unsetPhoto()
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/CommonVenueData.kt

@@ -1,12 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.*
+@Deprecated("Replaced", ReplaceWith("CommonVenueData", "dev.inmo.tgbotapi.abstracts.CommonVenueData"))
-
+typealias CommonVenueData = dev.inmo.tgbotapi.abstracts.CommonVenueData
-interface CommonVenueData : Titled {
-    override val title: String
-    val address: String
-    val foursquareId: FoursquareId?
-    val foursquareType: FoursquareType? // TODO:: Rewrite with enum or interface
-    val googlePlaceId: GooglePlaceId?
-    val googlePlaceType: GooglePlaceType?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/FromUser.kt

@@ -1,16 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.chat.User
+@Deprecated("Replaced", ReplaceWith("FromUser", "dev.inmo.tgbotapi.abstracts.FromUser"))
-
+typealias FromUser = dev.inmo.tgbotapi.abstracts.FromUser
-/**
- * Inheritors of this interface have some [User] as a source of data. For example, any [dev.inmo.tgbotapi.types.queries.callback.CallbackQuery]
- * have [User] as the source of that query
- */
-interface FromUser : WithUser {
-    /**
-     * The source [User] of this type
-     */
-    val from: User
-    override val user: User
-        get() = from
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Headed.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.Degrees
+@Deprecated("Replaced", ReplaceWith("Headed", "dev.inmo.tgbotapi.abstracts.Headed"))
-
+typealias Headed = dev.inmo.tgbotapi.abstracts.Headed
-interface Headed {
-    val heading: Degrees?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/HorizontallyAccured.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.Meters
+@Deprecated("Replaced", ReplaceWith("HorizontallyAccured", "dev.inmo.tgbotapi.abstracts.HorizontallyAccured"))
-
+typealias HorizontallyAccured = dev.inmo.tgbotapi.abstracts.HorizontallyAccured
-interface HorizontallyAccured {
-    val horizontalAccuracy: Meters?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Livable.kt

@@ -1,10 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.Seconds
+@Deprecated("Replaced", ReplaceWith("Livable", "dev.inmo.tgbotapi.abstracts.Livable"))
-
+typealias Livable = dev.inmo.tgbotapi.abstracts.Livable
-interface Livable {
-    /**
-     * Period in [Seconds]
-     */
-    val livePeriod: Seconds?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Locationed.kt

@@ -1,6 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-interface Locationed {
+@Deprecated("Replaced", ReplaceWith("Locationed", "dev.inmo.tgbotapi.abstracts.Locationed"))
-    val latitude: Double
+typealias Locationed = dev.inmo.tgbotapi.abstracts.Locationed
-    val longitude: Double
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/MimeTyped.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.utils.MimeType
+@Deprecated("Replaced", ReplaceWith("MimeTyped", "dev.inmo.tgbotapi.abstracts.MimeTyped"))
-
+typealias MimeTyped = dev.inmo.tgbotapi.abstracts.MimeTyped
-interface MimeTyped {
-    val mimeType: MimeType?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Performerable.kt

@@ -1,5 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-interface Performerable {
+@Deprecated("Replaced", ReplaceWith("Performerable", "dev.inmo.tgbotapi.abstracts.Performerable"))
-    val performer: String?
+typealias Performerable = dev.inmo.tgbotapi.abstracts.Performerable
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/ProximityAlertable.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.Meters
+@Deprecated("Replaced", ReplaceWith("ProximityAlertable", "dev.inmo.tgbotapi.abstracts.ProximityAlertable"))
-
+typealias ProximityAlertable = dev.inmo.tgbotapi.abstracts.ProximityAlertable
-interface ProximityAlertable {
-    val proximityAlertRadius: Meters?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt

@@ -1,29 +1,18 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
+@Deprecated("Replaced", ReplaceWith("Texted", "dev.inmo.tgbotapi.abstracts.Texted"))
-import dev.inmo.tgbotapi.types.message.ParseMode
+typealias Texted = dev.inmo.tgbotapi.abstracts.Texted
+@Deprecated("Replaced", ReplaceWith("TextedWithTextSources", "dev.inmo.tgbotapi.abstracts.TextedWithTextSources"))
+typealias TextedWithTextSources = dev.inmo.tgbotapi.abstracts.TextedWithTextSources
 
-interface Texted {
+@Deprecated("Replaced", ReplaceWith("ParsableOutput", "dev.inmo.tgbotapi.abstracts.ParsableOutput"))
-    val text: String?
+typealias ParsableOutput = dev.inmo.tgbotapi.abstracts.ParsableOutput
-}
-interface TextedWithTextSources : Texted {
-    /**
-     * Full list of [TextSource]s
-     */
-    val textSources: List<TextSource>?
-}
 
-interface ParsableOutput : Texted {
+@Deprecated("Replaced", ReplaceWith("EntitiesOutput", "dev.inmo.tgbotapi.abstracts.EntitiesOutput"))
-    val parseMode: ParseMode?
+typealias EntitiesOutput = dev.inmo.tgbotapi.abstracts.EntitiesOutput
-}
 
-interface EntitiesOutput : TextedWithTextSources {
+@Deprecated("Replaced", ReplaceWith("TextedOutput", "dev.inmo.tgbotapi.abstracts.TextedOutput"))
-    val entities: List<TextSource>?
+typealias TextedOutput = dev.inmo.tgbotapi.abstracts.TextedOutput
-        get() = textSources
-}
 
-interface TextedOutput : ParsableOutput, EntitiesOutput
+@Deprecated("Replaced", ReplaceWith("TextedInput", "dev.inmo.tgbotapi.abstracts.TextedInput"))
-
+typealias TextedInput = dev.inmo.tgbotapi.abstracts.TextedInput
-interface TextedInput : TextedWithTextSources {
-    override val textSources: List<TextSource>
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Titled.kt

@@ -1,5 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-interface Titled {
+@Deprecated("Replaced", ReplaceWith("Titled", "dev.inmo.tgbotapi.abstracts.Titled"))
-    val title: String?
+typealias Titled = dev.inmo.tgbotapi.abstracts.Titled
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/WithUser.kt

@@ -1,12 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
-import dev.inmo.tgbotapi.types.chat.User
+@Deprecated("Replaced", ReplaceWith("WithUser", "dev.inmo.tgbotapi.abstracts.WithUser"))
-
+typealias WithUser = dev.inmo.tgbotapi.abstracts.WithUser
-/**
- * All inheritors of this type have [User] in their data as one of the main data
- *
- * @see FromUser
- */
-interface WithUser {
-    val user: User
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.ChatIdentifier
+@Deprecated("Replaced", ReplaceWith("ChatRequest", "dev.inmo.tgbotapi.abstracts.types.ChatRequest"))
-
+typealias ChatRequest = dev.inmo.tgbotapi.abstracts.types.ChatRequest
-interface ChatRequest : OptionalChatRequest {
-    override val chatId: ChatIdentifier
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableNotification.kt

@@ -1,5 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-interface DisableNotification {
+@Deprecated("Replaced", ReplaceWith("DisableNotification", "dev.inmo.tgbotapi.abstracts.types.DisableNotification"))
-    val disableNotification: Boolean
+typealias DisableNotification = dev.inmo.tgbotapi.abstracts.types.DisableNotification
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/DisableWebPagePreview.kt

@@ -1,5 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-interface DisableWebPagePreview {
+@Deprecated("Replaced", ReplaceWith("DisableWebPagePreview", "dev.inmo.tgbotapi.abstracts.types.DisableWebPagePreview"))
-    val disableWebPagePreview: Boolean?
+typealias DisableWebPagePreview = dev.inmo.tgbotapi.abstracts.types.DisableWebPagePreview
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/InlineMessageAction.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+@Deprecated("Replaced", ReplaceWith("InlineMessageAction", "dev.inmo.tgbotapi.abstracts.types.InlineMessageAction"))
-
+typealias InlineMessageAction = dev.inmo.tgbotapi.abstracts.types.InlineMessageAction
-interface InlineMessageAction {
-    val inlineMessageId: InlineMessageIdentifier
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/MessageAction.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.MessageIdentifier
+@Deprecated("Replaced", ReplaceWith("MessageAction:", "dev.inmo.tgbotapi.abstracts.types.MessageAction:"))
-
+typealias MessageAction = dev.inmo.tgbotapi.abstracts.types.MessageAction
-interface MessageAction: ChatRequest {
-    val messageId: MessageIdentifier
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/OptionalChatRequest.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.ChatIdentifier
+@Deprecated("Replaced", ReplaceWith("OptionalChatRequest", "dev.inmo.tgbotapi.abstracts.types.OptionalChatRequest"))
-
+typealias OptionalChatRequest = dev.inmo.tgbotapi.abstracts.types.OptionalChatRequest
-interface OptionalChatRequest {
-    val chatId: ChatIdentifier?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ProtectContent.kt

@@ -1,5 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-interface ProtectContent {
+@Deprecated("Replaced", ReplaceWith("ProtectContent", "dev.inmo.tgbotapi.abstracts.types.ProtectContent"))
-    val protectContent: Boolean
+typealias ProtectContent = dev.inmo.tgbotapi.abstracts.types.ProtectContent
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMarkup.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+@Deprecated("Replaced", ReplaceWith("ReplyMarkup", "dev.inmo.tgbotapi.abstracts.types.ReplyMarkup"))
-
+typealias ReplyMarkup = dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
-interface ReplyMarkup {
-    val replyMarkup: KeyboardMarkup?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ReplyMessageId.kt

@@ -1,8 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.MessageIdentifier
+@Deprecated("Replaced", ReplaceWith("ReplyMessageId", "dev.inmo.tgbotapi.abstracts.types.ReplyMessageId"))
-
+typealias ReplyMessageId = dev.inmo.tgbotapi.abstracts.types.ReplyMessageId
-interface ReplyMessageId {
-    val replyToMessageId: MessageIdentifier?
-    val allowSendingWithoutReply: Boolean?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/UntilDate.kt

@@ -1,7 +1,4 @@
 package dev.inmo.tgbotapi.CommonAbstracts.types
 
-import dev.inmo.tgbotapi.types.TelegramDate
+@Deprecated("Replaced", ReplaceWith("UntilDate", "dev.inmo.tgbotapi.abstracts.types.UntilDate"))
-
+typealias UntilDate = dev.inmo.tgbotapi.abstracts.types.UntilDate
-interface UntilDate {
-    val untilDate: TelegramDate?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/CommonContactData.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.abstracts
+
+interface CommonContactData {
+    val phoneNumber: String
+    val firstName: String
+    val lastName: String?
+    val vcard: String? // TODO:: Replace by some vCard abstraction
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/CommonSendInvoiceData.kt

@@ -0,0 +1,36 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.payments.abstracts.Currencied
+import dev.inmo.tgbotapi.types.payments.abstracts.Priced
+
+interface CommonSendInvoiceData : Titled, Currencied, Priced {
+    val description: String
+    val payload: String
+    val providerToken: String
+    val maxTipAmount: Int?
+    val suggestedTipAmounts: List<Int>?
+    val providerData: String?
+    val requireName: Boolean
+    val requirePhoneNumber: Boolean
+    val requireEmail: Boolean
+    val requireShippingAddress: Boolean
+    val shouldSendPhoneNumberToProvider: Boolean
+    val shouldSendEmailToProvider: Boolean
+    val priceDependOnShipAddress: Boolean
+
+    val photoUrl: String?
+    val photoSize: Long?
+    val photoWidth: Int?
+    val photoHeight: Int?
+
+
+
+    fun setPhoto(
+        photoUrl: String,
+        photoSize: Long? = null,
+        photoWidth: Int? = null,
+        photoHeight: Int? = null
+    )
+
+    fun unsetPhoto()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/CommonVenueData.kt

@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.*
+
+interface CommonVenueData : Titled {
+    override val title: String
+    val address: String
+    val foursquareId: FoursquareId?
+    val foursquareType: FoursquareType? // TODO:: Rewrite with enum or interface
+    val googlePlaceId: GooglePlaceId?
+    val googlePlaceType: GooglePlaceType?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/FromUser.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.chat.User
+
+/**
+ * Inheritors of this interface have some [User] as a source of data. For example, any [dev.inmo.tgbotapi.types.queries.callback.CallbackQuery]
+ * have [User] as the source of that query
+ */
+interface FromUser : WithUser {
+    /**
+     * The source [User] of this type
+     */
+    val from: User
+    override val user: User
+        get() = from
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Headed.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.Degrees
+
+interface Headed {
+    val heading: Degrees?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/HorizontallyAccured.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.Meters
+
+interface HorizontallyAccured {
+    val horizontalAccuracy: Meters?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Livable.kt

@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.Seconds
+
+interface Livable {
+    /**
+     * Period in [Seconds]
+     */
+    val livePeriod: Seconds?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Locationed.kt

@@ -0,0 +1,6 @@
+package dev.inmo.tgbotapi.abstracts
+
+interface Locationed {
+    val latitude: Double
+    val longitude: Double
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/MimeTyped.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.utils.MimeType
+
+interface MimeTyped {
+    val mimeType: MimeType?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Performerable.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts
+
+interface Performerable {
+    val performer: String?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/ProximityAlertable.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.Meters
+
+interface ProximityAlertable {
+    val proximityAlertRadius: Meters?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Texted.kt

@@ -0,0 +1,29 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.message.textsources.TextSource
+import dev.inmo.tgbotapi.types.message.ParseMode
+
+interface Texted {
+    val text: String?
+}
+interface TextedWithTextSources : Texted {
+    /**
+     * Full list of [TextSource]s
+     */
+    val textSources: List<TextSource>?
+}
+
+interface ParsableOutput : Texted {
+    val parseMode: ParseMode?
+}
+
+interface EntitiesOutput : TextedWithTextSources {
+    val entities: List<TextSource>?
+        get() = textSources
+}
+
+interface TextedOutput : ParsableOutput, EntitiesOutput
+
+interface TextedInput : TextedWithTextSources {
+    override val textSources: List<TextSource>
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/Titled.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts
+
+interface Titled {
+    val title: String?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/WithUser.kt

@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.abstracts
+
+import dev.inmo.tgbotapi.types.chat.User
+
+/**
+ * All inheritors of this type have [User] in their data as one of the main data
+ *
+ * @see FromUser
+ */
+interface WithUser {
+    val user: User
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ChatRequest.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.ChatIdentifier
+
+interface ChatRequest : OptionalChatRequest {
+    override val chatId: ChatIdentifier
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/DisableNotification.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+interface DisableNotification {
+    val disableNotification: Boolean
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/DisableWebPagePreview.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+interface DisableWebPagePreview {
+    val disableWebPagePreview: Boolean?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/InlineMessageAction.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.InlineMessageIdentifier
+
+interface InlineMessageAction {
+    val inlineMessageId: InlineMessageIdentifier
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/MessageAction.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.MessageIdentifier
+
+interface MessageAction: ChatRequest {
+    val messageId: MessageIdentifier
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/OptionalChatRequest.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.ChatIdentifier
+
+interface OptionalChatRequest {
+    val chatId: ChatIdentifier?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ProtectContent.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+interface ProtectContent {
+    val protectContent: Boolean
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ReplyMarkup.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+
+interface ReplyMarkup {
+    val replyMarkup: KeyboardMarkup?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/ReplyMessageId.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.MessageIdentifier
+
+interface ReplyMessageId {
+    val replyToMessageId: MessageIdentifier?
+    val allowSendingWithoutReply: Boolean?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/types/UntilDate.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.TelegramDate
+
+interface UntilDate {
+    val untilDate: TelegramDate?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/DeleteMessage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
-import dev.inmo.tgbotapi.CommonAbstracts.types.ProtectContent
+import dev.inmo.tgbotapi.abstracts.types.ProtectContent
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
-import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/ExportChatInviteLink.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/LeaveChat.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatMemberRequest.kt

@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.requests.chat.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.UserId
 
 interface ChatMemberRequest<T: Any> : ChatRequest, SimpleRequest<T> {
     val userId: UserId
-}
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatSenderRequest.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.UserId

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChat.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.get
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chat.ExtendedChatSerializer

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatAdministrators.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.get
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMemberCount.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.get
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMenuButton.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.get
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetDefaultChatMenuButton.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.chat.get
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
-import dev.inmo.tgbotapi.CommonAbstracts.types.OptionalChatRequest
+import dev.inmo.tgbotapi.abstracts.types.OptionalChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/BanChatMember.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.members
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate
+import dev.inmo.tgbotapi.abstracts.types.UntilDate
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.members
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate
+import dev.inmo.tgbotapi.abstracts.types.UntilDate
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/RestrictChatMember.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.members
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate
+import dev.inmo.tgbotapi.abstracts.types.UntilDate
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ChatPermissions

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/DeleteChatPhoto.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/PinChatMessage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.*
+import dev.inmo.tgbotapi.abstracts.types.*
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatDescription.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatMenuButton.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPermissions.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ChatPermissions

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.requests.abstracts.MultipartRequest
 import dev.inmo.tgbotapi.types.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatTitle.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinAllChatMessages.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.modify
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/DeleteChatStickerSet.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.stickers
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chatIdField

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/stickers/SetChatStickerSet.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.stickers
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.MessageContent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditLocationMessage.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.abstracts.*
 
 interface EditLocationMessage : Locationed, HorizontallyAccured, ProximityAlertable, Headed

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage.kt

@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 
 interface EditReplyMessage : ReplyMarkup {
     override val replyMarkup: InlineKeyboardMarkup?
-}
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
+import dev.inmo.tgbotapi.abstracts.TextedOutput
 
 interface EditTextChatMessage : TextedOutput {
     override val text: String
-}
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByChat.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.games
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
 import dev.inmo.tgbotapi.requests.games.abstracts.GetGameHighScores
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/GetGameHighScoresByInlineMessageId.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.games
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.InlineMessageAction
+import dev.inmo.tgbotapi.abstracts.types.InlineMessageAction
 import dev.inmo.tgbotapi.requests.games.abstracts.GetGameHighScores
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByChatId.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.games
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
 import dev.inmo.tgbotapi.requests.games.abstracts.SetGameScore
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/SetGameScoreByInlineMessageId.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.games
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.InlineMessageAction
+import dev.inmo.tgbotapi.abstracts.types.InlineMessageAction
 import dev.inmo.tgbotapi.requests.games.abstracts.SetGameScore
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt

@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.requests.send
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
+import dev.inmo.tgbotapi.abstracts.TextedOutput
-import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
+import dev.inmo.tgbotapi.abstracts.types.MessageAction
-import dev.inmo.tgbotapi.CommonAbstracts.types.ProtectContent
+import dev.inmo.tgbotapi.abstracts.types.ProtectContent
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.types.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.send
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.DisableNotification
+import dev.inmo.tgbotapi.abstracts.types.DisableNotification
-import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMessageId
+import dev.inmo.tgbotapi.abstracts.types.ReplyMessageId
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview
+import dev.inmo.tgbotapi.abstracts.types.DisableWebPagePreview
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/PositionedSendMessageRequest.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.Locationed
+import dev.inmo.tgbotapi.abstracts.Locationed
 
-interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T>, Locationed
+interface PositionedSendMessageRequest<T: Any>: SendMessageRequest<T>, Locationed

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
 
-interface ReplyingMarkupSendMessageRequest<T: Any>: SendMessageRequest<T>, ReplyMarkup
+interface ReplyingMarkupSendMessageRequest<T: Any>: SendMessageRequest<T>, ReplyMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendChatMessageRequest.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 
-interface SendChatMessageRequest<T: Any> : SimpleRequest<T>, ChatRequest
+interface SendChatMessageRequest<T: Any> : SimpleRequest<T>, ChatRequest

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.*
+import dev.inmo.tgbotapi.abstracts.types.*
 
 interface SendMessageRequest<T: Any> : SendChatMessageRequest<T>, ReplyMessageId, DisableNotification, ProtectContent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/TextableSendMessageRequest.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
+import dev.inmo.tgbotapi.abstracts.TextedOutput
 
 interface TextableSendMessageRequest<T: Any>: SendMessageRequest<T>, TextedOutput

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.games
 
-import dev.inmo.tgbotapi.CommonAbstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.media
 
-import dev.inmo.tgbotapi.CommonAbstracts.Performerable
+import dev.inmo.tgbotapi.abstracts.Performerable
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.send.payments
 
-import dev.inmo.tgbotapi.CommonAbstracts.CommonSendInvoiceData
+import dev.inmo.tgbotapi.abstracts.CommonSendInvoiceData
-import dev.inmo.tgbotapi.CommonAbstracts.types.*
+import dev.inmo.tgbotapi.abstracts.types.*
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.send.polls
 
 import com.soywiz.klock.DateTime
-import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
+import dev.inmo.tgbotapi.abstracts.TextedOutput
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.types
 
 import com.soywiz.klock.DateTime
-import dev.inmo.tgbotapi.CommonAbstracts.WithUser
+import dev.inmo.tgbotapi.abstracts.WithUser
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Contact.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types
 
-import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData
+import dev.inmo.tgbotapi.abstracts.CommonContactData
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/ChosenInlineResult/ChosenInlineResult.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult
 
-import dev.inmo.tgbotapi.CommonAbstracts.FromUser
+import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.types.InlineMessageIdentifier
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier