JuliusFreudenberger/telegram-bot
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug where subscription job did not query weather

Browse source 
Also added city name in response
This commit is contained in:
JuliusFreudenberger 2020-09-25 16:24:22 +02:00
parent 5e598f3e4f
commit fbb2c65fd0
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
push_information.py
View file

@ -95,10 +95,15 @@ def schedule_subscriptions():
schedule.default_scheduler.clear() schedule.default_scheduler.clear()
for user in users.values(): for user in users.values():
for sub in user.subs: for sub in user.subs:
sub.city.query_weather() schedule.default_scheduler.every().day.at(time.strftime("%H:%M", sub.time)).do(handle_subscription,
schedule.default_scheduler.every().day.at(time.strftime("%H:%M", sub.time)).do( chat_id=user.chat_id,
send_message, chat_id=user.chat_id, message=str(sub.city.weather)) sub=sub)
sub.city.weather.clear()
def handle_subscription(chat_id: int, sub: Subscription):
sub.city.query_weather()
send_message(chat_id=chat_id, message=sub.city.get_weather_str())
sub.city.weather.clear()
def push_callback(update: Update, context: CallbackContext): def push_callback(update: Update, context: CallbackContext):

5
weather_openweathermap.py
View file

@ -168,6 +168,9 @@ class City:
def print_weather(self): def print_weather(self):
print(self.weather) print(self.weather)
def get_weather_str(self) -> str:
return f"Weather for *{self.name}*:\n" + str(self.weather)
def get_city_by_name(city_name: str) -> City: def get_city_by_name(city_name: str) -> City:
with open("city.list.json", "r") as city_list_file: with open("city.list.json", "r") as city_list_file:
@ -218,6 +221,6 @@ def handle_weather(update, context):
if requested_city.name == "none": if requested_city.name == "none":
raise WeatherStationNotFoundError raise WeatherStationNotFoundError
requested_city.query_weather() requested_city.query_weather()
update.message.reply_text(str(requested_city.weather), disable_notification=True, parse_mode=ParseMode.MARKDOWN) update.message.reply_text(requested_city.get_weather_str(), disable_notification=True, parse_mode=ParseMode.MARKDOWN)
requested_city.weather.clear() requested_city.weather.clear()