Skip to content

Commit 08906c9

Browse files
madheadmadhead
committed
WIP
1 parent 5de82c4 commit 08906c9

File tree

11 files changed

+28
-24
lines changed

11 files changed

+28
-24
lines changed

‎jep/src/main/kotlin/by/jprof/telegram/bot/jep/JEPUpdateProcessor.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import by.jprof.telegram.bot.votes.tgbotapi_extensions.toInlineKeyboardMarkup
77
import by.jprof.telegram.bot.votes.voting_processor.VotingProcessor
88
import dev.inmo.tgbotapi.bot.RequestsExecutor
99
import dev.inmo.tgbotapi.extensions.api.send.reply
10-
import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextLinkTextSource
11-
import dev.inmo.tgbotapi.types.MessageEntity.textsources.URLTextSource
12-
import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2ParseMode
10+
import dev.inmo.tgbotapi.types.message.MarkdownV2ParseMode
1311
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
1412
import dev.inmo.tgbotapi.types.message.abstracts.Message
1513
import dev.inmo.tgbotapi.types.message.content.TextContent
14+
import dev.inmo.tgbotapi.types.message.textsources.TextLinkTextSource
15+
import dev.inmo.tgbotapi.types.message.textsources.URLTextSource
1616
import dev.inmo.tgbotapi.types.update.CallbackQueryUpdate
1717
import dev.inmo.tgbotapi.types.update.MessageUpdate
1818
import dev.inmo.tgbotapi.types.update.abstracts.Update

‎pins/src/main/kotlin/by/jprof/telegram/bot/pins/PinCommandUpdateProcessor.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import dev.inmo.tgbotapi.bot.RequestsExecutor
2323
import dev.inmo.tgbotapi.extensions.api.chat.modify.pinChatMessage
2424
import dev.inmo.tgbotapi.extensions.api.send.payments.sendInvoice
2525
import dev.inmo.tgbotapi.extensions.api.send.reply
26-
import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
26+
import dev.inmo.tgbotapi.types.message.MarkdownV2ParseMode
2727
import dev.inmo.tgbotapi.types.payments.LabeledPrice
2828
import dev.inmo.tgbotapi.types.update.abstracts.Update
2929
import dev.inmo.tgbotapi.utils.PreviewFeature
@@ -56,39 +56,39 @@ class PinCommandUpdateProcessor(
5656
val duration = pin.duration
5757

5858
if (pin.message == null) {
59-
bot.reply(to = pin.request, text = help(pins), parseMode = MarkdownV2)
59+
bot.reply(to = pin.request, text = help(pins), parseMode = MarkdownV2ParseMode)
6060
pinsShop(pin)
6161

6262
return
6363
}
6464

6565
if (duration !is PinDuration.Recognized) {
66-
bot.reply(to = pin.request, text = unrecognizedDuration(), parseMode = MarkdownV2)
66+
bot.reply(to = pin.request, text = unrecognizedDuration(), parseMode = MarkdownV2ParseMode)
6767

6868
return
6969
}
7070

7171
if (duration.duration.isNegative || duration.duration.isZero) {
72-
bot.reply(to = pin.request, text = negativeDuration(), parseMode = MarkdownV2)
72+
bot.reply(to = pin.request, text = negativeDuration(), parseMode = MarkdownV2ParseMode)
7373

7474
return
7575
}
7676

7777
if (duration.duration > Duration.ofDays(90)) {
78-
bot.reply(to = pin.request, text = tooPositiveDuration(), parseMode = MarkdownV2)
78+
bot.reply(to = pin.request, text = tooPositiveDuration(), parseMode = MarkdownV2ParseMode)
7979

8080
return
8181
}
8282

8383
if (pins < pin.price) {
84-
bot.reply(to = pin.request, text = beggar(pins, pin.price), parseMode = MarkdownV2)
84+
bot.reply(to = pin.request, text = beggar(pins, pin.price), parseMode = MarkdownV2ParseMode)
8585
pinsShop(pin)
8686

8787
return
8888
}
8989

9090
if (pinDAO.findByChatId(pin.chat.id.chatId).size >= 5) {
91-
bot.reply(to = pin.request, text = tooManyPinnedMessages(), parseMode = MarkdownV2)
91+
bot.reply(to = pin.request, text = tooManyPinnedMessages(), parseMode = MarkdownV2ParseMode)
9292

9393
return
9494
}

‎pins/src/main/kotlin/by/jprof/telegram/bot/pins/model/PinRequest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package by.jprof.telegram.bot.pins.model
22

3-
import dev.inmo.tgbotapi.types.User
4-
import dev.inmo.tgbotapi.types.chat.abstracts.Chat
3+
import dev.inmo.tgbotapi.types.chat.Chat
4+
import dev.inmo.tgbotapi.types.chat.User
55
import dev.inmo.tgbotapi.types.message.abstracts.Message
66
import java.time.Duration
77
import kotlin.math.ceil

‎pins/src/main/kotlin/by/jprof/telegram/bot/pins/utils/PinRequestFinder.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import dev.inmo.tgbotapi.extensions.utils.asBotCommandTextSource
77
import dev.inmo.tgbotapi.extensions.utils.asContentMessage
88
import dev.inmo.tgbotapi.extensions.utils.asFromUser
99
import dev.inmo.tgbotapi.extensions.utils.asTextContent
10-
import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
1110
import dev.inmo.tgbotapi.types.message.abstracts.PossiblyReplyMessage
11+
import dev.inmo.tgbotapi.types.message.textsources.TextSource
1212
import dev.inmo.tgbotapi.types.update.abstracts.Update
1313
import dev.inmo.tgbotapi.utils.PreviewFeature
14-
import org.apache.logging.log4j.LogManager
1514
import java.time.Duration
1615
import java.time.temporal.ChronoUnit
16+
import org.apache.logging.log4j.LogManager
1717

1818
interface PinRequestFinder : (Update) -> PinRequest? {
1919
@PreviewFeature

‎quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiDoneCommandUpdateProcessor.kt

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ class QuizojiDoneCommandUpdateProcessor(
100100
)
101101
)
102102
}
103+
104+
else -> {}
103105
}
104106
}
105107

‎quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiOptionUpdateProcessor.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import dev.inmo.tgbotapi.extensions.api.send.sendMessage
88
import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
99
import dev.inmo.tgbotapi.extensions.utils.asPrivateChat
1010
import dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage
11-
import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
12-
import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
11+
import dev.inmo.tgbotapi.types.message.MarkdownV2
1312
import dev.inmo.tgbotapi.types.message.content.TextContent
13+
import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
1414
import dev.inmo.tgbotapi.types.update.abstracts.Update
1515
import dev.inmo.tgbotapi.utils.PreviewFeature
1616
import org.apache.logging.log4j.LogManager

‎quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiQuestionUpdateProcessor.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import dev.inmo.tgbotapi.extensions.api.send.sendMessage
99
import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
1010
import dev.inmo.tgbotapi.extensions.utils.asPrivateChat
1111
import dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage
12-
import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
13-
import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
12+
import dev.inmo.tgbotapi.types.message.MarkdownV2
13+
import dev.inmo.tgbotapi.types.message.content.MessageContent
1414
import dev.inmo.tgbotapi.types.message.content.TextContent
15-
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
15+
import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
1616
import dev.inmo.tgbotapi.types.update.abstracts.Update
1717
import dev.inmo.tgbotapi.utils.PreviewFeature
18-
import org.apache.logging.log4j.LogManager
1918
import kotlin.reflect.KClass
19+
import org.apache.logging.log4j.LogManager
2020

2121
@PreviewFeature
2222
class QuizojiQuestionUpdateProcessor(

‎quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/model/Quizoji.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package by.jprof.telegram.bot.quizoji.model
22

3-
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
3+
import dev.inmo.tgbotapi.types.message.content.MessageContent
44

55
data class Quizoji(
66
val id: String,

‎times/src/main/kotlin/by/jprof/telegram/bot/times/TimeCommandUpdateProcessor.kt

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import by.jprof.telegram.bot.times.timezones.dao.TimeZoneDAO
55
import by.jprof.telegram.bot.times.timezones.model.TimeZone
66
import by.jprof.telegram.bot.times.utils.mentionDateTime
77
import by.jprof.telegram.bot.times.utils.messageDateTime
8+
import dev.inmo.tgbotapi.abstracts.FromUser
89
import dev.inmo.tgbotapi.bot.RequestsExecutor
910
import dev.inmo.tgbotapi.extensions.api.send.reply
1011
import dev.inmo.tgbotapi.extensions.utils.asBaseMessageUpdate
@@ -13,6 +14,7 @@ import dev.inmo.tgbotapi.extensions.utils.asContentMessage
1314
import dev.inmo.tgbotapi.extensions.utils.asMentionTextSource
1415
import dev.inmo.tgbotapi.extensions.utils.asTextContent
1516
import dev.inmo.tgbotapi.extensions.utils.asTextMentionTextSource
17+
import dev.inmo.tgbotapi.types.message.MarkdownV2ParseMode
1618
import dev.inmo.tgbotapi.types.message.abstracts.Message
1719
import dev.inmo.tgbotapi.types.message.abstracts.PossiblyReplyMessage
1820
import dev.inmo.tgbotapi.types.message.content.TextContent

‎times/src/main/kotlin/by/jprof/telegram/bot/times/TimeZoneCommandUpdateProcessor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import by.jprof.telegram.bot.times.utils.unrecognizedValue
1111
import by.jprof.telegram.bot.times.utils.yourTimeZone
1212
import dev.inmo.tgbotapi.bot.RequestsExecutor
1313
import dev.inmo.tgbotapi.extensions.api.send.reply
14-
import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
14+
import dev.inmo.tgbotapi.types.message.MarkdownV2
1515
import dev.inmo.tgbotapi.types.update.abstracts.Update
1616
import dev.inmo.tgbotapi.utils.PreviewFeature
1717
import org.apache.logging.log4j.LogManager

‎times/src/main/kotlin/by/jprof/telegram/bot/times/model/TimeZoneRequest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package by.jprof.telegram.bot.times.model
22

3-
import dev.inmo.tgbotapi.types.User
4-
import dev.inmo.tgbotapi.types.chat.abstracts.Chat
3+
import dev.inmo.tgbotapi.types.chat.Chat
4+
import dev.inmo.tgbotapi.types.chat.User
55
import dev.inmo.tgbotapi.types.message.abstracts.Message
66

77
sealed interface TimeZoneValue {

0 commit comments

Comments
 (0)