From 3342e6081688d692e79122c78ad0edb7b6a04e17 Mon Sep 17 00:00:00 2001 From: Rripped Date: Tue, 15 Mar 2022 11:27:54 +0100 Subject: [PATCH] tested news api --- debugbot.py | 5 +++++ telegram_bot/bot.py | 1 - telegram_bot/news_fetcher.py | 16 ++++++++++++++-- telegram_bot/requirements.txt | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/debugbot.py b/debugbot.py index 79ed4ab..16a8fe0 100644 --- a/debugbot.py +++ b/debugbot.py @@ -8,6 +8,7 @@ import time import sys import logging from telebot import types +import telegram_bot.news_fetcher as news user_list = [] @@ -37,6 +38,10 @@ def send_start(message): def send_version(message): bot.reply_to(message, version) +@bot.message_handler(commands=['news']) +def send_news(message): + user_id = int(message.from_user.id) + bot.send_message(chat_id = user_id, text="news will be displayed here") @bot.message_handler(commands=['help']) # /help -> sending all functions def send_welcome(message): diff --git a/telegram_bot/bot.py b/telegram_bot/bot.py index 14d806b..5351566 100644 --- a/telegram_bot/bot.py +++ b/telegram_bot/bot.py @@ -50,7 +50,6 @@ def send_start(message): def send_version(message): bot.reply_to(message, bot_version) - @bot.message_handler(commands=['help']) # /help -> sending all functions def send_welcome(message): bot.reply_to(message, "/id or /auth for authentication. /update to get updates on your shares. /users to see all users. For further details see aktienbot.flokaiser.com") diff --git a/telegram_bot/news_fetcher.py b/telegram_bot/news_fetcher.py index e14b9f1..31357bd 100644 --- a/telegram_bot/news_fetcher.py +++ b/telegram_bot/news_fetcher.py @@ -8,9 +8,21 @@ __license__ = "None" import sys from newsapi import NewsApiClient -newsapi = NewsApiClient(api_key=api_key) from pandas.io.json import json_normalize import pandas as pd +# Init +newsapi = NewsApiClient(api_key='4261069558d64489a104ca40df8d2edc') + +# /v2/top-headlines +top_headlines = newsapi.get_top_headlines(q='bitcoin', sources='bbc-news,the-verge', language='en') + +# /v2/everything +all_articles = newsapi.get_everything(q='bitcoin', sources='bbc-news,the-verge', domains='bbc.co.uk,techcrunch.com', from_param='2022-03-14', to='2022-03-15', language='en', sort_by='relevancy', page=2) + +# /v2/top-headlines/sources +sources = newsapi.get_sources() + if __name__ == '__main__': - sys.exit(-1) \ No newline at end of file + print(top_headlines) + print(all_articles) \ No newline at end of file diff --git a/telegram_bot/requirements.txt b/telegram_bot/requirements.txt index 78ca72e..cfb433f 100644 --- a/telegram_bot/requirements.txt +++ b/telegram_bot/requirements.txt @@ -4,4 +4,4 @@ Markdown==3.3.6 Pillow==9.0.1 yfinance==0.1.70 newsapi-python -pandas +pandas~=1.4.1