InsanusMokrassar
/
ConfigurableInlineTelegramBot
mirror of https://github.com/InsanusMokrassar/ConfigurableInlineTelegramBot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upupdate

This commit is contained in:
InsanusMokrassar 2022-04-10 22:14:56 +06:00
parent 00cee9bcec
commit 60ace19f50
10 changed files with 120 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -2,6 +2,6 @@
## 0.0.2 ## 0.0.2
* `Kotlin`: `1.4.30` -> `1.4.32` * `Kotlin`: `1.4.30` -> `1.6.10`
* `tgbotapi`: `0.32.5` -> `0.34.0` * `tgbotapi`: `0.32.5` -> `0.38.12`
* `ktor`: `1.5.2` -> `1.5.3` * `ktor`: `1.5.2` -> `1.6.8`

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM java:8 FROM adoptopenjdk/openjdk11
USER 1000 USER 1000

6
build.gradle
View File

@ -3,7 +3,6 @@ project.group = "com.insanusmokrassar"
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter()
mavenCentral() mavenCentral()
} }
@ -28,14 +27,13 @@ project.group = "$library_group"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter()
mavenCentral() mavenCentral()
maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://kotlin.bintray.com/kotlinx" }
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "dev.inmo:tgbotapi:$telegram_bot_api_version" implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
api "io.ktor:ktor-client-core:$ktor_version" api "io.ktor:ktor-client-core:$ktor_version"
@ -45,5 +43,5 @@ dependencies {
api "io.ktor:ktor-server-tomcat:$ktor_version" api "io.ktor:ktor-server-tomcat:$ktor_version"
// Use JUnit test framework // Use JUnit test framework
testImplementation 'junit:junit:4.13.1' testImplementation 'junit:junit:4.13.2'
} }

49
example.config.json
View File

@ -1,15 +1,38 @@
{ {
"botToken": "bot token from @BotFather", "botConfig": {
"apiUrl": "(optional) can be used if you are using your bot server", "botToken": "bot token from @BotFather",
"clientConfig": { "apiUrl": "(optional) can be used if you are using your bot server",
"proxy": { "clientConfig": {
"host": "localhost", "proxy": {
"port": 1080, "host": "localhost",
"username": "optional", "port": 1080,
"password": "optional" "username": "optional",
}, "password": "optional"
"connectTimeout": "(optional) number, milliseconds", },
"writeTimeout": "(optional) number, milliseconds", "connectTimeout": "(optional) number, milliseconds",
"readTimeout": "(optional) number, milliseconds" "writeTimeout": "(optional) number, milliseconds",
"readTimeout": "(optional) number, milliseconds"
}
},
"templates": [
{
"title": "Some example",
"formats": [
{
"template": "Some message which will be sent after clicking on option and opportunity to use format options from java with splitting of incoming query by splitBy option",
"regexTemplate": "Some regex, by default it is ^$ which means empty string",
"splitBy": "Optional splitter, by default is null but the most regular case is to use \" \" to split query by spaces",
"enableMarkdownSupport": false,
"enableMarkdownSupport_description": "THAT IS NOT A FIELD. enableMarkdownSupport is a flat to use markdown 2 markup with template"
}
],
"description": "It is optional description of some example format"
}
],
"restrictions": {
"allowedUsers": [
],
"description": "THAT IS NOT A FIELD. allowedUsers is an optional field which contains list of users which may use this bot to call its inline queries"
} }
} }

2
gradle.properties
View File

@ -1,7 +1,7 @@
kotlin.code.style=official kotlin.code.style=official
kotlin_version=1.6.10 kotlin_version=1.6.10
telegram_bot_api_version=0.38.10 telegram_bot_api_version=0.38.12
ktor_version=1.6.8 ktor_version=1.6.8
library_version=0.0.2 library_version=0.0.2

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

120
publish.gradle
View File

@ -1,61 +1,72 @@
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'signing'
task javadocsJar(type: Jar) { task javadocJar(type: Jar) {
from javadoc
classifier = 'javadoc' classifier = 'javadoc'
} }
task sourcesJar(type: Jar) {
from sourceSets.main.allSource
classifier = 'sources'
}
publishing { publishing {
publications.all { publications {
artifact javadocsJar maven(MavenPublication) {
from components.java
pom { artifact javadocJar
description = "This library is fully ready to launch bot for working with presets of inline answers in Telegram via Bot API" artifact sourcesJar
name = "${project.name}"
url = "https://insanusmokrassar.github.io/${project.name}"
scm { pom {
developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/${project.name}[push=]https://github.com/InsanusMokrassar/${project.name}" resolveStrategy = Closure.DELEGATE_FIRST
url = "https://github.com/InsanusMokrassar/${project.name}"
}
developers { description = "This library is fully ready to launch bot for working with presets of inline answers in Telegram via Bot API"
name = "${project.name}"
developer { url = "https://insanusmokrassar.github.io/${project.name}"
id = "InsanusMokrassar"
name = "Ovsiannikov Aleksei"
email = "ovsyannikov.alexey95@gmail.com"
}
}
licenses { scm {
developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/${project.name}[push=]https://github.com/InsanusMokrassar/${project.name}"
license { url = "https://github.com/InsanusMokrassar/${project.name}"
name = "Apache Software License 2.0" }
url = "https://opensource.org/licenses/Apache-2.0"
} developers {
} developer {
} id = "InsanusMokrassar"
repositories { name = "Ovsiannikov Aleksei"
if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { email = "ovsyannikov.alexey95@gmail.com"
maven { }
name = "GithubPackages"
url = uri("https://maven.pkg.github.com/InsanusMokrassar/ConfigurableInlineTelegramBot") }
credentials {
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') licenses {
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
} license {
name = "Apache Software License 2.0"
url = "https://opensource.org/licenses/Apache-2.0"
}
} }
} }
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { repositories {
maven { if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
name = "sonatype" maven {
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") name = "GithubPackages"
credentials { url = uri("https://maven.pkg.github.com/InsanusMokrassar/ConfigurableInlineTelegramBot")
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') credentials {
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
}
}
}
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
maven {
name = "sonatype"
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
}
} }
} }
} }
@ -63,7 +74,18 @@ publishing {
} }
} }
signing { if (project.hasProperty("signing.gnupg.keyName")) {
useGpgCmd() apply plugin: 'signing'
sign publishing.publications
signing {
useGpgCmd()
sign publishing.publications
}
task signAll {
tasks.withType(Sign).forEach {
dependsOn(it)
}
}
} }

2
publish.kpsb
View File

@ -1 +1 @@
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://opensource.org/licenses/Apache-2.0"}],"mavenConfig":{"name":"${project.name}","description":"This library is fully ready to launch bot for working with presets of inline answers in Telegram via Bot API","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/InsanusMokrassar/${project.name}","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/ConfigurableInlineTelegramBot"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://opensource.org/licenses/Apache-2.0"}],"mavenConfig":{"name":"${project.name}","description":"This library is fully ready to launch bot for working with presets of inline answers in Telegram via Bot API","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/InsanusMokrassar/${project.name}","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/ConfigurableInlineTelegramBot"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}

4
src/main/kotlin/dev/inmo/configurable_inline_telegram_bot/FormatterBot.kt
View File

@ -54,8 +54,8 @@ data class FormatterBot(
val bot = botConfig.createBot() val bot = botConfig.createBot()
val filter = FlowsUpdatesFilter() val filter = FlowsUpdatesFilter()
bot.buildBehaviour( bot.buildBehaviour(
filter,
scope, scope,
filter
) { ) {
enableFormatterBot(templates, restrictions) enableFormatterBot(templates, restrictions)
} }
@ -74,4 +74,4 @@ data class FormatterBot(
} }
} }
} }
} }

4
src/main/kotlin/dev/inmo/configurable_inline_telegram_bot/config/Restrictions.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.configurable_inline_telegram_bot.config package dev.inmo.configurable_inline_telegram_bot.config
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@Serializable @Serializable
@ -11,4 +11,4 @@ data class Restrictions(
fun check(query: InlineQuery): Boolean { fun check(query: InlineQuery): Boolean {
return query.from.id in allowedUsers || query.from.username ?.let { it in allowedUsers } ?: false return query.from.id in allowedUsers || query.from.username ?.let { it in allowedUsers } ?: false
} }
} }