update docs

.github/workflows/build-deploy-mk-docs.yml

@@ -0,0 +1,33 @@
+name: Build and Deploy MkDocs
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install mkdocs mkdocs-material
+
+      - name: Build MkDocs site
+        run: mkdocs build --config-file mk-docs/mkdocs.yml
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4.1.2
+        with:
+          branch: gh-pages
+          folder: mk-docs/site
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -42,4 +42,7 @@ bin/
 .DS_Store
 
 .idea
-.kotlin
+.kotlin
+
+mk-docs/venv/
+mk-docs/.idea/

README.md

@@ -1,11 +1,8 @@
 <p align="center">
   <a href="https://github.com/danbeldev/alice-ktx/tree/master">
-    <img width="200px" height="200px" alt="alice-skill" src="/documentation/resources/alice_ktx.png">
+    <img width="200px" height="200px" alt="alice-skill" src="/mk-docs/docs/assets/alice-ktx.png">
   </a>
 </p>
-<h1 align="center">
-  Alice-ktx
-</h1>
 
 <div align="center">
 
@@ -37,7 +34,7 @@
 ```kotlin
 fun main() {
     skill {
-        webServer = ktorWebServer {
+        webhookServer = ktorWebhookServer {
             port = 8080
             path = "/alice"
         }
@@ -50,7 +47,7 @@ fun main() {
 
             message {
                 response {
-                    text = message.request.command.toString()
+                    text = messageText
                 }
             }
         }
@@ -59,7 +56,7 @@ fun main() {
 ```
 
 ## Документация
-- [Документация](documentation/)
+- [Документация](mk-docs/)
 - [Примеры](https://github.com/danbeldev/alice-ktx/tree/master/examples/src/main/kotlin/com/github/examples)
 
 

alice-ktx/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
     id("io.ktor.plugin")
-    id("org.jetbrains.dokka")
     id("com.vanniktech.maven.publish") version "0.28.0"
 }
 

alice-ktx/src/main/kotlin/com/github/alice/ktx/handlers/filters/Filter.kt

@@ -29,11 +29,9 @@ interface Filter {
         override fun ShouldRequestEnvironment.predicate(): Boolean = true
     }
 
-    class Text(private val text: String? = null): Filter {
+    class Text(private val text: String, private val ignoreCase: Boolean = true): Filter {
         override fun ShouldRequestEnvironment.predicate(): Boolean {
-            return text?.let {
-                message.request.originalUtterance?.contains(it, ignoreCase = true) == true
-            } ?: (message.request.originalUtterance != null)
+            return message.request.originalUtterance?.contains(text, ignoreCase = ignoreCase) == true
         }
     }
 

alice-ktx/src/main/kotlin/com/github/alice/ktx/handlers/impl/ButtonPressedHandler.kt

@@ -13,7 +13,7 @@ data class ButtonPressedShouldHandleEnvironment(
     private val requestEnvironment: ShouldRequestEnvironment
 ): ShouldRequestEnvironment by requestEnvironment {
 
-    val payload: Map<String, Any> = requestEnvironment.message.request.payload
+    val payload: Map<String, String> = requestEnvironment.message.request.payload
 }
 
 /**

alice-ktx/src/main/kotlin/com/github/alice/ktx/storage/models/StorageKey.kt

@@ -17,7 +17,7 @@ data class StorageKey(
         fun build(skillId: String?, message: MessageRequest, strategy: FSMStrategy): StorageKey {
             return StorageKey(
                 skillId = skillId,
-                userId = message.session.user?.userId,
+                userId = message.session.user?.userId ?: message.session.application.applicationId,
                 sessionId = message.session.sessionId,
                 applicationId = message.session.application.applicationId,
                 strategy = strategy