pischule/memevizor
1
0
Fork 0
mirror of https://github.com/pischule/memevizor.git synced 2025-12-19 06:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiple approvers

Browse Source
This commit is contained in:
Maksim Pischulenok
2025-06-17 22:08:13 +03:00
parent 453b9d03ab
commit 33888c5008
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/com/pischule/memevizor/bot/BotConfiguration.kt
View File

@@ -3,9 +3,12 @@ package com.pischule.memevizor.bot
import com.github.kotlintelegrambot.Bot
import com.github.kotlintelegrambot.bot
import com.github.kotlintelegrambot.dispatch
import com.github.kotlintelegrambot.dispatcher.command
import com.github.kotlintelegrambot.dispatcher.message
import com.github.kotlintelegrambot.dispatcher.photos
import com.github.kotlintelegrambot.entities.ChatId
import com.github.kotlintelegrambot.entities.Message
import com.github.kotlintelegrambot.entities.ParseMode
import com.pischule.memevizor.bot.handler.PhotoHandlerService
import com.pischule.memevizor.bot.handler.ThisCommandHandlerService
import com.pischule.memevizor.util.getMaxResPhotoId
@@ -52,6 +55,16 @@ class BotConfiguration(
}
}
}
command("whoami") {
withLoggingContext(messageContext(message)) {
bot.sendMessage(
chatId = ChatId.fromId(message.chat.id),
text = "chatId: `${message.chat.id}`\nuserId: `${message.from?.id}`",
parseMode = ParseMode.MARKDOWN_V2,
)
.onError { logger.warn { "Failed to reply to whoami command: $it" } }
}
}
}
private fun messageContext(message: Message): Map<String, String?> =

3
src/main/kotlin/com/pischule/memevizor/bot/BotProps.kt
View File

@@ -2,4 +2,5 @@ package com.pischule.memevizor.bot
import org.springframework.boot.context.properties.ConfigurationProperties
@ConfigurationProperties("bot") data class BotProps(val token: String, val destinationChatId: Long)
@ConfigurationProperties("bot")
data class BotProps(val token: String, val forwardChatId: Long, val approverUserIds: List<Long>)

4
src/main/kotlin/com/pischule/memevizor/bot/handler/PhotoHandlerService.kt
View File

@@ -22,13 +22,13 @@ class PhotoHandlerService(private val botProps: BotProps) {
}
private fun shouldForwardMessage(env: MediaHandlerEnvironment<List<PhotoSize>>): Boolean {
return env.message.chat.id != botProps.destinationChatId
return env.message.chat.id != botProps.forwardChatId
}
private suspend fun forwardPhotoMessage(env: MediaHandlerEnvironment<List<PhotoSize>>) {
env.bot
.forwardMessage(
chatId = ChatId.fromId(botProps.destinationChatId),
chatId = ChatId.fromId(botProps.forwardChatId),
fromChatId = ChatId.fromId(env.message.chat.id),
messageId = env.message.messageId,
)

4
src/main/kotlin/com/pischule/memevizor/bot/handler/ThisCommandHandlerService.kt
View File

@@ -35,11 +35,11 @@ class ThisCommandHandlerService(
}
private fun shouldHandleMessage(env: MessageHandlerEnvironment): Boolean {
val isFromTargetChat = env.message.chat.id == botProps.destinationChatId
val isApprover = env.message.from?.id?.let { botProps.approverUserIds.contains(it) } == true
val command = env.message.text?.lowercase()
val isConfirmCommand = command in confirmCommands
val hasPhotoReply = env.message.replyToMessage?.photo?.isNotEmpty() == true
return isFromTargetChat && isConfirmCommand && hasPhotoReply
return isApprover && isConfirmCommand && hasPhotoReply
}
private suspend fun reactToMessage(env: MessageHandlerEnvironment, emoji: String) {

3
src/main/resources/application-local.properties.dist
View File

@@ -1,2 +1,3 @@
bot.destination-chat-id=<destination chat id>
bot.forward-chat-id=<?>
bot.approver<?>
bot.token=<bot token>