Update Dockerfile

remove libssl1.1 as it no longer ships in debian

.drone.yml

@@ -1,6 +1,5 @@
 kind: pipeline
-type: kubernetes
+name: leetbot
-name: default
 
 clone:
   skip_verify: true
@@ -19,3 +18,4 @@ steps:
       insecure: true
       dockerfile: Dockerfile
       tags: latest
+      cache_from: registry.local/northcode/leetbot

Dockerfile

@@ -1,7 +1,7 @@
 FROM debian
 
 RUN apt update
-RUN apt install -y libssl1.1 openssl ca-certificates
+RUN apt install -y openssl ca-certificates
 
 ADD target/release/telegram-leetbot /bin/.
 

chart/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

chart/templates/deployment.yml

@@ -19,7 +19,7 @@ spec:
           name: leetbot
           envFrom:
             - secretRef:
-                name: {{ .Release.Name }}-token
+                name: {{ .Values.app.secret_name }}
             - configMapRef:
                 name: {{ .Release.Name }}-cm
           {{- if .Values.storage.enabled }}

chart/templates/secret.yml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Release.Name }}-token
-data:
-  TELEGRAM_BOT_TOKEN: {{ .Values.app.token | b64enc }}
-  DB_URL: {{ .Values.app.db | b64enc }}

chart/values.yaml

@@ -2,8 +2,7 @@ image:
   repository: registry.local/northcode/leetbot
 
 app:
-  token: blabla
+  secret_name: leetbot-token
-  db: sqlite:leet.db
   tz: Europe/Oslo
 
 storage:

src/lib.rs

@@ -1,17 +1,17 @@
-use chrono::{Local, NaiveTime};
+use chrono::NaiveTime;
-
 
+#[must_use]
 pub fn text_is_leet(text: &str) -> bool {
     text.eq_ignore_ascii_case("leet") || text == "l33t" || text == "1337"
 }
 
-pub fn time_is_leet() -> bool {
+#[must_use]
-    let now = Local::now().time();
+pub fn time_is_leet(time: NaiveTime) -> bool {
     let leet = NaiveTime::from_hms(13,37,30);
 
     let allowed_timegap = 30;
 
-    let distance = now - leet;
+    let distance = time - leet;
 
     distance.num_seconds().abs() <= allowed_timegap
 }

src/main.rs

@@ -1,7 +1,7 @@
 mod lib;
-use crate::lib::*;
+use crate::lib::{text_is_leet, time_is_leet};
 
-use chrono::{NaiveDateTime, Local};
+use chrono::{NaiveDateTime, NaiveTime, Local};
 use sqlx::AnyPool;
 use sqlx::any::AnyPoolOptions;
 use teloxide::{prelude::*, RequestError, dispatching::UpdateFilterExt, utils::command::BotCommands};
@@ -48,22 +48,20 @@ enum LeetError {
     DbError(#[from] sqlx::Error)
 }
 
-async fn check_leet(username: &str, pool: &AnyPool) -> Result<(), LeetError> {
+async fn check_leet(username: &str, sent_time: NaiveDateTime, pool: &AnyPool) -> Result<(), LeetError> {
-    if ! time_is_leet() {
+    if ! time_is_leet(sent_time.time()) {
 	return Err(LeetError::NotLeet);
     }
 
-    let now = Local::now().naive_local();
-
     let latest_leet : Option<(i32, String, NaiveDateTime)> = sqlx::query_as("select * from leet_log where username = $1 order by log_time desc")
         .bind(username)
         .fetch_optional(pool)
         .await?;
 
     if let Some(latest_leet) = latest_leet {
-	let distance = now - latest_leet.2;
+	let distance = sent_time - latest_leet.2;
 
-	if distance.num_hours() < 24 {
+	if distance.num_hours() < 1 {
 	    return Err(LeetError::AlreadyHitLeet);
 	}
     }
@@ -71,16 +69,10 @@ async fn check_leet(username: &str, pool: &AnyPool) -> Result<(), LeetError> {
     Ok(())
 }
 
-async fn log_leet(username: &str, pool: &AnyPool) -> Result<(), sqlx::Error> {
+async fn log_leet(username: &str, sent_time: NaiveDateTime, pool: &AnyPool) -> Result<(), sqlx::Error> {
-    let sql_now = match pool.any_kind() {
+    sqlx::query("insert into leet_log (username, log_time) values ($1, $2)")
-        sqlx::any::AnyKind::Postgres => "now()",
-        sqlx::any::AnyKind::Sqlite => "datetime()"
-    };
-
-    let query_sql = format!("insert into leet_log (username, log_time) values ($1, {})", sql_now);
-    
-    sqlx::query(&query_sql)
         .bind(username)
+        .bind(sent_time)
         .execute(pool)
         .await?;
 
@@ -107,7 +99,11 @@ fn message_ok() -> Result<(), MessageHandlerError> {
 #[command(rename = "lowercase", description = "score commands")]
 enum LeetCommand {
     #[command(description = "get scores")]
-    Scores
+    Scores,
+    #[command(description = "get current time info")]
+    Time,
+    #[command(description = "show help about leetbot")]
+    Help
 }
 
 #[derive(Error,Debug)]
@@ -140,7 +136,11 @@ async fn leet_message_handler(message: Message, bot: AutoSend<Bot>, pool: AnyPoo
 	.username.clone()
 	.ok_or(MessageHandlerError::NoUsername)?;
 
-    let leet_check = check_leet(&username, &pool).await;
+    let message_sent_time = message.date
+		.with_timezone(&Local)
+		.naive_local();
+
+    let leet_check = check_leet(&username, message_sent_time, &pool).await;
 
     if let Err(e) = leet_check {
 	match e {
@@ -154,7 +154,7 @@ async fn leet_message_handler(message: Message, bot: AutoSend<Bot>, pool: AnyPoo
 	return message_ok();
     }
 
-    log_leet(&username, &pool).await?;
+    log_leet(&username, message_sent_time, &pool).await?;
 
     let scores = get_scores(&pool).await?;
 
@@ -178,6 +178,28 @@ async fn leet_command_handler(message: Message, cmd: LeetCommand, bot: AutoSend<
 	    let msg = format!("Leet scores:\n{}", scores_str);
 
 	    bot.send_message(message.chat.id, msg).await?;
+	},
+        LeetCommand::Time => {
+	    let message_time = message.date
+		.with_timezone(&Local)
+		.naive_local();
+	    let current_time = Local::now().time();
+	    let leet_time = NaiveTime::from_hms(13,37,30);
+	    let distance_to_leet = leet_time - current_time;
+
+	    let msg = format!("My current time is: {}
+message was sent at: {}
+leet is at: {}, in {} seconds",
+			      current_time,
+			      message_time,
+			      leet_time,
+			      distance_to_leet.num_seconds()
+	    );
+
+	    bot.send_message(message.chat.id, msg).await?;
+	},
+        LeetCommand::Help => {
+	    bot.send_message(message.chat.id, LeetCommand::descriptions().to_string()).await?;
 	}
     }
 
@@ -212,8 +234,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     
     Dispatcher::builder(bot, handler)
         .dependencies(dptree::deps![db_pool])
-        .default_handler(|upd| async move {
+        .default_handler(|_upd| async move {
-	    println!("unhandled update: {:?}", upd);
 	})
         .error_handler(LoggingErrorHandler::with_custom_text("error during dispatch"))
         .enable_ctrlc_handler()