1
0
mirror of https://gitlab.com/simple-stock-bots/simple-stock-bot.git synced 2025-06-16 15:17:28 +00:00

/news is now used and bot now says in chat if it cant find a ticker

This commit is contained in:
Anson 2019-02-04 14:37:05 -07:00
parent 10cd96236d
commit 7ad7d17e70
2 changed files with 81 additions and 47 deletions

View File

@ -33,7 +33,8 @@ def help(bot, update):
update.message.reply_text("I don't know how to help yet!") update.message.reply_text("I don't know how to help yet!")
def stockInfo(bot, update): def news(bot, update):
"""Send a message when the /news command is issued."""
message = update.message.text message = update.message.text
chat_id = update.message.chat_id chat_id = update.message.chat_id
@ -42,23 +43,32 @@ def stockInfo(bot, update):
tickers = re.findall("[$](\w{1,4})", message) tickers = re.findall("[$](\w{1,4})", message)
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING) bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
# Checks if !news is called, and prints news embed if it is if tickers == []:
if message.startswith("!news"): update.message.reply_text(
"Please type a ticker after your command: /news $tsla"
)
else:
tickerData = tickerInfo.tickerQuote(tickers) tickerData = tickerInfo.tickerQuote(tickers)
for ticker in tickers: for ticker in tickers:
ticker = ticker.upper() ticker = ticker.upper()
# bot.send_photo(bot.get_updates() if tickerData[ticker] == 1:
# [-1].message.chat_id, tickerData[ticker + 'Image'])
name = tickerData[ticker + "Name"] name = tickerData[ticker + "Name"]
price = tickerData[ticker + "Price"] price = tickerData[ticker + "Price"]
change = tickerData[ticker + "Change"] change = tickerData[ticker + "Change"]
message = ( message = (
"The current stock price of " + name + " is $**" + str(price) + "**" "The current stock price of "
+ name
+ " is $**"
+ str(price)
+ "**"
) )
if change > 0: if change > 0:
message = ( message = (
message + ", the stock is currently **up " + str(change) + "%**" message
+ ", the stock is currently **up "
+ str(change)
+ "%**"
) )
elif change < 0: elif change < 0:
message = ( message = (
@ -68,7 +78,9 @@ def stockInfo(bot, update):
+ "%**" + "%**"
) )
else: else:
message = message + ", the stock hasn't shown any movement today." message = (
message + ", the stock hasn't shown any movement today."
)
news = tickerInfo.stockNewsList(ticker) news = tickerInfo.stockNewsList(ticker)
for source in news: for source in news:
@ -77,11 +89,25 @@ def stockInfo(bot, update):
update.message.reply_text( update.message.reply_text(
text=message, parse_mode=telegram.ParseMode.MARKDOWN text=message, parse_mode=telegram.ParseMode.MARKDOWN
) )
else:
update.message.reply_text(ticker + " Does not exist.")
except:
pass
def stockInfo(bot, update):
message = update.message.text
chat_id = update.message.chat_id
try:
# regex to find tickers in messages, looks for up to 4 word characters following a dollar sign and captures the 4 word characters
tickers = re.findall("[$](\w{1,4})", message)
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
else: # If news isnt called, print normal stock price
tickerData = tickerInfo.tickerQuote(tickers) tickerData = tickerInfo.tickerQuote(tickers)
for ticker in tickers: for ticker in tickers:
ticker = ticker.upper() ticker = ticker.upper()
if tickerData[ticker] == 1:
name = tickerData[ticker + "Name"] name = tickerData[ticker + "Name"]
price = tickerData[ticker + "Price"] price = tickerData[ticker + "Price"]
change = tickerData[ticker + "Change"] change = tickerData[ticker + "Change"]
@ -104,6 +130,8 @@ def stockInfo(bot, update):
update.message.reply_text( update.message.reply_text(
text=message, parse_mode=telegram.ParseMode.MARKDOWN text=message, parse_mode=telegram.ParseMode.MARKDOWN
) )
else:
update.message.reply_text(ticker + " Does not exist.")
except: except:
pass pass
@ -124,6 +152,7 @@ def main():
# on different commands - answer in Telegram # on different commands - answer in Telegram
dp.add_handler(CommandHandler("start", start)) dp.add_handler(CommandHandler("start", start))
dp.add_handler(CommandHandler("help", help)) dp.add_handler(CommandHandler("help", help))
dp.add_handler(CommandHandler("news", news))
# on noncommand i.e message - echo the message on Telegram # on noncommand i.e message - echo the message on Telegram
dp.add_handler(MessageHandler(Filters.text, stockInfo)) dp.add_handler(MessageHandler(Filters.text, stockInfo))

View File

@ -15,13 +15,18 @@ def tickerQuote(tickers):
for ticker in tickers: for ticker in tickers:
ticker = ticker.upper() ticker = ticker.upper()
if ticker in IEXData:
stockData[ticker] = 1
stockData[ticker + "Name"] = IEXData[ticker]["quote"]["companyName"] stockData[ticker + "Name"] = IEXData[ticker]["quote"]["companyName"]
stockData[ticker + "Price"] = IEXData[ticker]["quote"]["latestPrice"] stockData[ticker + "Price"] = IEXData[ticker]["quote"]["latestPrice"]
stockData[ticker + "Change"] = round( stockData[ticker + "Change"] = round(
(IEXData[ticker]["quote"]["changePercent"] * 100), 2 (IEXData[ticker]["quote"]["changePercent"] * 100), 2
) )
stockData[ticker + "Image"] = stockLogo(ticker) stockData[ticker + "Image"] = stockLogo(ticker)
print("Quote Gathered") print(ticker + " Quote Gathered")
else:
stockData[ticker] = 0
print(stockData)
return stockData return stockData