upupdate

CHANGELOG.md

@@ -2,6 +2,6 @@
 
 ## 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`

Dockerfile

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

build.gradle

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

example.config.json

@@ -1,4 +1,5 @@
 {
+  "botConfig": {
     "botToken": "bot token from @BotFather",
     "apiUrl": "(optional) can be used if you are using your bot server",
     "clientConfig": {
@@ -12,4 +13,26 @@
       "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"
+  }
 }

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 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

publish.gradle

@@ -1,15 +1,25 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
-task javadocsJar(type: Jar) {
+task javadocJar(type: Jar) {
+    from javadoc
     classifier = 'javadoc'
 }
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
 
 publishing {
-    publications.all {
+    publications {
-        artifact javadocsJar
+        maven(MavenPublication) {
+            from components.java
+
+            artifact javadocJar
+            artifact sourcesJar
 
             pom {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
                 description = "This library is fully ready to launch bot for working with presets of inline answers in Telegram via Bot API"
                 name = "${project.name}"
                 url = "https://insanusmokrassar.github.io/${project.name}"
@@ -62,8 +72,20 @@ publishing {
             }
         }
     }
+}
+
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
     
     signing {
         useGpgCmd()
+    
         sign publishing.publications
     }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}

publish.kpsb

@@ -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"}

src/main/kotlin/dev/inmo/configurable_inline_telegram_bot/FormatterBot.kt

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

src/main/kotlin/dev/inmo/configurable_inline_telegram_bot/config/Restrictions.kt

@@ -1,7 +1,7 @@
 package dev.inmo.configurable_inline_telegram_bot.config
 
 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
 
 @Serializable