mirror of
https://github.com/InsanusMokrassar/PlaguPoster.git
synced 2024-12-22 22:17:14 +00:00
add several supporting hints
This commit is contained in:
parent
8899fb299f
commit
2baaac8e6d
@ -43,15 +43,15 @@ object ButtonsBuilder {
|
|||||||
) = inlineKeyboard {
|
) = inlineKeyboard {
|
||||||
val unixMillis = dateTime.utc.unixMillisLong
|
val unixMillis = dateTime.utc.unixMillisLong
|
||||||
row {
|
row {
|
||||||
dataButton("Time:", changeTimeData)
|
dataButton("Time (hh:mm):", changeTimeData)
|
||||||
dataButton(dateTime.hours.toString(), "$changeHoursDataPrefix $postId $unixMillis")
|
dataButton(dateTime.hours.toString(), "$changeHoursDataPrefix $postId $unixMillis")
|
||||||
dataButton(dateTime.minutes.toString(), "$changeMinutesDataPrefix $postId $unixMillis")
|
dataButton(dateTime.minutes.toString(), "$changeMinutesDataPrefix $postId $unixMillis")
|
||||||
}
|
}
|
||||||
row {
|
row {
|
||||||
dataButton("Date:", changeDateData)
|
dataButton("Date (dd.mm.yyyy):", changeDateData)
|
||||||
dataButton(dateTime.dayOfMonth.toString(), "$changeDayDataPrefix $postId $unixMillis")
|
dataButton("${dateTime.dayOfMonth}", "$changeDayDataPrefix $postId $unixMillis")
|
||||||
dataButton(dateTime.month1.toString(), "$changeMonthDataPrefix $postId $unixMillis")
|
dataButton("${dateTime.month1}", "$changeMonthDataPrefix $postId $unixMillis")
|
||||||
dataButton(dateTime.yearInt.toString(), "$changeYearDataPrefix $postId $unixMillis")
|
dataButton("${dateTime.yearInt}", "$changeYearDataPrefix $postId $unixMillis")
|
||||||
}
|
}
|
||||||
|
|
||||||
row {
|
row {
|
||||||
@ -96,6 +96,7 @@ object ButtonsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun buildStandardDataCallbackQuery(
|
suspend fun buildStandardDataCallbackQuery(
|
||||||
|
name: String,
|
||||||
prefix: String,
|
prefix: String,
|
||||||
possibleValues: (DateTimeTz) -> Iterable<Int>,
|
possibleValues: (DateTimeTz) -> Iterable<Int>,
|
||||||
dateTimeConverter: (Int, DateTimeTz) -> DateTimeTz
|
dateTimeConverter: (Int, DateTimeTz) -> DateTimeTz
|
||||||
@ -104,18 +105,24 @@ object ButtonsBuilder {
|
|||||||
onMessageDataCallbackQuery(Regex("$prefix .+")) {
|
onMessageDataCallbackQuery(Regex("$prefix .+")) {
|
||||||
val (_, rawPostId, rawDateTimeMillis) = it.data.split(" ")
|
val (_, rawPostId, rawDateTimeMillis) = it.data.split(" ")
|
||||||
val currentMillis = rawDateTimeMillis.toLongOrNull() ?: return@onMessageDataCallbackQuery
|
val currentMillis = rawDateTimeMillis.toLongOrNull() ?: return@onMessageDataCallbackQuery
|
||||||
val currentDateTime = DateTime(currentMillis).local
|
val currentDateTime = DateTime(currentMillis)
|
||||||
|
val currentDateTimeLocal = DateTime(currentMillis).local
|
||||||
|
val postId = PostId(rawPostId)
|
||||||
|
val previousTime = timersRepo.get(postId)
|
||||||
|
|
||||||
edit (
|
edit (
|
||||||
it.message,
|
it.message.withContentOrNull() ?: return@onMessageDataCallbackQuery,
|
||||||
replyMarkup = buildKeyboard(
|
replyMarkup = buildKeyboard(
|
||||||
setPrefix,
|
setPrefix,
|
||||||
PostId(rawPostId),
|
postId,
|
||||||
possibleValues(currentDateTime)
|
possibleValues(currentDateTimeLocal)
|
||||||
) {
|
) {
|
||||||
dateTimeConverter(it, currentDateTime)
|
dateTimeConverter(it, currentDateTimeLocal)
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
+buildTimerTextSources(currentDateTime, previousTime) + "\n"
|
||||||
|
+"You are about to edit $name"
|
||||||
}
|
}
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMessageDataCallbackQuery(Regex("$setPrefix .+")) {
|
onMessageDataCallbackQuery(Regex("$setPrefix .+")) {
|
||||||
@ -141,6 +148,7 @@ object ButtonsBuilder {
|
|||||||
fun DateTimeTz.dateEq(other: DateTimeTz) = yearInt == other.yearInt && month0 == other.month0 && dayOfMonth == other.dayOfMonth
|
fun DateTimeTz.dateEq(other: DateTimeTz) = yearInt == other.yearInt && month0 == other.month0 && dayOfMonth == other.dayOfMonth
|
||||||
|
|
||||||
buildStandardDataCallbackQuery(
|
buildStandardDataCallbackQuery(
|
||||||
|
"hour",
|
||||||
changeHoursDataPrefix,
|
changeHoursDataPrefix,
|
||||||
{
|
{
|
||||||
val now = nearestAvailableTimerTime().local
|
val now = nearestAvailableTimerTime().local
|
||||||
@ -159,6 +167,7 @@ object ButtonsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildStandardDataCallbackQuery(
|
buildStandardDataCallbackQuery(
|
||||||
|
"minute",
|
||||||
changeMinutesDataPrefix,
|
changeMinutesDataPrefix,
|
||||||
{
|
{
|
||||||
val now = nearestAvailableTimerTime().local
|
val now = nearestAvailableTimerTime().local
|
||||||
@ -177,6 +186,7 @@ object ButtonsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildStandardDataCallbackQuery(
|
buildStandardDataCallbackQuery(
|
||||||
|
"day",
|
||||||
changeDayDataPrefix,
|
changeDayDataPrefix,
|
||||||
{
|
{
|
||||||
val now = nearestAvailableTimerTime().local
|
val now = nearestAvailableTimerTime().local
|
||||||
@ -195,6 +205,7 @@ object ButtonsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildStandardDataCallbackQuery(
|
buildStandardDataCallbackQuery(
|
||||||
|
"month",
|
||||||
changeMonthDataPrefix,
|
changeMonthDataPrefix,
|
||||||
{
|
{
|
||||||
val now = nearestAvailableTimerTime().local
|
val now = nearestAvailableTimerTime().local
|
||||||
@ -213,6 +224,7 @@ object ButtonsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildStandardDataCallbackQuery(
|
buildStandardDataCallbackQuery(
|
||||||
|
"year",
|
||||||
changeYearDataPrefix,
|
changeYearDataPrefix,
|
||||||
{
|
{
|
||||||
val now = nearestAvailableTimerTime().local
|
val now = nearestAvailableTimerTime().local
|
||||||
|
Loading…
Reference in New Issue
Block a user