DHBW/TelegramAktienBot
1
0
Fork 0
Code Issues 6 Pull Requests 26 Actions Packages Projects Releases Wiki Activity

more commenting and error correction in updater

Browse Source
This commit is contained in:
Linus E 2022-04-26 12:07:56 +02:00
parent 7672756426
commit 42a5ad4a12
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telegram_bot/bot.py
View File

@ -118,7 +118,7 @@ def send_all_users(message):
bot.send_message(chat_id=user_id, text=f'Username: {username}\nEmail: {email}\nID: {id}\nCron: {cron}\nAdmin: {admin}') # format user data into readable message text bot.send_message(chat_id=user_id, text=f'Username: {username}\nEmail: {email}\nID: {id}\nCron: {cron}\nAdmin: {admin}') # format user data into readable message text
@bot.message_handler(commands=['setAdmin', 'SetAdmin']) # set admin rights to user TBD: not working!! @bot.message_handler(commands=['setAdmin', 'SetAdmin', 'setadmin', 'Setadmin']) # set admin rights to user TBD: not working!!
def set_admin(message): def set_admin(message):
""" Set admin rights to user """ Set admin rights to user
@ -150,6 +150,7 @@ def set_admin_step(message):
email = args_message[0] email = args_message[0]
is_admin = args_message[1] is_admin = args_message[1]
status = api_handler.set_admin(email, is_admin) # set admin in db status = api_handler.set_admin(email, is_admin) # set admin in db
if(status == 200): if(status == 200):

22
telegram_bot/bot_updates.py
View File

@ -6,17 +6,18 @@ __date__ = "05.04.2022"
__version__ = "1.0.1" __version__ = "1.0.1"
__license__ = "None" __license__ = "None"
from calendar import month from asyncio.windows_events import NULL
from symtable import Symbol from calendar import month # unused, remove?
from symtable import Symbol # unused, remove?
from dotenv import load_dotenv from dotenv import load_dotenv
from shares.share_fetcher import get_share_price from shares.share_fetcher import get_share_price # unused, remove?
import news.news_fetcher as news_fetcher import news.news_fetcher as news_fetcher
import time import time
import datetime import datetime # unused, remove?
import os import os
from bot import bot from bot import bot
import sys import sys
from multiprocessing import Process from multiprocessing import Process # unused, remove?
from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.schedulers.background import BackgroundScheduler
from api_handling.api_handler import API_Handler from api_handling.api_handler import API_Handler
@ -153,8 +154,15 @@ def update_for_user(p_user_id, p_my_handler):
if(keywords): # if keywords exist and array is not empty if(keywords): # if keywords exist and array is not empty
send_to_user("If you haven't read yet: \nHere are some interesting news according to your keywords:", pUser_id=p_user_id) send_to_user("If you haven't read yet: \nHere are some interesting news according to your keywords:", pUser_id=p_user_id)
for keyword in keywords: for keyword in keywords:
news = news_fetcher.get_top_news_by_keyword(keyword)["articles"][0] # only use the most popular news news = news_fetcher.get_top_news_by_keyword(keyword)["articles"]
news_formatted = news_fetcher.format_article(news) # format for message
if not news: # if empty news array
send_to_user(f"No news found for keyword _{keyword}_.", pUser_id=p_user_id, md_mode=True)
if news == None: # if news is none
send_to_user(f"Server error for keyword _{keyword}_.", pUser_id=p_user_id, md_mode=True)
else:
news_formatted = news_fetcher.format_article(news[0]) # format for message, only use the most popular article
send_to_user(f"_keyword: {keyword}_\n\n{news_formatted}", pUser_id=p_user_id, md_mode=True) # send news with related keyword in Markdown send_to_user(f"_keyword: {keyword}_\n\n{news_formatted}", pUser_id=p_user_id, md_mode=True) # send news with related keyword in Markdown