InsanusMokrassar/PlaguPoster
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/PlaguPoster.git synced 2024-11-25 08:58:45 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
InsanusMokrassar 2022-09-09 20:38:06 +06:00
parent 23be7cac81
commit f411b757fd
9 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle/libs.versions.toml
View File

@ -34,7 +34,6 @@ android-test-junit = { module = "androidx.test.ext:junit", version.ref = "test_e
android-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso_core" }
tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
tgbotapi-admins = { module = "dev.inmo:tgbotapi.libraries.cache.admins.plagubot", version.ref = "tgbotapi-libraries" }
plagubot-plugin = { module = "dev.inmo:plagubot.plugin", version.ref = "plagubot" }
plagubot-bot = { module = "dev.inmo:plagubot.bot", version.ref = "plagubot" }
microutils-repos-common = { module = "dev.inmo:micro_utils.repos.common", version.ref = "microutils" }

1
inlines/build.gradle
View File

@ -11,7 +11,6 @@ kotlin {
commonMain {
dependencies {
api project(":plaguposter.common")
api libs.tgbotapi.admins
}
}
jvmMain {

32
inlines/src/jvmMain/kotlin/Plugin.kt
View File

@ -4,14 +4,16 @@ import dev.inmo.micro_utils.pagination.Pagination
import dev.inmo.micro_utils.pagination.utils.paginate
import dev.inmo.plagubot.Plugin
import dev.inmo.plaguposter.common.ChatConfig
import dev.inmo.plaguposter.inlines.models.Format
import dev.inmo.plaguposter.inlines.models.OfferTemplate
import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
import dev.inmo.tgbotapi.bot.exceptions.RequestException
import dev.inmo.tgbotapi.extensions.api.answers.answerInlineQuery
import dev.inmo.tgbotapi.extensions.api.send.reply
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onBaseInlineQuery
import dev.inmo.tgbotapi.libraries.cache.admins.AdminsCacheAPI
import dev.inmo.tgbotapi.libraries.cache.admins.adminsPlugin
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
import dev.inmo.tgbotapi.types.inlineQueryAnswerResultsLimit
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.*
@ -30,15 +32,10 @@ object Plugin : Plugin {
}
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
val adminsApi = koin.get<AdminsCacheAPI>()
val chatConfig = koin.get<ChatConfig>()
val templatesRepo = koin.get<InlineTemplatesRepo>()
onBaseInlineQuery { query ->
if (!adminsApi.isAdmin(chatConfig.sourceChatId, query.from.id)) {
answerInlineQuery(query, cachedTime = 0)
return@onBaseInlineQuery
}
val page = query.offset.toIntOrNull() ?: 0
val queryString = query.query.trim()
try {
answerInlineQuery(
query,
@ -50,7 +47,7 @@ object Plugin : Plugin {
).results.mapIndexedNotNull { index, offerTemplate ->
offerTemplate.createArticleResult(
index.toString(),
query.query
queryString
)
},
nextOffset = (page + 1).toString(),
@ -63,5 +60,22 @@ object Plugin : Plugin {
)
}
}
onCommand("help", requireOnlyCommandInMessage = true) {
reply(
it,
"Push the button above to see available commands",
replyMarkup = flatInlineKeyboard {
inlineQueryInCurrentChatButton("Toggle commands", "")
}
)
}
koin.getOrNull<InlineTemplatesRepo>() ?.apply {
addTemplate(
OfferTemplate(
"Trigger help button",
listOf(Format("/help"))
)
)
}
}
}

2
posts_registrar/src/jvmMain/kotlin/Plugin.kt
View File

@ -141,7 +141,7 @@ object Plugin : Plugin {
addTemplate(
OfferTemplate(
"Start post",
listOf(Format("start_post"))
listOf(Format("/start_post"))
)
)
}

2
ratings/selector/src/commonMain/kotlin/models/RatingConfig.kt
View File

@ -109,7 +109,7 @@ data class RatingConfig(
}
companion object {
val values = arrayOf(Max, Min, Random)
val values: Array<Prefer> = arrayOf(Max, Min, Random)
}
}
}

4
ratings/source/src/jvmMain/kotlin/Plugin.kt
View File

@ -197,14 +197,14 @@ object Plugin : Plugin {
addTemplate(
OfferTemplate(
"Enable ratings for post",
listOf(Format("attach_ratings")),
listOf(Format("/attach_ratings")),
"Require reply on post message"
)
)
addTemplate(
OfferTemplate(
"Disable ratings for post",
listOf(Format("detach_ratings")),
listOf(Format("/detach_ratings")),
"Require reply on post message"
)
)

1
runner/build.gradle
View File

@ -9,7 +9,6 @@ project.version = null
dependencies {
implementation libs.kotlin
api libs.plagubot.bot
api libs.tgbotapi.admins
api project(":plaguposter.posts")
api project(":plaguposter.posts_registrar")

4
runner/config.json
View File

@ -14,8 +14,8 @@
"dev.inmo.plaguposter.ratings.selector.Plugin",
"dev.inmo.plaguposter.triggers.selector_with_timer.Plugin",
"dev.inmo.plaguposter.ratings.gc.Plugin",
"dev.inmo.tgbotapi.libraries.cache.admins.AdminsPlugin",
"dev.inmo.plaguposter.inlines.Plugin"
"dev.inmo.plaguposter.inlines.Plugin",
"dev.inmo.plaguposter.triggers.command.Plugin"
],
"posts": {
"targetChat": 12345678,

12
triggers/command/src/jvmMain/kotlin/Plugin.kt
View File

@ -45,12 +45,18 @@ object Plugin : Plugin {
val selector = koin.getOrNull<Selector>()
onCommand("publish_post") {
val messageInReply = it.replyTo ?.contentMessageOrNull() ?: let { _ ->
val messageInReply = it.replyTo ?.contentMessageOrNull() ?: run {
if (selector == null) {
reply(it, "You should reply some message of post to trigger it for posting")
return@onCommand
} else {
null
}
val postId = postsRepo.getIdByChatAndMessage(messageInReply.chat.id, messageInReply.messageId) ?: selector ?.take(1) ?.firstOrNull()
}
val postId = messageInReply ?.let {
postsRepo.getIdByChatAndMessage(messageInReply.chat.id, messageInReply.messageId)
} ?: selector ?.take(1) ?.firstOrNull()
if (postId == null) {
reply(
it,
@ -72,7 +78,7 @@ object Plugin : Plugin {
addTemplate(
OfferTemplate(
"Publish post",
listOf(Format("publish_post")),
listOf(Format("/publish_post")),
if (selector == null) {
"Require reply on post message"
} else {