Merge branch 'main'

.drone.yml

@@ -16,7 +16,10 @@ steps:
       from_secret: docker_pw
 
     repo: mollre/journal-bot
-    tags: 1.0.${DRONE_BUILD_NUMBER}
+    tags: 
+      - 1.0.${DRONE_BUILD_NUMBER}
+      - latest
+    build_args: "BOT_VERSION=1.0.${DRONE_BUILD_NUMBER}"
 
 
 trigger:

bot/commands/status.py

@@ -4,7 +4,7 @@ import socket
 from telegram.ext import ConversationHandler, CommandHandler, CallbackQueryHandler
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.constants import ParseMode
-
+import os
 
 
 FIRST = 1
@@ -37,7 +37,7 @@ class StatusHandler(BaseHandler):
         reply_markup = InlineKeyboardMarkup(keyboard)
 
         delta = str(datetime.datetime.now() - self.start_time)
-        message = "BeebBop, this is Norbit\n"
+        message = "BeebBop, this is Norbit...\n"
 
         try:
             ip = httpx.get('https://api.ipify.org').text
@@ -50,6 +50,7 @@ class StatusHandler(BaseHandler):
             local_ips = "not fetchable"
 
         message += "Status: Running 🟢\n"
+        message += f"Version: `{os.getenv('BOT_VERSION', 'dev')}`\n"
         message += f"Uptime: `{delta[:delta.rfind('.')]}`\n"
         message += f"IP \(public\): `{ip}`\n"
         message += f"IP \(private\): `{local_ips}`\n"