Add k8s deploy example

.gitignore

@@ -7,3 +7,4 @@ memory.sqlite3
 /voice
 /.idea
 Cargo.lock
+k8s/k8s-deploy.yaml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "desubot"
-version = "0.5.5"
+version = "0.5.7"
 authors = ["AB <ab@hexor.ru>"]
 edition = "2018"
 
@@ -12,7 +12,8 @@ tokio = { version = "0.2", features = ["full"]}
 tracing = "0.1.9"
 tracing-futures = "0.2"
 multipart = { version = "0.16", default-features = false, features = ["client"] }
-telegram-bot = "0.8.0"
+#telegram-bot = "0.8.0"
+telegram-bot = { git = "https://github.com/ayrat555/telegram-bot", branch = "ayrat555/api-fixes-10" }
 silicon = "0.4.0"
 hyper = "0.13"
 hyper-tls = { version = "0.4", optional = true  }

Dockerfile

@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:1
+
+FROM rust:latest AS builder
+WORKDIR /desubot
+ADD ./ /desubot/
+RUN cargo build --release
+
+FROM ubuntu:latest
+WORKDIR /storage
+COPY --from=builder /desubot/target/release/desubot /usr/bin/
+COPY mystem /usr/bin/
+RUN apt update && apt install -y fontconfig openssl ca-certificates && rm -rf /var/lib/apt/lists/*
+ENTRYPOINT desubot
+

k8s/k8s-deploy-example.yaml

@@ -0,0 +1,43 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: desubot-api-token
+data:
+  token: 123.... # Base64 encoded token.
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: desubot
+spec:
+  serviceName: "desubot"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: desubot
+  template:
+    metadata:
+      labels:
+        app: desubot
+    spec:
+      containers:
+      - name: desubot
+        image: ultradesu/desubot:latest
+        volumeMounts:
+        - name: storage
+          mountPath: /storage
+        env:
+        - name: TELEGRAM_BOT_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: desubot-api-token
+              key: token
+  volumeClaimTemplates:
+  - metadata:
+      name: storage
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      resources:
+        requests:
+          storage: 50Gi

src/handlers.rs

@@ -53,7 +53,12 @@ pub async fn handler(
                         }
                     }
                 }
-                s if s.contains("/here") || s.contains("@here") => {
+                s if s.contains("/here")
+                    || s.contains("@here")
+                    || s.contains("/хере")
+                    || s.contains("@хере")
+                    || s.contains("\"хере") =>
+                {
                     db::add_sentence(&message, mystem).await?;
                     Here {
                         data: "".to_string(),

src/main.rs

@@ -1,4 +1,6 @@
+#![allow(unreachable_code)]
 use std::{env, process};
+use tokio::time::{delay_for, Duration};
 
 use futures::StreamExt;
 use telegram_bot::*;
@@ -16,7 +18,7 @@ use mystem::MyStem;
 
 #[tokio::main]
 async fn main() -> Result<(), errors::Error> {
-    env_logger::from_env(Env::default().default_filter_or("info")).init();
+    env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
     let mut mystem = match MyStem::new() {
         Ok(mystem) => mystem,
         Err(e) => {
@@ -44,12 +46,20 @@ async fn main() -> Result<(), errors::Error> {
         me.first_name,
         me.id
     );
+    loop {
         while let Some(update) = stream.next().await {
-        let update = update?;
-        if let UpdateKind::Message(message) = update.kind {
+            match update {
+                Ok(u) => {
+                    if let UpdateKind::Message(message) = u.kind {
                         db::add_conf(message.clone()).await?;
                         db::add_user(message.clone()).await?;
-            match handlers::handler(api.clone(), message, token.clone(), &mut mystem, me.clone())
+                        match handlers::handler(
+                            api.clone(),
+                            message,
+                            token.clone(),
+                            &mut mystem,
+                            me.clone(),
+                        )
                         .await
                         {
                             Ok(_) => {}
@@ -57,5 +67,12 @@ async fn main() -> Result<(), errors::Error> {
                         }
                     }
                 }
+                Err(e) => {
+                    warn!("Telegram API Error: {:?}", e);
+                }
+            };
+        }
+        delay_for(Duration::from_secs(2)).await;
+    }
     Ok(())
 }