1
0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-12-27 02:57:13 +00:00

Merge pull request #934 from InsanusMokrassar/23.0.0

23.0.0
This commit is contained in:
InsanusMokrassar 2024-12-25 11:17:34 +06:00 committed by GitHub
commit 2d08c447bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 329 additions and 324 deletions

View File

@ -1,5 +1,16 @@
# TelegramBotAPI changelog
## 23.0.0
* `Version`:
* `Coroutines`: `1.9.0` -> `1.10.1`
* `MicroUtils`: `0.23.2` -> `0.24.0`
* `KSLog`: `1.3.6` -> `1.4.0`
* `Ktor`: `3.0.2` -> `3.0.3`
* `Core`:
* All old factory methods for `TextSource`s took suffix `TextSource`. For example: `regular` -> `regularTextSource`.
That has been for excluding names resolution ambiguity with extensions for `EntitiesBuilder`
## 22.0.0
**THIS UPDATE CONTAINS BREAKING CHANGES**

View File

@ -6,4 +6,4 @@ kotlin.incremental=true
kotlin.incremental.js=true
library_group=dev.inmo
library_version=22.0.0
library_version=23.0.0

View File

@ -2,24 +2,24 @@
kotlin = "2.1.0"
kotlin-serialization = "1.7.3"
kotlin-coroutines = "1.9.0"
kotlin-coroutines = "1.10.1"
javax-activation = "1.1.1"
korlibs = "5.4.0"
uuid = "0.8.4"
ktor = "3.0.2"
ktor = "3.0.3"
ksp = "2.1.0-1.0.29"
kotlin-poet = "1.18.1"
microutils = "0.23.2"
kslog = "1.3.6"
microutils = "0.24.0"
kslog = "1.4.0"
versions = "0.51.0"
github-release-plugin = "2.5.2"
dokka = "1.9.20"
dokka = "2.0.0"
validator = "0.16.3"

View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip

View File

@ -8110,24 +8110,24 @@ public final class dev/inmo/tgbotapi/types/BackgroundType$Companion : kotlinx/se
public final class dev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType {
public static final field Companion Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType$Companion;
public synthetic fun <init> (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Progress;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Progress;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Progress;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Progress;ZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Percentage;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Percentage;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Percentage;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Percentage;ZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public final fun component3-0NqaBMg ()Ldev/inmo/micro_utils/common/Progress;
public final fun component3-wnFeB1k ()Ldev/inmo/micro_utils/common/Percentage;
public final fun component4 ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public final fun component5 ()Z
public final fun component6 ()Z
public final fun component7-0NqaBMg ()Ldev/inmo/micro_utils/common/Progress;
public final fun component7-wnFeB1k ()Ldev/inmo/micro_utils/common/Percentage;
public final fun component8 ()Z
public final fun component9 ()Ljava/lang/String;
public final fun copy-2M0JUcM (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Progress;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Progress;ZLjava/lang/String;)Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;
public static synthetic fun copy-2M0JUcM$default (Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Progress;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Progress;ZLjava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;
public final fun copy-GfAbPXE (Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Percentage;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Percentage;ZLjava/lang/String;)Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;
public static synthetic fun copy-GfAbPXE$default (Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;Ljava/lang/String;Ldev/inmo/tgbotapi/types/BackgroundFill;Ldev/inmo/micro_utils/common/Percentage;Ldev/inmo/tgbotapi/types/files/DocumentFile;ZZLdev/inmo/micro_utils/common/Percentage;ZLjava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroundType;
public fun equals (Ljava/lang/Object;)Z
public final fun getDarkThemeDimming-0NqaBMg ()Ldev/inmo/micro_utils/common/Progress;
public final fun getDarkThemeDimming-wnFeB1k ()Ldev/inmo/micro_utils/common/Percentage;
public final fun getDocument ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public final fun getFill ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public final fun getIntensity-0NqaBMg ()Ldev/inmo/micro_utils/common/Progress;
public final fun getIntensity-wnFeB1k ()Ldev/inmo/micro_utils/common/Percentage;
public final fun getThemeName ()Ljava/lang/String;
public final fun getType ()Ljava/lang/String;
public fun hashCode ()I
@ -8153,7 +8153,7 @@ public final class dev/inmo/tgbotapi/types/BackgroundType$Companion$RawBackgroun
}
public abstract interface class dev/inmo/tgbotapi/types/BackgroundType$Dimmable : dev/inmo/tgbotapi/types/BackgroundType {
public abstract fun getDarkThemeDimming-3szG9qg ()D
public abstract fun getDarkThemeDimming-1Wau4v0 ()D
}
public final class dev/inmo/tgbotapi/types/BackgroundType$Fill : dev/inmo/tgbotapi/types/BackgroundType$Dimmable, dev/inmo/tgbotapi/types/BackgroundType$Fillable {
@ -8161,11 +8161,11 @@ public final class dev/inmo/tgbotapi/types/BackgroundType$Fill : dev/inmo/tgbota
public static final field type Ljava/lang/String;
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/BackgroundFill;DLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public final fun component2-3szG9qg ()D
public final fun copy-Ki7qfkc (Ldev/inmo/tgbotapi/types/BackgroundFill;D)Ldev/inmo/tgbotapi/types/BackgroundType$Fill;
public static synthetic fun copy-Ki7qfkc$default (Ldev/inmo/tgbotapi/types/BackgroundType$Fill;Ldev/inmo/tgbotapi/types/BackgroundFill;DILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Fill;
public final fun component2-1Wau4v0 ()D
public final fun copy-hey4pQk (Ldev/inmo/tgbotapi/types/BackgroundFill;D)Ldev/inmo/tgbotapi/types/BackgroundType$Fill;
public static synthetic fun copy-hey4pQk$default (Ldev/inmo/tgbotapi/types/BackgroundType$Fill;Ldev/inmo/tgbotapi/types/BackgroundFill;DILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Fill;
public fun equals (Ljava/lang/Object;)Z
public fun getDarkThemeDimming-3szG9qg ()D
public fun getDarkThemeDimming-1Wau4v0 ()D
public fun getFill ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public fun getType ()Ljava/lang/String;
public fun hashCode ()I
@ -8202,15 +8202,15 @@ public final class dev/inmo/tgbotapi/types/BackgroundType$Pattern : dev/inmo/tgb
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/BackgroundFill;DZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public final fun component2 ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public final fun component3-3szG9qg ()D
public final fun component3-1Wau4v0 ()D
public final fun component4 ()Z
public final fun component5 ()Z
public final fun copy-b_JbxZk (Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/BackgroundFill;DZZ)Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;
public static synthetic fun copy-b_JbxZk$default (Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/BackgroundFill;DZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;
public final fun copy-vfZnahQ (Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/BackgroundFill;DZZ)Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;
public static synthetic fun copy-vfZnahQ$default (Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/BackgroundFill;DZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Pattern;
public fun equals (Ljava/lang/Object;)Z
public fun getDocument ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public fun getFill ()Ldev/inmo/tgbotapi/types/BackgroundFill;
public final fun getIntensity-3szG9qg ()D
public final fun getIntensity-1Wau4v0 ()D
public fun getType ()Ljava/lang/String;
public fun hashCode ()I
public final fun isInverted ()Z
@ -8268,13 +8268,13 @@ public final class dev/inmo/tgbotapi/types/BackgroundType$Wallpaper : dev/inmo/t
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public final fun component2-3szG9qg ()D
public final fun component2-1Wau4v0 ()D
public final fun component3 ()Z
public final fun component4 ()Z
public final fun copy-VAT9Qd8 (Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZ)Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;
public static synthetic fun copy-VAT9Qd8$default (Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;
public final fun copy-WnQI0W0 (Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZ)Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;
public static synthetic fun copy-WnQI0W0$default (Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;Ldev/inmo/tgbotapi/types/files/DocumentFile;DZZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/BackgroundType$Wallpaper;
public fun equals (Ljava/lang/Object;)Z
public fun getDarkThemeDimming-3szG9qg ()D
public fun getDarkThemeDimming-1Wau4v0 ()D
public fun getDocument ()Ldev/inmo/tgbotapi/types/files/DocumentFile;
public fun getType ()Ljava/lang/String;
public fun hashCode ()I
@ -22349,9 +22349,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSou
}
public final class dev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSourceKt {
public static final fun blockquote (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
public static final fun blockquote (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
public static final fun blockquote ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
public static final fun blockquoteTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
public static final fun blockquoteTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
public static final fun blockquoteTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/BlockquoteTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/BoldTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22388,9 +22388,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/BoldTextSource$Co
}
public final class dev/inmo/tgbotapi/types/message/textsources/BoldTextSourceKt {
public static final fun bold (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
public static final fun bold (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
public static final fun bold ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
public static final fun boldTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
public static final fun boldTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
public static final fun boldTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/BoldTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22428,8 +22428,8 @@ public final class dev/inmo/tgbotapi/types/message/textsources/BotCommandTextSou
}
public final class dev/inmo/tgbotapi/types/message/textsources/BotCommandTextSourceKt {
public static final fun botCommand (Ldev/inmo/tgbotapi/types/BotCommand;)Ldev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource;
public static final fun botCommand (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource;
public static final fun botCommandTextSource (Ldev/inmo/tgbotapi/types/BotCommand;)Ldev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource;
public static final fun botCommandTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/CashTagTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22467,9 +22467,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/CashTagTextSource
}
public final class dev/inmo/tgbotapi/types/message/textsources/CashTagTextSourceKt {
public static final fun cashTag (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
public static final fun cashTag (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
public static final fun cashTag ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
public static final fun cashTagTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
public static final fun cashTagTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
public static final fun cashTagTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/CashTagTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/CodeTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22504,7 +22504,7 @@ public final class dev/inmo/tgbotapi/types/message/textsources/CodeTextSource$Co
}
public final class dev/inmo/tgbotapi/types/message/textsources/CodeTextSourceKt {
public static final fun code (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CodeTextSource;
public static final fun codeTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CodeTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22543,9 +22543,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSo
}
public final class dev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSourceKt {
public static final fun customEmoji-R1fjqgo (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
public static final fun customEmoji-R1fjqgo (Ljava/lang/String;Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
public static final fun customEmoji-R1fjqgo (Ljava/lang/String;[Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
public static final fun customEmojiTextSource-R1fjqgo (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
public static final fun customEmojiTextSource-R1fjqgo (Ljava/lang/String;Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
public static final fun customEmojiTextSource-R1fjqgo (Ljava/lang/String;[Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/CustomEmojiTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/EMailTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22582,9 +22582,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/EMailTextSource$C
}
public final class dev/inmo/tgbotapi/types/message/textsources/EMailTextSourceKt {
public static final fun email (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
public static final fun email (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
public static final fun email ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
public static final fun emailTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
public static final fun emailTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
public static final fun emailTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/EMailTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22621,9 +22621,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/ExpandableBlockqu
}
public final class dev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSourceKt {
public static final fun expandableBlockquote (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
public static final fun expandableBlockquote (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
public static final fun expandableBlockquote ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
public static final fun expandableBlockquoteTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
public static final fun expandableBlockquoteTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
public static final fun expandableBlockquoteTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/ExpandableBlockquoteTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/HashTagTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22661,9 +22661,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/HashTagTextSource
}
public final class dev/inmo/tgbotapi/types/message/textsources/HashTagTextSourceKt {
public static final fun hashtag (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
public static final fun hashtag (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
public static final fun hashtag ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
public static final fun hashtagTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
public static final fun hashtagTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
public static final fun hashtagTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/HashTagTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/ItalicTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22700,9 +22700,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/ItalicTextSource$
}
public final class dev/inmo/tgbotapi/types/message/textsources/ItalicTextSourceKt {
public static final fun italic (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
public static final fun italic (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
public static final fun italic ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
public static final fun italicTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
public static final fun italicTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
public static final fun italicTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/ItalicTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/MentionTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22740,10 +22740,10 @@ public final class dev/inmo/tgbotapi/types/message/textsources/MentionTextSource
}
public final class dev/inmo/tgbotapi/types/message/textsources/MentionTextSourceKt {
public static final fun mention (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mention (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mention ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mention-hkcqQtM (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mentionTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mentionTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mentionTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
public static final fun mentionTextSource-hkcqQtM (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/MentionTextSource;
}
public abstract interface class dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22793,9 +22793,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSo
}
public final class dev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSourceKt {
public static final fun phone (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
public static final fun phone (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
public static final fun phone ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
public static final fun phoneTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
public static final fun phoneTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
public static final fun phoneTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/PhoneNumberTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/PreTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22833,8 +22833,8 @@ public final class dev/inmo/tgbotapi/types/message/textsources/PreTextSource$Com
}
public final class dev/inmo/tgbotapi/types/message/textsources/PreTextSourceKt {
public static final fun pre (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/PreTextSource;
public static synthetic fun pre$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/textsources/PreTextSource;
public static final fun preTextSource (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/PreTextSource;
public static synthetic fun preTextSource$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/message/textsources/PreTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/RegularTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22869,8 +22869,8 @@ public final class dev/inmo/tgbotapi/types/message/textsources/RegularTextSource
}
public final class dev/inmo/tgbotapi/types/message/textsources/RegularTextSourceKt {
public static final fun regular (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/RegularTextSource;
public static final fun regularln (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/RegularTextSource;
public static final fun regularTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/RegularTextSource;
public static final fun regularTextSourceLn (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/RegularTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22907,9 +22907,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource
}
public final class dev/inmo/tgbotapi/types/message/textsources/SpoilerTextSourceKt {
public static final fun spoiler (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
public static final fun spoiler (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
public static final fun spoiler ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
public static final fun spoilerTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
public static final fun spoilerTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
public static final fun spoilerTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/SpoilerTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -22946,9 +22946,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/StrikethroughText
}
public final class dev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSourceKt {
public static final fun strikethrough (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
public static final fun strikethrough (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
public static final fun strikethrough ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
public static final fun strikethroughTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
public static final fun strikethroughTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
public static final fun strikethroughTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/StrikethroughTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/TextLinkTextSource : dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -22985,7 +22985,7 @@ public final class dev/inmo/tgbotapi/types/message/textsources/TextLinkTextSourc
}
public final class dev/inmo/tgbotapi/types/message/textsources/TextLinkTextSourceKt {
public static final fun link (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextLinkTextSource;
public static final fun linkTextSource (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextLinkTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -23024,19 +23024,19 @@ public final class dev/inmo/tgbotapi/types/message/textsources/TextMentionTextSo
}
public final class dev/inmo/tgbotapi/types/message/textsources/TextMentionTextSourceKt {
public static final fun mention (Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention (Ldev/inmo/tgbotapi/types/chat/User;Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention (Ldev/inmo/tgbotapi/types/chat/User;[Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention (Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention (Ljava/util/List;Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-WiG6Fm4 (Ljava/lang/String;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-WiG6Fm4 (Ljava/util/List;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-tJfg6EE (Ljava/lang/String;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-tJfg6EE (Ljava/util/List;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-tafjJLY (JLjava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-tafjJLY (JLjava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-zv9neSE (JLjava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mention-zv9neSE (JLjava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource (Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource (Ldev/inmo/tgbotapi/types/chat/User;Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource (Ldev/inmo/tgbotapi/types/chat/User;[Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource (Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource (Ljava/util/List;Ldev/inmo/tgbotapi/types/chat/User;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-WiG6Fm4 (Ljava/lang/String;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-WiG6Fm4 (Ljava/util/List;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-tJfg6EE (Ljava/lang/String;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-tJfg6EE (Ljava/util/List;J)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-tafjJLY (JLjava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-tafjJLY (JLjava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-zv9neSE (JLjava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
public static final fun mentionTextSource-zv9neSE (JLjava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/TextMentionTextSource;
}
public abstract interface class dev/inmo/tgbotapi/types/message/textsources/TextSource {
@ -23119,7 +23119,7 @@ public final class dev/inmo/tgbotapi/types/message/textsources/URLTextSource$Com
}
public final class dev/inmo/tgbotapi/types/message/textsources/URLTextSourceKt {
public static final fun link (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/URLTextSource;
public static final fun linkTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/URLTextSource;
}
public final class dev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource : dev/inmo/tgbotapi/types/message/textsources/MultilevelTextSource {
@ -23156,9 +23156,9 @@ public final class dev/inmo/tgbotapi/types/message/textsources/UnderlineTextSour
}
public final class dev/inmo/tgbotapi/types/message/textsources/UnderlineTextSourceKt {
public static final fun underline (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
public static final fun underline (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
public static final fun underline ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
public static final fun underlineTextSource (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
public static final fun underlineTextSource (Ljava/util/List;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
public static final fun underlineTextSource ([Ldev/inmo/tgbotapi/types/message/textsources/TextSource;)Ldev/inmo/tgbotapi/types/message/textsources/UnderlineTextSource;
}
public final class dev/inmo/tgbotapi/types/passport/FileHashesKt {
@ -27563,10 +27563,10 @@ public final class dev/inmo/tgbotapi/utils/ExtractDataAndJsonFromDecoderKt {
public final class dev/inmo/tgbotapi/utils/IntProgress100Serializer : kotlinx/serialization/KSerializer {
public static final field INSTANCE Ldev/inmo/tgbotapi/utils/IntProgress100Serializer;
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
public fun deserialize-PBVPzMA (Lkotlinx/serialization/encoding/Decoder;)D
public fun deserialize-prK6XWc (Lkotlinx/serialization/encoding/Decoder;)D
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
public fun serialize-Ki7qfkc (Lkotlinx/serialization/encoding/Encoder;D)V
public fun serialize-hey4pQk (Lkotlinx/serialization/encoding/Encoder;D)V
}
public final class dev/inmo/tgbotapi/utils/IntRGB24HEXAColorSerializer : kotlinx/serialization/KSerializer {

View File

@ -9,17 +9,14 @@ import dev.inmo.tgbotapi.bot.exceptions.newRequestException
import dev.inmo.tgbotapi.requests.GetUpdatesRequest
import dev.inmo.tgbotapi.requests.abstracts.Request
import dev.inmo.tgbotapi.types.Response
import dev.inmo.tgbotapi.types.message.textsources.pre
import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
import io.ktor.client.HttpClient
import io.ktor.client.plugins.timeout
import io.ktor.client.request.*
import io.ktor.client.request.forms.*
import io.ktor.client.statement.bodyAsText
import io.ktor.http.ContentType
import io.ktor.http.content.*
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import kotlin.collections.set

View File

@ -1,13 +1,10 @@
package dev.inmo.tgbotapi.types.message
import dev.inmo.micro_utils.common.Warning
import dev.inmo.micro_utils.serialization.mapper.MapperSerializer
import dev.inmo.tgbotapi.types.CustomEmojiId
import dev.inmo.tgbotapi.types.chat.User
import dev.inmo.tgbotapi.types.message.textsources.*
import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable
import kotlinx.serialization.builtins.ListSerializer
@Serializable
@Warning("This thing is subject of changes. Library do not guarantee stability of this class")
@ -102,7 +99,7 @@ internal fun List<Pair<Int, TextSource>>.fillWithRegulars(source: String): TextS
for (i in indices) {
val (offset, textSource) = get(i)
if (offset - index > 0) {
result.add(regular(source.substring(index, offset)))
result.add(regularTextSource(source.substring(index, offset)))
index = offset
}
result.add(textSource)
@ -110,7 +107,7 @@ internal fun List<Pair<Int, TextSource>>.fillWithRegulars(source: String): TextS
}
if (index != source.length) {
result.add(regular(source.substring(index, source.length)))
result.add(regularTextSource(source.substring(index, source.length)))
}
return result

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see blockquote
* @see blockquoteTextSource
*/
@Serializable
data class BlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class BlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
override val html: String by lazy { blockquoteHTML() }
}
inline fun blockquote(parts: TextSourcesList) = BlockquoteTextSource(parts.makeString(), parts)
inline fun blockquote(vararg parts: TextSource) = blockquote(parts.toList())
inline fun blockquote(text: String) = blockquote(regular(text))
inline fun blockquoteTextSource(parts: TextSourcesList) = BlockquoteTextSource(parts.makeString(), parts)
inline fun blockquoteTextSource(vararg parts: TextSource) = blockquoteTextSource(parts.toList())
inline fun blockquoteTextSource(text: String) = blockquoteTextSource(regularTextSource(text))

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see bold
* @see boldTextSource
*/
@Serializable
data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
override val html: String by lazy { boldHTML() }
}
inline fun bold(parts: TextSourcesList) = BoldTextSource(parts.makeString(), parts)
inline fun bold(vararg parts: TextSource) = bold(parts.toList())
inline fun bold(text: String) = bold(regular(text))
inline fun boldTextSource(parts: TextSourcesList) = BoldTextSource(parts.makeString(), parts)
inline fun boldTextSource(vararg parts: TextSource) = boldTextSource(parts.toList())
inline fun boldTextSource(text: String) = boldTextSource(regularTextSource(text))

View File

@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see botCommand
* @see botCommandTextSource
*/
@Serializable
data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -33,6 +33,6 @@ data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
/**
* @param command Without leading "/"
*/
inline fun botCommand(command: String) = BotCommandTextSource("/$command")
inline fun botCommandTextSource(command: String) = BotCommandTextSource("/$command")
inline fun botCommand(botCommand: BotCommand) = botCommand(botCommand.command)
inline fun botCommandTextSource(botCommand: BotCommand) = botCommandTextSource(botCommand.command)

View File

@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see cashTag
* @see cashTagTextSource
*/
@Serializable
data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -25,6 +25,6 @@ data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
override val html: String by lazy { cashTagHTML() }
}
inline fun cashTag(parts: TextSourcesList) = CashTagTextSource(parts.makeString(), parts)
inline fun cashTag(vararg parts: TextSource) = cashTag(parts.toList())
inline fun cashTag(tag: String) = cashTag(regular(tag))
inline fun cashTagTextSource(parts: TextSourcesList) = CashTagTextSource(parts.makeString(), parts)
inline fun cashTagTextSource(vararg parts: TextSource) = cashTagTextSource(parts.toList())
inline fun cashTagTextSource(tag: String) = cashTagTextSource(regularTextSource(tag))

View File

@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see code
* @see codeTextSource
*/
@Serializable
data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -16,4 +16,4 @@ data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
override val html: String by lazy { source.codeHTML() }
}
inline fun code(code: String) = CodeTextSource(code)
inline fun codeTextSource(code: String) = CodeTextSource(code)

View File

@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see customEmoji
* @see customEmojiTextSource
*/
@Serializable
data class CustomEmojiTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -21,9 +21,9 @@ data class CustomEmojiTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
}
@Suppress("EXPERIMENTAL_API_USAGE")
inline fun customEmoji(emojiId: CustomEmojiId, parts: TextSourcesList) = CustomEmojiTextSource(parts.makeString(), emojiId, parts)
inline fun customEmoji(emojiId: CustomEmojiId, vararg parts: TextSource) = customEmoji(emojiId, parts.toList())
inline fun customEmojiTextSource(emojiId: CustomEmojiId, parts: TextSourcesList) = CustomEmojiTextSource(parts.makeString(), emojiId, parts)
inline fun customEmojiTextSource(emojiId: CustomEmojiId, vararg parts: TextSource) = customEmojiTextSource(emojiId, parts.toList())
/**
* Without sharp (#)
*/
inline fun customEmoji(emojiId: CustomEmojiId, text: String) = customEmoji(emojiId, regular(text))
inline fun customEmojiTextSource(emojiId: CustomEmojiId, text: String) = customEmojiTextSource(emojiId, regularTextSource(text))

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see email
* @see emailTextSource
*/
@Serializable
data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
override val html: String by lazy { emailHTML(source) }
}
inline fun email(parts: TextSourcesList) = EMailTextSource(parts.makeString(), parts)
inline fun email(vararg parts: TextSource) = email(parts.toList())
inline fun email(emailAddress: String) = email(regular(emailAddress))
inline fun emailTextSource(parts: TextSourcesList) = EMailTextSource(parts.makeString(), parts)
inline fun emailTextSource(vararg parts: TextSource) = emailTextSource(parts.toList())
inline fun emailTextSource(emailAddress: String) = emailTextSource(regularTextSource(emailAddress))

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see expandableBlockquote
* @see expandableBlockquoteTextSource
*/
@Serializable
data class ExpandableBlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class ExpandableBlockquoteTextSource @RiskFeature(DirectInvocationOfTextSou
override val html: String by lazy { expandableBlockquoteHTML() }
}
inline fun expandableBlockquote(parts: TextSourcesList) = ExpandableBlockquoteTextSource(parts.makeString(), parts)
inline fun expandableBlockquote(vararg parts: TextSource) = expandableBlockquote(parts.toList())
inline fun expandableBlockquote(text: String) = expandableBlockquote(regular(text))
inline fun expandableBlockquoteTextSource(parts: TextSourcesList) = ExpandableBlockquoteTextSource(parts.makeString(), parts)
inline fun expandableBlockquoteTextSource(vararg parts: TextSource) = expandableBlockquoteTextSource(parts.toList())
inline fun expandableBlockquoteTextSource(text: String) = expandableBlockquoteTextSource(regularTextSource(text))

View File

@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see hashtag
* @see hashtagTextSource
*/
@Serializable
data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -33,9 +33,9 @@ data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
}
@Suppress("EXPERIMENTAL_API_USAGE")
inline fun hashtag(parts: TextSourcesList) = (regular("#") + parts).let { HashTagTextSource(it.makeString(), it) }
inline fun hashtag(vararg parts: TextSource) = hashtag(parts.toList())
inline fun hashtagTextSource(parts: TextSourcesList) = (regularTextSource("#") + parts).let { HashTagTextSource(it.makeString(), it) }
inline fun hashtagTextSource(vararg parts: TextSource) = hashtagTextSource(parts.toList())
/**
* Without sharp (#)
*/
inline fun hashtag(hashtag: String) = hashtag(regular(hashtag))
inline fun hashtagTextSource(hashtag: String) = hashtagTextSource(regularTextSource(hashtag))

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see italic
* @see italicTextSource
*/
@Serializable
data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,7 +18,7 @@ data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor
override val html: String by lazy { italicHTML() }
}
inline fun italic(parts: TextSourcesList) = ItalicTextSource(parts.makeString(), parts)
inline fun italic(vararg parts: TextSource) = italic(parts.toList())
inline fun italic(text: String) = italic(regular(text))
inline fun italicTextSource(parts: TextSourcesList) = ItalicTextSource(parts.makeString(), parts)
inline fun italicTextSource(vararg parts: TextSource) = italicTextSource(parts.toList())
inline fun italicTextSource(text: String) = italicTextSource(regularTextSource(text))

View File

@ -14,7 +14,7 @@ private val String.withoutCommercialAt
}
/**
* @see mention
* @see mentionTextSource
*/
@Serializable
data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -33,13 +33,13 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
}
}
inline fun mention(parts: TextSourcesList) = (regular("@") + parts).let { MentionTextSource(it.makeString(), it) }
inline fun mention(vararg parts: TextSource) = mention(parts.toList())
inline fun mentionTextSource(parts: TextSourcesList) = (regularTextSource("@") + parts).let { MentionTextSource(it.makeString(), it) }
inline fun mentionTextSource(vararg parts: TextSource) = mentionTextSource(parts.toList())
/**
* Without leading "@"
*/
inline fun mention(whoToMention: String) = mention(regular(whoToMention))
inline fun mentionTextSource(whoToMention: String) = mentionTextSource(regularTextSource(whoToMention))
inline fun mention(whoToMention: Username) = mention(whoToMention.full.dropWhile { it == '@' })
inline fun mentionTextSource(whoToMention: Username) = mentionTextSource(whoToMention.full.dropWhile { it == '@' })

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see phone
* @see phoneTextSource
*/
@Serializable
data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,7 +18,7 @@ data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
override val html: String by lazy { phoneHTML() }
}
inline fun phone(parts: TextSourcesList) = PhoneNumberTextSource(parts.makeString(), parts)
inline fun phone(vararg parts: TextSource) = phone(parts.toList())
inline fun phone(number: String) = phone(regular(number))
inline fun phoneTextSource(parts: TextSourcesList) = PhoneNumberTextSource(parts.makeString(), parts)
inline fun phoneTextSource(vararg parts: TextSource) = phoneTextSource(parts.toList())
inline fun phoneTextSource(number: String) = phoneTextSource(regularTextSource(number))

View File

@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see pre
* @see preTextSource
*/
@Serializable
data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -17,5 +17,5 @@ data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) c
override val html: String by lazy { source.preHTML(language) }
}
inline fun pre(code: String, language: String? = null) = PreTextSource(code, language)
inline fun preTextSource(code: String, language: String? = null) = PreTextSource(code, language)

View File

@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see regular
* @see regularTextSource
*/
@Serializable
data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -16,6 +16,6 @@ data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
override val html: String by lazy { source.regularHtml() }
}
inline fun regular(text: String) = RegularTextSource(text)
inline fun regularTextSource(text: String) = RegularTextSource(text)
inline fun regularln(text: String) = regular("$text\n")
inline fun regularTextSourceLn(text: String) = regularTextSource("$text\n")

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see italic
* @see italicTextSource
*/
@Serializable
data class SpoilerTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,7 +18,7 @@ data class SpoilerTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
override val html: String by lazy { spoilerHTML() }
}
inline fun spoiler(parts: TextSourcesList) = SpoilerTextSource(parts.makeString(), parts)
inline fun spoiler(vararg parts: TextSource) = spoiler(parts.toList())
inline fun spoiler(text: String) = spoiler(regular(text))
inline fun spoilerTextSource(parts: TextSourcesList) = SpoilerTextSource(parts.makeString(), parts)
inline fun spoilerTextSource(vararg parts: TextSource) = spoilerTextSource(parts.toList())
inline fun spoilerTextSource(text: String) = spoilerTextSource(regularTextSource(text))

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see strikethrough
* @see strikethroughTextSource
*/
@Serializable
data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceCons
override val markdown: String by lazy { source.strikethroughMarkdown() }
}
inline fun strikethrough(parts: TextSourcesList) = StrikethroughTextSource(parts.makeString(), parts)
inline fun strikethrough(vararg parts: TextSource) = strikethrough(parts.toList())
inline fun strikethrough(text: String) = strikethrough(regular(text))
inline fun strikethroughTextSource(parts: TextSourcesList) = StrikethroughTextSource(parts.makeString(), parts)
inline fun strikethroughTextSource(vararg parts: TextSource) = strikethroughTextSource(parts.toList())
inline fun strikethroughTextSource(text: String) = strikethroughTextSource(regularTextSource(text))

View File

@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see link
* @see linkTextSource
*/
@Serializable
data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -17,4 +17,4 @@ data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstruct
override val html: String by lazy { source.linkHTML(url) }
}
inline fun link(text: String, url: String) = TextLinkTextSource(text, url)
inline fun linkTextSource(text: String, url: String) = TextLinkTextSource(text, url)

View File

@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see mention
* @see mentionTextSource
*/
@Serializable
data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -22,21 +22,21 @@ data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
override val html: String by lazy { textMentionHTML(user.id) }
}
inline fun mention(parts: TextSourcesList, user: User) = TextMentionTextSource(parts.makeString(), user, parts)
inline fun User.mention(parts: TextSourcesList) = mention(parts, this)
inline fun mention(parts: TextSourcesList, userId: UserId) = mention(parts, CommonUser(userId, ""))
inline fun UserId.mention(parts: TextSourcesList) = mention(parts, this)
inline fun mention(parts: TextSourcesList, id: RawChatId) = mention(parts, UserId(id))
inline fun RawChatId.mention(parts: TextSourcesList) = mention(parts, this)
inline fun mention(user: User, vararg parts: TextSource) = mention(
inline fun mentionTextSource(parts: TextSourcesList, user: User) = TextMentionTextSource(parts.makeString(), user, parts)
inline fun User.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
inline fun mentionTextSource(parts: TextSourcesList, userId: UserId) = mentionTextSource(parts, CommonUser(userId, ""))
inline fun UserId.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
inline fun mentionTextSource(parts: TextSourcesList, id: RawChatId) = mentionTextSource(parts, UserId(id))
inline fun RawChatId.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
inline fun mentionTextSource(user: User, vararg parts: TextSource) = mentionTextSource(
textSourcesOrElseTextSource(parts.toList()) {
RegularTextSource("${user.lastName} ${user.firstName}")
},
user
)
inline fun mention(text: String, user: User) = mention(user, regular(text))
inline fun User.mention(text: String) = mention(this, regular(text))
inline fun mention(text: String, userId: UserId) = mention(text, CommonUser(userId, ""))
inline fun UserId.mention(text: String) = mention(text, this)
inline fun mention(text: String, id: RawChatId) = mention(text, UserId(id))
inline fun RawChatId.mention(text: String) = mention(text, this)
inline fun mentionTextSource(text: String, user: User) = mentionTextSource(user, regularTextSource(text))
inline fun User.mentionTextSource(text: String) = mentionTextSource(this, regularTextSource(text))
inline fun mentionTextSource(text: String, userId: UserId) = mentionTextSource(text, CommonUser(userId, ""))
inline fun UserId.mentionTextSource(text: String) = mentionTextSource(text, this)
inline fun mentionTextSource(text: String, id: RawChatId) = mentionTextSource(text, UserId(id))
inline fun RawChatId.mentionTextSource(text: String) = mentionTextSource(text, this)

View File

@ -26,7 +26,7 @@ operator fun TextSource.plus(other: TextSource) = when {
this is RegularTextSource && other is RegularTextSource -> listOf(RegularTextSource(source + other.source))
else -> listOf(this, other)
}
operator fun TextSource.plus(text: String) = this + regular(text)
operator fun TextSource.plus(text: String) = this + regularTextSource(text)
operator fun List<TextSource>.plus(text: String): List<TextSource> {
val newList = mutableListOf<TextSource>()
@ -36,7 +36,7 @@ operator fun List<TextSource>.plus(text: String): List<TextSource> {
val sublist = lastOrNull() ?.let {
it + text
} ?: listOf(regular(text))
} ?: listOf(regularTextSource(text))
newList.addAll(sublist)

View File

@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see link
* @see linkTextSource
*/
@Serializable
data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -16,4 +16,4 @@ data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) c
override val html: String by lazy { source.linkHTML(source) }
}
inline fun link(url: String) = URLTextSource(url)
inline fun linkTextSource(url: String) = URLTextSource(url)

View File

@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
import kotlinx.serialization.Serializable
/**
* @see underline
* @see underlineTextSource
*/
@Serializable
data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@ -18,6 +18,6 @@ data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstruc
override val html: String by lazy { underlineHTML() }
}
inline fun underline(parts: TextSourcesList) = UnderlineTextSource(parts.makeString(), parts)
inline fun underline(vararg parts: TextSource) = underline(parts.toList())
inline fun underline(text: String) = underline(regular(text))
inline fun underlineTextSource(parts: TextSourcesList) = UnderlineTextSource(parts.makeString(), parts)
inline fun underlineTextSource(vararg parts: TextSource) = underlineTextSource(parts.toList())
inline fun underlineTextSource(text: String) = underlineTextSource(regularTextSource(text))

View File

@ -10,10 +10,10 @@ import dev.inmo.tgbotapi.types.chat.User
import dev.inmo.tgbotapi.types.message.textsources.*
typealias EntitiesBuilderBody = EntitiesBuilder.() -> Unit
val newLine = regular("\n")
val newLine = regularTextSource("\n")
inline fun buildEntities(separator: TextSource? = null, init: EntitiesBuilderBody): TextSourcesList = EntitiesBuilder(separator).apply(init).build()
inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regular(separator), init)
inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regularTextSource(separator), init)
/**
* This builder can be used to provide building of [TextSource]s [List]
@ -51,7 +51,7 @@ class EntitiesBuilder(
operator fun invoke(vararg source: TextSource) = addAll(source.toList())
operator fun String.unaryPlus(): EntitiesBuilder {
add(dev.inmo.tgbotapi.types.message.textsources.regular(this))
add(dev.inmo.tgbotapi.types.message.textsources.regularTextSource(this))
return this@EntitiesBuilder
}
@ -68,18 +68,18 @@ class EntitiesBuilder(
}
/**
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
*/
inline fun EntitiesBuilder.bold(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.bold(parts))
inline fun EntitiesBuilder.bold(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(parts))
/**
* Version of [EntitiesBuilder.bold] with new line at the end
*/
inline fun EntitiesBuilder.boldln(parts: TextSourcesList) = bold(parts) + newLine
/**
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold].
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.bold(
inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(
buildEntities(separator, init)
))
/**
@ -88,35 +88,35 @@ inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.in
*/
inline fun EntitiesBuilder.boldln(noinline init: EntitiesBuilderBody) = bold(init) + newLine
/**
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
*/
inline fun EntitiesBuilder.bold(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.bold(*parts))
inline fun EntitiesBuilder.bold(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(*parts))
/**
* Version of [EntitiesBuilder.bold] with new line at the end
*/
inline fun EntitiesBuilder.boldln(vararg parts: TextSource) = bold(*parts) + newLine
/**
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
* Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
*/
inline fun EntitiesBuilder.bold(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.bold(text))
inline fun EntitiesBuilder.bold(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(text))
/**
* Version of [EntitiesBuilder.bold] with new line at the end
*/
inline fun EntitiesBuilder.boldln(text: String) = bold(text) + newLine
/**
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
*/
inline fun EntitiesBuilder.blockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(parts))
inline fun EntitiesBuilder.blockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(parts))
/**
* Version of [EntitiesBuilder.blockquote] with new line at the end
*/
inline fun EntitiesBuilder.blockquoteln(parts: TextSourcesList) = blockquote(parts) + newLine
/**
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote].
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(
inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(
buildEntities(separator, init)
))
/**
@ -125,17 +125,17 @@ inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(
*/
inline fun EntitiesBuilder.blockquoteln(noinline init: EntitiesBuilderBody) = blockquote(init) + newLine
/**
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
*/
inline fun EntitiesBuilder.blockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(*parts))
inline fun EntitiesBuilder.blockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(*parts))
/**
* Version of [EntitiesBuilder.blockquote] with new line at the end
*/
inline fun EntitiesBuilder.blockquoteln(vararg parts: TextSource) = blockquote(*parts) + newLine
/**
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
*/
inline fun EntitiesBuilder.blockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(text))
inline fun EntitiesBuilder.blockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(text))
/**
* Version of [EntitiesBuilder.blockquote] with new line at the end
*/
@ -143,18 +143,18 @@ inline fun EntitiesBuilder.blockquoteln(text: String) = blockquote(text) + newLi
/**
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
* Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
*/
inline fun EntitiesBuilder.expandableBlockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(parts))
inline fun EntitiesBuilder.expandableBlockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(parts))
/**
* Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
*/
inline fun EntitiesBuilder.expandableBlockquoteln(parts: TextSourcesList) = expandableBlockquote(parts) + newLine
/**
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote].
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(
inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(
buildEntities(separator, init)
))
/**
@ -163,35 +163,35 @@ inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBo
*/
inline fun EntitiesBuilder.expandableBlockquoteln(noinline init: EntitiesBuilderBody) = expandableBlockquote(init) + newLine
/**
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote]
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource]
*/
inline fun EntitiesBuilder.expandableBlockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(*parts))
inline fun EntitiesBuilder.expandableBlockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(*parts))
/**
* Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
*/
inline fun EntitiesBuilder.expandableBlockquoteln(vararg parts: TextSource) = expandableBlockquote(*parts) + newLine
/**
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote]
* Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource]
*/
inline fun EntitiesBuilder.expandableBlockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(text))
inline fun EntitiesBuilder.expandableBlockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(text))
/**
* Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
*/
inline fun EntitiesBuilder.expandableBlockquoteln(text: String) = expandableBlockquote(text) + newLine
/**
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
*/
inline fun EntitiesBuilder.spoiler(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(parts))
inline fun EntitiesBuilder.spoiler(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(parts))
/**
* Version of [EntitiesBuilder.spoiler] with new line at the end
*/
inline fun EntitiesBuilder.spoilerln(parts: TextSourcesList) = spoiler(parts) + newLine
/**
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler].
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(
inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(
buildEntities(separator, init)
))
/**
@ -200,17 +200,17 @@ inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev
*/
inline fun EntitiesBuilder.spoilerln(noinline init: EntitiesBuilderBody) = spoiler(init) + newLine
/**
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
*/
inline fun EntitiesBuilder.spoiler(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(*parts))
inline fun EntitiesBuilder.spoiler(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(*parts))
/**
* Version of [EntitiesBuilder.spoiler] with new line at the end
*/
inline fun EntitiesBuilder.spoilerln(vararg parts: TextSource) = spoiler(*parts) + newLine
/**
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
* Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
*/
inline fun EntitiesBuilder.spoiler(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(text))
inline fun EntitiesBuilder.spoiler(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(text))
/**
* Version of [EntitiesBuilder.spoiler] with new line at the end
*/
@ -218,17 +218,17 @@ inline fun EntitiesBuilder.spoilerln(text: String) = spoiler(text) + newLine
/**
* Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommand]
* Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource]
*/
inline fun EntitiesBuilder.botCommand(command: String) = add(dev.inmo.tgbotapi.types.message.textsources.botCommand(command))
inline fun EntitiesBuilder.botCommand(command: String) = add(dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource(command))
/**
* Version of [EntitiesBuilder.botCommand] with new line at the end
*/
inline fun EntitiesBuilder.botCommandln(command: String) = botCommand(command) + newLine
/**
* Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommand]
* Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource]
*/
inline fun EntitiesBuilder.botCommand(botCommand: BotCommand) = add(dev.inmo.tgbotapi.types.message.textsources.botCommand(botCommand))
inline fun EntitiesBuilder.botCommand(botCommand: BotCommand) = add(dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource(botCommand))
/**
* Version of [EntitiesBuilder.botCommand] with new line at the end
*/
@ -237,18 +237,18 @@ inline fun EntitiesBuilder.botCommandln(botCommand: BotCommand) = botCommand(bot
/**
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
*/
inline fun EntitiesBuilder.cashTag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(parts))
inline fun EntitiesBuilder.cashTag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(parts))
/**
* Version of [EntitiesBuilder.cashTag] with new line at the end
*/
inline fun EntitiesBuilder.cashTagln(parts: TextSourcesList) = cashTag(parts) + newLine
/**
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag].
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(
inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(
buildEntities(separator, init)
))
/**
@ -257,17 +257,17 @@ inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev
*/
inline fun EntitiesBuilder.cashTagln(noinline init: EntitiesBuilderBody) = cashTag(init) + newLine
/**
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
*/
inline fun EntitiesBuilder.cashTag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(*parts))
inline fun EntitiesBuilder.cashTag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(*parts))
/**
* Version of [EntitiesBuilder.cashTag] with new line at the end
*/
inline fun EntitiesBuilder.cashTagln(vararg parts: TextSource) = cashTag(*parts) + newLine
/**
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
* Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
*/
inline fun EntitiesBuilder.cashTag(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(text))
inline fun EntitiesBuilder.cashTag(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(text))
/**
* Version of [EntitiesBuilder.cashTag] with new line at the end
*/
@ -275,9 +275,9 @@ inline fun EntitiesBuilder.cashTagln(text: String) = cashTag(text) + newLine
/**
* Add code using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.code]
* Add code using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.codeTextSource]
*/
inline fun EntitiesBuilder.code(code: String) = add(dev.inmo.tgbotapi.types.message.textsources.code(code))
inline fun EntitiesBuilder.code(code: String) = add(dev.inmo.tgbotapi.types.message.textsources.codeTextSource(code))
/**
* Version of [EntitiesBuilder.code] with new line at the end
*/
@ -285,18 +285,18 @@ inline fun EntitiesBuilder.codeln(code: String) = code(code) + newLine
/**
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
*/
inline fun EntitiesBuilder.email(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.email(parts))
inline fun EntitiesBuilder.email(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(parts))
/**
* Version of [EntitiesBuilder.email] with new line at the end
*/
inline fun EntitiesBuilder.emailln(parts: TextSourcesList) = email(parts) + newLine
/**
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email].
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.email(
inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(
buildEntities(separator, init)
))
/**
@ -305,17 +305,17 @@ inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.i
*/
inline fun EntitiesBuilder.emailln(noinline init: EntitiesBuilderBody) = email(init) + newLine
/**
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
*/
inline fun EntitiesBuilder.email(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.email(*parts))
inline fun EntitiesBuilder.email(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(*parts))
/**
* Version of [EntitiesBuilder.email] with new line at the end
*/
inline fun EntitiesBuilder.emailln(vararg parts: TextSource) = email(*parts) + newLine
/**
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
* Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
*/
inline fun EntitiesBuilder.email(emailAddress: String) = add(dev.inmo.tgbotapi.types.message.textsources.email(emailAddress))
inline fun EntitiesBuilder.email(emailAddress: String) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(emailAddress))
/**
* Version of [EntitiesBuilder.email] with new line at the end
*/
@ -323,18 +323,18 @@ inline fun EntitiesBuilder.emailln(emailAddress: String) = email(emailAddress) +
/**
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
*/
inline fun EntitiesBuilder.hashtag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(parts))
inline fun EntitiesBuilder.hashtag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(parts))
/**
* Version of [EntitiesBuilder.hashtag] with new line at the end
*/
inline fun EntitiesBuilder.hashtagln(parts: TextSourcesList) = hashtag(parts) + newLine
/**
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag].
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(
inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(
buildEntities(separator, init)
))
/**
@ -343,17 +343,17 @@ inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev
*/
inline fun EntitiesBuilder.hashtagln(noinline init: EntitiesBuilderBody) = hashtag(init) + newLine
/**
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
*/
inline fun EntitiesBuilder.hashtag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(*parts))
inline fun EntitiesBuilder.hashtag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(*parts))
/**
* Version of [EntitiesBuilder.hashtag] with new line at the end
*/
inline fun EntitiesBuilder.hashtagln(vararg parts: TextSource) = hashtag(*parts) + newLine
/**
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
* Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
*/
inline fun EntitiesBuilder.hashtag(hashtag: String) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(hashtag))
inline fun EntitiesBuilder.hashtag(hashtag: String) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(hashtag))
/**
* Version of [EntitiesBuilder.hashtag] with new line at the end
*/
@ -361,18 +361,18 @@ inline fun EntitiesBuilder.hashtagln(hashtag: String) = hashtag(hashtag) + newLi
/**
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
*/
inline fun EntitiesBuilder.italic(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.italic(parts))
inline fun EntitiesBuilder.italic(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(parts))
/**
* Version of [EntitiesBuilder.italic] with new line at the end
*/
inline fun EntitiesBuilder.italicln(parts: TextSourcesList) = italic(parts) + newLine
/**
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic].
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.italic(
inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(
buildEntities(separator, init)
))
/**
@ -381,17 +381,17 @@ inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.
*/
inline fun EntitiesBuilder.italicln(noinline init: EntitiesBuilderBody) = italic(init) + newLine
/**
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
*/
inline fun EntitiesBuilder.italic(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.italic(*parts))
inline fun EntitiesBuilder.italic(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(*parts))
/**
* Version of [EntitiesBuilder.italic] with new line at the end
*/
inline fun EntitiesBuilder.italicln(vararg parts: TextSource) = italic(*parts) + newLine
/**
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
* Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
*/
inline fun EntitiesBuilder.italic(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.italic(text))
inline fun EntitiesBuilder.italic(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(text))
/**
* Version of [EntitiesBuilder.italic] with new line at the end
*/
@ -399,18 +399,18 @@ inline fun EntitiesBuilder.italicln(text: String) = italic(text) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.mention(parts))
inline fun EntitiesBuilder.mention(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
inline fun EntitiesBuilder.mentionln(parts: TextSourcesList) = mention(parts) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention].
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.mention(
inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(
buildEntities(separator, init)
))
/**
@ -419,25 +419,25 @@ inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev
*/
inline fun EntitiesBuilder.mentionln(noinline init: EntitiesBuilderBody) = mention(init) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.mention(*parts))
inline fun EntitiesBuilder.mention(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(*parts))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
inline fun EntitiesBuilder.mentionln(vararg parts: TextSource) = mention(*parts) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(whoToMention: String) = add(dev.inmo.tgbotapi.types.message.textsources.mention(whoToMention))
inline fun EntitiesBuilder.mention(whoToMention: String) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(whoToMention))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
inline fun EntitiesBuilder.mentionln(whoToMention: String) = mention(whoToMention) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(parts: TextSourcesList, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mention(parts, user))
inline fun EntitiesBuilder.mention(parts: TextSourcesList, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts, user))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
@ -445,24 +445,24 @@ inline fun EntitiesBuilder.mentionln(parts: TextSourcesList, user: User) = menti
inline fun EntitiesBuilder.mention(
user: User,
vararg parts: TextSource
) = add(dev.inmo.tgbotapi.types.message.textsources.mention(user, *parts))
) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(user, *parts))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
inline fun EntitiesBuilder.mentionln(user: User, vararg parts: TextSource) = mention(user, *parts) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(text: String, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mention(text, user))
inline fun EntitiesBuilder.mention(text: String, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(text, user))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
inline fun EntitiesBuilder.mentionln(text: String, user: User) = mention(text, user) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(parts: TextSourcesList, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mention(parts, userId))
inline fun EntitiesBuilder.mention(parts: TextSourcesList, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts, userId))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
@ -476,9 +476,9 @@ inline fun EntitiesBuilder.mention(
*/
inline fun EntitiesBuilder.mentionln(userId: UserId, vararg parts: TextSource) = mention(userId, *parts) + newLine
/**
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
* Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
*/
inline fun EntitiesBuilder.mention(text: String, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mention(text, userId))
inline fun EntitiesBuilder.mention(text: String, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(text, userId))
/**
* Version of [EntitiesBuilder.mention] with new line at the end
*/
@ -486,18 +486,18 @@ inline fun EntitiesBuilder.mentionln(text: String, userId: UserId) = mention(tex
/**
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
*/
inline fun EntitiesBuilder.phone(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.phone(parts))
inline fun EntitiesBuilder.phone(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(parts))
/**
* Version of [EntitiesBuilder.phone] with new line at the end
*/
inline fun EntitiesBuilder.phoneln(parts: TextSourcesList) = phone(parts) + newLine
/**
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone].
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.phone(
inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(
buildEntities(separator, init)
))
/**
@ -506,17 +506,17 @@ inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.i
*/
inline fun EntitiesBuilder.phoneln(noinline init: EntitiesBuilderBody) = phone(init) + newLine
/**
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
*/
inline fun EntitiesBuilder.phone(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.phone(*parts))
inline fun EntitiesBuilder.phone(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(*parts))
/**
* Version of [EntitiesBuilder.phone] with new line at the end
*/
inline fun EntitiesBuilder.phoneln(vararg parts: TextSource) = phone(*parts) + newLine
/**
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
* Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
*/
inline fun EntitiesBuilder.phone(number: String) = add(dev.inmo.tgbotapi.types.message.textsources.phone(number))
inline fun EntitiesBuilder.phone(number: String) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(number))
/**
* Version of [EntitiesBuilder.phone] with new line at the end
*/
@ -524,24 +524,24 @@ inline fun EntitiesBuilder.phoneln(number: String) = phone(number) + newLine
/**
* Add pre using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.pre]
* Add pre using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.preTextSource]
*/
inline fun EntitiesBuilder.pre(code: String, language: String?) = add(dev.inmo.tgbotapi.types.message.textsources.pre(code, language))
inline fun EntitiesBuilder.pre(code: String, language: String?) = add(dev.inmo.tgbotapi.types.message.textsources.preTextSource(code, language))
/**
* Version of [EntitiesBuilder.pre] with new line at the end
*/
inline fun EntitiesBuilder.preln(code: String, language: String?) = pre(code, language) + newLine
/**
* Will add simple [dev.inmo.tgbotapi.types.message.textsources.regular] [TextSource]
* Will add simple [dev.inmo.tgbotapi.types.message.textsources.regularTextSource] [TextSource]
*
* @see RegularTextSource
* @see dev.inmo.tgbotapi.extensions.utils.formatting.regularln
*/
inline fun EntitiesBuilder.regular(text: String) =
add(dev.inmo.tgbotapi.types.message.textsources.regular(text))
add(dev.inmo.tgbotapi.types.message.textsources.regularTextSource(text))
/**
* Will add simple [dev.inmo.tgbotapi.types.message.textsources.regular] [TextSource] and "\n" at the end
* Will add simple [dev.inmo.tgbotapi.types.message.textsources.regularTextSource] [TextSource] and "\n" at the end
*
* @see RegularTextSource
* @see dev.inmo.tgbotapi.extensions.utils.formatting.regular
@ -550,18 +550,18 @@ inline fun EntitiesBuilder.regularln(text: String) = regular(text) + newLine
/**
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
*/
inline fun EntitiesBuilder.strikethrough(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(parts))
inline fun EntitiesBuilder.strikethrough(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(parts))
/**
* Version of [EntitiesBuilder.strikethrough] with new line at the end
*/
inline fun EntitiesBuilder.strikethroughln(parts: TextSourcesList) = strikethrough(parts) + newLine
/**
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough].
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(
inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(
buildEntities(separator, init)
))
/**
@ -570,17 +570,17 @@ inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = a
*/
inline fun EntitiesBuilder.strikethroughln(noinline init: EntitiesBuilderBody) = strikethrough(init) + newLine
/**
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
*/
inline fun EntitiesBuilder.strikethrough(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(*parts))
inline fun EntitiesBuilder.strikethrough(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(*parts))
/**
* Version of [EntitiesBuilder.strikethrough] with new line at the end
*/
inline fun EntitiesBuilder.strikethroughln(vararg parts: TextSource) = strikethrough(*parts) + newLine
/**
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
* Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
*/
inline fun EntitiesBuilder.strikethrough(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(text))
inline fun EntitiesBuilder.strikethrough(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(text))
/**
* Version of [EntitiesBuilder.strikethrough] with new line at the end
*/
@ -588,17 +588,17 @@ inline fun EntitiesBuilder.strikethroughln(text: String) = strikethrough(text) +
/**
* Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.link]
* Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.linkTextSource]
*/
inline fun EntitiesBuilder.link(text: String, url: String) = add(dev.inmo.tgbotapi.types.message.textsources.link(text, url))
inline fun EntitiesBuilder.link(text: String, url: String) = add(dev.inmo.tgbotapi.types.message.textsources.linkTextSource(text, url))
/**
* Version of [EntitiesBuilder.link] with new line at the end
*/
inline fun EntitiesBuilder.linkln(text: String, url: String) = link(text, url) + newLine
/**
* Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.link]
* Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.linkTextSource]
*/
inline fun EntitiesBuilder.link(url: String) = add(dev.inmo.tgbotapi.types.message.textsources.link(url))
inline fun EntitiesBuilder.link(url: String) = add(dev.inmo.tgbotapi.types.message.textsources.linkTextSource(url))
/**
* Version of [EntitiesBuilder.link] with new line at the end
*/
@ -606,18 +606,18 @@ inline fun EntitiesBuilder.linkln(url: String) = link(url) + newLine
/**
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
*/
inline fun EntitiesBuilder.underline(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.underline(parts))
inline fun EntitiesBuilder.underline(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(parts))
/**
* Version of [EntitiesBuilder.underline] with new line at the end
*/
inline fun EntitiesBuilder.underlineln(parts: TextSourcesList) = underline(parts) + newLine
/**
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline].
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.underline(
inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(
buildEntities(separator, init)
))
/**
@ -626,17 +626,17 @@ inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(d
*/
inline fun EntitiesBuilder.underlineln(noinline init: EntitiesBuilderBody) = underline(init) + newLine
/**
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
*/
inline fun EntitiesBuilder.underline(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.underline(*parts))
inline fun EntitiesBuilder.underline(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(*parts))
/**
* Version of [EntitiesBuilder.underline] with new line at the end
*/
inline fun EntitiesBuilder.underlineln(vararg parts: TextSource) = underline(*parts) + newLine
/**
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
* Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
*/
inline fun EntitiesBuilder.underline(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.underline(text))
inline fun EntitiesBuilder.underline(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(text))
/**
* Version of [EntitiesBuilder.underline] with new line at the end
*/
@ -644,35 +644,35 @@ inline fun EntitiesBuilder.underlineln(text: String) = underline(text) + newLine
/**
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
*/
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, parts))
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, parts))
/**
* Version of [EntitiesBuilder.customEmoji] with new line at the end
*/
inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, parts: TextSourcesList) = customEmoji(customEmojiId, parts) + newLine
/**
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji].
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource].
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, buildEntities(separator, init)))
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, buildEntities(separator, init)))
/**
* Version of [EntitiesBuilder.customEmoji] with new line at the end.
* Will reuse separator config from [buildEntities]
*/
inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = customEmoji(customEmojiId, init) + newLine
/**
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
*/
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, *parts))
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, *parts))
/**
* Version of [EntitiesBuilder.customEmoji] with new line at the end
*/
inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, vararg parts: TextSource) = customEmoji(customEmojiId, *parts) + newLine
/**
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
* Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
*/
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, text: String) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, text))
inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, text: String) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, text))
/**
* Version of [EntitiesBuilder.customEmoji] with new line at the end
*/

View File

@ -39,24 +39,24 @@ class StringFormattingTests {
@Test
fun testThatCreatingOfStringWithSimpleDSLWorksCorrectly() {
val sources: TextSourcesList = regular("It (is?) ") +
bold(italic("is") +
val sources: TextSourcesList = regularTextSource("It (is?) ") +
boldTextSource(italicTextSource("is") +
" " +
strikethrough(underline("simple"))) +
strikethroughTextSource(underlineTextSource("simple"))) +
" " +
spoiler("hello world") +
spoilerTextSource("hello world") +
" with " +
hashtag("tag@sample") +
hashtagTextSource("tag@sample") +
" and " +
mention("mention") +
mentionTextSource("mention") +
". Start of blockquote: " +
blockquote(
blockquoteTextSource(
"Block quotation started\n" +
"Block quotation continued\n" +
"The last line of the block quotation"
) +
"\n. Start of expandable blockquote: " +
expandableBlockquote(
expandableBlockquoteTextSource(
"Block quotation started\n" +
"Block quotation continued\n" +
"The last line of the block quotation"

View File

@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.utils.formatting
import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.chat.*
import dev.inmo.tgbotapi.types.message.abstracts.Message
import dev.inmo.tgbotapi.types.message.textsources.link
import dev.inmo.tgbotapi.types.message.textsources.linkTextSource
import io.ktor.http.encodeURLQueryComponent
@ -115,4 +115,4 @@ val Chat.chatLink: String?
private const val stickerSetAddingLinkPrefix = "$internalLinkBeginning/addstickers"
val StickerSetName.stickerSetLink
get() = link(string, "$stickerSetAddingLinkPrefix/$this")
get() = linkTextSource(string, "$stickerSetAddingLinkPrefix/$this")