Skip to content

Commit e3ce371

Browse files
ForteScarletForteScarlet
authored
Merge pull request #66 from simple-robot/dev/improve-token-prefix
Improve: When the ticket.token without a `bot` prefix, append one.
2 parents c497a12 + 5b6cd14 commit e3ce371

File tree

9 files changed

+44
-63
lines changed

9 files changed

+44
-63
lines changed

‎buildSrc/src/main/kotlin/K2Config.kt

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎simbot-component-telegram-api/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ plugins {
3434

3535
setup(P.ComponentTelegram)
3636

37-
useK2()
3837
configJavaCompileWithModule("simbot.component.telegram.api")
3938

4039
// configJsTestTasks()

‎simbot-component-telegram-api/supports.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
# Supported API List
22

3-
- [bot](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot)
4-
- [x] [CloseApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/CloseApi.kt)
5-
- [command](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command)
6-
- [x] [DeleteMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/DeleteMyCommandsApi.kt)
7-
- [x] [GetMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/GetMyCommandsApi.kt)
8-
- [x] [SetMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/SetMyCommandsApi.kt)
9-
- [x] [GetChatMenuButtonApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetChatMenuButtonApi.kt)
10-
- [x] [GetMeApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMeApi.kt)
11-
- [x] [GetMyDefaultAdministratorRightsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyDefaultAdministratorRightsApi.kt)
12-
- [x] [GetMyDescriptionApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyDescriptionApi.kt)
13-
- [x] [GetMyNameApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyNameApi.kt)
14-
- [x] [GetMyShortDescriptionApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyShortDescriptionApi.kt)
15-
- [x] [LogOutApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/LogOutApi.kt)
3+
- [update](src/commonMain/kotlin/love/forte/simbot/telegram/api/update)
4+
- [x] [GetWebhookInfoApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/GetWebhookInfoApi.kt)
5+
- [x] [SetWebhookApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/SetWebhookApi.kt)
6+
- [x] [DeleteWebhookApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/DeleteWebhookApi.kt)
7+
- [x] [GetUpdatesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/GetUpdatesApi.kt)
168
- [chat](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat)
17-
- [x] [GetChatAdministratorsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatAdministratorsApi.kt)
18-
- [x] [GetChatApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatApi.kt)
19-
- [x] [GetChatMemberApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatMemberApi.kt)
20-
- [x] [GetChatMemberCountApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatMemberCountApi.kt)
219
- [x] [GetForumTopicIconStickersApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetForumTopicIconStickersApi.kt)
10+
- [x] [GetChatMemberCountApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatMemberCountApi.kt)
11+
- [x] [GetChatApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatApi.kt)
12+
- [x] [GetChatAdministratorsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatAdministratorsApi.kt)
2213
- [x] [GetUserChatBoostsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetUserChatBoostsApi.kt)
14+
- [x] [GetChatMemberApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/chat/GetChatMemberApi.kt)
2315
- [internal](src/commonMain/kotlin/love/forte/simbot/telegram/api/internal)
2416
- [message](src/commonMain/kotlin/love/forte/simbot/telegram/api/message)
2517
- [x] [CopyMessageApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/CopyMessageApi.kt)
26-
- [x] [CopyMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/CopyMessagesApi.kt)
27-
- [x] [DeleteMessageApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/DeleteMessageApi.kt)
28-
- [x] [DeleteMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/DeleteMessagesApi.kt)
18+
- [x] [SendPhotoApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendPhotoApi.kt)
19+
- [x] [SendDocumentApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendDocumentApi.kt)
2920
- [x] [ForwardMessageApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/ForwardMessageApi.kt)
30-
- [x] [ForwardMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/ForwardMessagesApi.kt)
3121
- [x] [SendAudioApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendAudioApi.kt)
32-
- [x] [SendDocumentApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendDocumentApi.kt)
22+
- [x] [ForwardMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/ForwardMessagesApi.kt)
23+
- [x] [CopyMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/CopyMessagesApi.kt)
24+
- [x] [DeleteMessageApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/DeleteMessageApi.kt)
3325
- [x] [SendMessageApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendMessageApi.kt)
34-
- [x] [SendPhotoApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/SendPhotoApi.kt)
35-
- [x] [TelegramApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/TelegramApi.kt)
36-
- [update](src/commonMain/kotlin/love/forte/simbot/telegram/api/update)
37-
- [x] [DeleteWebhookApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/DeleteWebhookApi.kt)
38-
- [x] [GetUpdatesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/GetUpdatesApi.kt)
39-
- [x] [GetWebhookInfoApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/GetWebhookInfoApi.kt)
40-
- [x] [SetWebhookApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/update/SetWebhookApi.kt)
26+
- [x] [DeleteMessagesApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/message/DeleteMessagesApi.kt)
4127
- [user](src/commonMain/kotlin/love/forte/simbot/telegram/api/user)
4228
- [x] [GetUserProfilePhotosApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/user/GetUserProfilePhotosApi.kt)
29+
- [x] [TelegramApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/TelegramApi.kt)
30+
- [bot](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot)
31+
- [x] [GetChatMenuButtonApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetChatMenuButtonApi.kt)
32+
- [x] [GetMeApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMeApi.kt)
33+
- [x] [GetMyNameApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyNameApi.kt)
34+
- [x] [LogOutApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/LogOutApi.kt)
35+
- [x] [GetMyShortDescriptionApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyShortDescriptionApi.kt)
36+
- [x] [GetMyDefaultAdministratorRightsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyDefaultAdministratorRightsApi.kt)
37+
- [x] [GetMyDescriptionApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/GetMyDescriptionApi.kt)
38+
- [command](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command)
39+
- [x] [DeleteMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/DeleteMyCommandsApi.kt)
40+
- [x] [GetMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/GetMyCommandsApi.kt)
41+
- [x] [SetMyCommandsApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/command/SetMyCommandsApi.kt)
42+
- [x] [CloseApi](src/commonMain/kotlin/love/forte/simbot/telegram/api/bot/CloseApi.kt)
4343
- [ ] **Others not listed**

‎simbot-component-telegram-core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ plugins {
3232

3333
setup(P.ComponentTelegram)
3434

35-
useK2()
3635
configJavaCompileWithModule("simbot.component.telegram.core")
3736
apply(plugin = "simbot-telegram-multiplatform-maven-publish")
3837

‎simbot-component-telegram-stdlib/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
> [!caution]
44
> WIP, and this module will remove
55
6+
> [!caution]
7+
> This module may be deprecated, refactored, hidden or reorganised.
8+
69
## Setup
710

811
> [!note]

‎simbot-component-telegram-stdlib/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ plugins {
3232

3333
setup(P.ComponentTelegram)
3434

35-
useK2()
3635
configJavaCompileWithModule("simbot.component.telegram.stdlib")
3736
apply(plugin = "simbot-telegram-multiplatform-maven-publish")
3837

‎simbot-component-telegram-stdlib/src/commonMain/kotlin/love/forte/simbot/telegram/stdlib/bot/Bot.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ public interface Bot : CoroutineScope {
235235
/**
236236
* Bot ticket.
237237
*
238-
* @property token Bot full token. e.g.: `bot123456.aaabbbccc`
238+
* @property token Bot full token. e.g.: `bot123456.aaabbbccc`,
239+
* it should have a `"bot"` prefix.
239240
*/
240241
public data class Ticket(val token: String)
241242
}

‎simbot-component-telegram-stdlib/src/commonMain/kotlin/love/forte/simbot/telegram/stdlib/bot/internal/BotImpl.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import kotlin.time.Duration.Companion.seconds
5454
*/
5555
@OptIn(ExperimentalSimbotCollectionApi::class)
5656
internal class BotImpl(
57-
override val ticket: Bot.Ticket,
57+
ticket: Bot.Ticket,
5858
private val configuration: BotConfiguration,
5959
) : Bot {
6060
private val logger = LoggerFactory.getLogger("love.forte.simbot.telegram.stdlib.bot")
@@ -76,6 +76,15 @@ internal class BotImpl(
7676
this.apiClient = apiClient
7777
}
7878

79+
override val ticket: Bot.Ticket = with(ticket) {
80+
if (token.startsWith("bot")) {
81+
this
82+
} else {
83+
logger.debug("Append prefix 'bot' for ticket.token.")
84+
copy(token = "bot$token")
85+
}
86+
}
87+
7988
private inline fun resolveHttpClient(crossinline block: HttpClientConfig<*>.() -> Unit = {}): HttpClient {
8089
val apiClientConfigurer = configuration.apiClientConfigurer
8190

‎simbot-component-telegram-type/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ plugins {
2929

3030
setup(P.ComponentTelegram)
3131

32-
useK2()
3332
configJavaCompileWithModule("simbot.component.telegram.type")
3433
apply(plugin = "simbot-telegram-multiplatform-maven-publish")
3534

0 commit comments

Comments
 (0)