From d2831634c99be2159c8553ca8e0d9317aa7d11fe Mon Sep 17 00:00:00 2001
From: Remy Moll <mollator2@gmail.com>
Date: Sat, 30 Jan 2021 10:29:45 +0100
Subject: [PATCH] Fixed parsing for a few commands
---
bot2/commands/status.py | 2 +-
bot2/commands/weather.py | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/bot2/commands/status.py b/bot2/commands/status.py
index 7833943..eabb83f 100644
--- a/bot2/commands/status.py
+++ b/bot2/commands/status.py
@@ -69,7 +69,7 @@ class Status(BotFunc):
tot_e = np.array(self.persistence["bot"]["execute_activity"]["count"]).sum()
message += "Commands executed `" + str(tot_e) + "`\n"
- update.message.reply_text(message, reply_markup=reply_markup)
+ update.message.reply_text(message, reply_markup=reply_markup, parse_mode=ParseMode.MARKDOWN)
return FIRST
diff --git a/bot2/commands/weather.py b/bot2/commands/weather.py
index c847a68..f36d90e 100644
--- a/bot2/commands/weather.py
+++ b/bot2/commands/weather.py
@@ -75,7 +75,8 @@ class Weather(BotFunc):
forecast_time = query.data.replace("time-","")
weather = self.get_weather(self.city, forecast_time)
query.edit_message_text(
- text = "Weather: \n" + weather
+ text = "Weather: \n\n" + weather,
+ parse_mode = ParseMode.HTML
)
return ConversationHandler.END
@@ -100,8 +101,10 @@ class Weather(BotFunc):
message += "🌡 ❄ " + str(tod["temps"][0]) + "° , 🌡 🔥 " + str(tod["temps"][1]) + "°\n\n"
if forecast_time == "tomorrow" or forecast_time == "7":
- tom = weather.pop(0)
- print(tom)
+ if forecast_time == "tomorrow": # previous statement was not executed: tomorrow is at weather[2]
+ tom = weather.pop(2)
+ else:
+ tom = weather.pop(0)
message += "<b>" + "Tomorrow" + ":</b> " + categories[tom["short"]] + "\n"
message += "🌡 ❄ " + str(tom["temps"][0]) + "° , 🌡 🔥 " + str(tom["temps"][1]) + "°\n\n"