From acaf46e0153e56d430c60b464154eb1f739cc709 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 11 Jul 2022 01:27:28 +0600 Subject: [PATCH] ReplyForce companion improvements --- CHANGELOG.md | 8 ++++++++ .../dev/inmo/tgbotapi/types/buttons/ReplyForce.kt | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a741304a48..9828084c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ * `Core`: * For `CopyMessage` order of parameters has been changed + * `ReplyForce` defaults changes: + * All old companion properties (like `ReplyForce.ReplyForceSelective`) have been renamed: + * `ReplyForceSelective` -> `Selective` + * `ReplyForceNonSelective` -> `NonSelective` + * `ReplyForceDefault` -> `Default` + * New companion functions: + * `ReplyForce#Selective` + * `ReplyForce#NonSelective` * `API`: * For `copyMessage` order of parameters has been changed * `Utils`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyForce.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyForce.kt index d8d68db3ad..a536d06ec9 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyForce.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/ReplyForce.kt @@ -15,8 +15,19 @@ data class ReplyForce( val forceReply: Boolean = true companion object { - val ReplyForceSelective = ReplyForce(true) - val ReplyForceNonSelective = ReplyForce(false) + fun Selective(inputFieldPlaceholder: String? = null) = ReplyForce(true, inputFieldPlaceholder) + fun NonSelective(inputFieldPlaceholder: String? = null) = ReplyForce(false, inputFieldPlaceholder) + val Selective = Selective() + val NonSelective = NonSelective() + val Default = ReplyForce() + + @Deprecated("Renamed", ReplaceWith("ReplyForce.Selective")) + inline val ReplyForceSelective + get() = Selective + @Deprecated("Renamed", ReplaceWith("ReplyForce.NonSelective")) + inline val ReplyForceNonSelective + get() = NonSelective + @Deprecated("Renamed", ReplaceWith("ReplyForce.Default")) val ReplyForceDefault = ReplyForce() }