major refactor of functions

bot.py

@@ -3,11 +3,15 @@ import logging
 import os
 
 import telegram
-from functions import *
+from functions import Symbol
 from telegram.ext import CommandHandler, Filters, MessageHandler, Updater
 
-TELEGRAM_TOKEN = os.environ["TELEGRAM"]
+TELEGRAM_TOKEN = (
+    "724630968:AAHL_cpMgrw-B9zSbVlVe7iTYyo0XXL8fi4"  # os.environ["TELEGRAM"]
+)
+IEX_TOKEN = "sk_9e8d93b7cac84cd4b800f34d15b72ad6"  # os.environ["IEX"]
 
+s = Symbol(IEX_TOKEN)
 # Enable logging
 logging.basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
@@ -30,19 +34,19 @@ def help(bot, update):
     update.message.reply_text(text=message, parse_mode=telegram.ParseMode.MARKDOWN)
 
 
-def symbolDetect(bot, update):
+def symbol_detect(bot, update):
     """
     Runs on any message that doesn't have a command and searches for symbols, then returns the prices of any symbols found. 
     """
     message = update.message.text
     chat_id = update.message.chat_id
-    symbols = getSymbols(message)
+    symbols = s.find_symbols(message)
 
     if symbols:
         # Let user know bot is working
         bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
 
-        for reply in symbolDataReply(symbols).items():
+        for reply in s.price_reply(symbols).items():
 
             update.message.reply_text(
                 text=reply[1], parse_mode=telegram.ParseMode.MARKDOWN
@@ -55,12 +59,12 @@ def dividend(bot, update):
     """
     message = update.message.text
     chat_id = update.message.chat_id
-    symbols = getSymbols(message)
+    symbols = s.find_symbols(message)
 
     if symbols:
         bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
 
-        for reply in symbolDividend(symbols).items():
+        for reply in s.symbol_name(symbols).items():
 
             update.message.reply_text(
                 text=reply[1], parse_mode=telegram.ParseMode.MARKDOWN
@@ -73,12 +77,12 @@ def news(bot, update):
     """
     message = update.message.text
     chat_id = update.message.chat_id
-    symbols = getSymbols(message)
+    symbols = s.find_symbols(message)
 
     if symbols:
         bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
 
-        for reply in symbolNews(symbols).items():
+        for reply in s.news_reply(symbols).items():
 
             update.message.reply_text(
                 text=reply[1], parse_mode=telegram.ParseMode.MARKDOWN
@@ -91,12 +95,12 @@ def info(bot, update):
     """
     message = update.message.text
     chat_id = update.message.chat_id
-    symbols = getSymbols(message)
+    symbols = s.find_symbols(message)
 
     if symbols:
         bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
 
-        for reply in symbolInfo(symbols).items():
+        for reply in s.info_reply(symbols).items():
 
             update.message.reply_text(
                 text=reply[1], parse_mode=telegram.ParseMode.MARKDOWN
@@ -125,7 +129,7 @@ def main():
     dp.add_handler(CommandHandler("info", info))
 
     # on noncommand i.e message - echo the message on Telegram
-    dp.add_handler(MessageHandler(Filters.text, symbolDetect))
+    dp.add_handler(MessageHandler(Filters.text, symbol_detect))
 
     # log all errors
     dp.add_error_handler(error)

functions.py

@@ -6,26 +6,26 @@ from datetime import datetime
 import requests
 
 
+class Symbol:
+    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
 
-def getSymbols(text: str):
+    def __init__(self, IEX_TOKEN: str):
+        self.IEX_TOKEN = IEX_TOKEN
+
+    def find_symbols(self, text: str):
         """
         Takes a blob of text and returns a list of symbols without any repeats.
         """
 
-    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
+        return list(set(re.findall(self.SYMBOL_REGEX, text)))
 
-    return list(set(re.findall(SYMBOL_REGEX, text)))
+    def price_reply(self, symbols: list):
-
-
-def symbolDataReply(symbols: list):
         """
         Takes a list of symbols and returns a dictionary of strings with information about the symbol.
         """
         dataMessages = {}
         for symbol in symbols:
-        IEXurl = (
+            IEXurl = f"https://cloud.iexapis.com/stable/stock/{symbol}/quote?token={self.IEX_TOKEN}"
-            f"https://cloud.iexapis.com/stable/stock/{symbol}/quote?token={IEX_TOKEN}"
-        )
 
             response = requests.get(IEXurl)
             if response.status_code == 200:
@@ -47,12 +47,11 @@ def symbolDataReply(symbols: list):
 
         return dataMessages
 
-
+    def symbol_name(self, symbols: list):
-def symbolDividend(symbols: list):
         divMessages = {}
 
         for symbol in symbols:
-        IEXurl = f"https://cloud.iexapis.com/stable/data-points/{symbol}/NEXTDIVIDENDDATE?token={IEX_TOKEN}"
+            IEXurl = f"https://cloud.iexapis.com/stable/data-points/{symbol}/NEXTDIVIDENDDATE?token={self.IEX_TOKEN}"
             response = requests.get(IEXurl)
             if response.status_code == 200:
 
@@ -76,16 +75,17 @@ def symbolDividend(symbols: list):
                     divMessages[symbol] = f"{symbol.upper()} is today."
 
             else:
-            divMessages[symbol] = f"{symbol} either doesn't exist or pays no dividend."
+                divMessages[
+                    symbol
+                ] = f"{symbol} either doesn't exist or pays no dividend."
 
         return divMessages
 
-
+    def news_reply(self, symbols: list):
-def symbolNews(symbols: list):
         newsMessages = {}
 
         for symbol in symbols:
-        IEXurl = f"https://cloud.iexapis.com/stable/stock/{symbol}/news/last/3?token={IEX_TOKEN}"
+            IEXurl = f"https://cloud.iexapis.com/stable/stock/{symbol}/news/last/3?token={self.IEX_TOKEN}"
             response = requests.get(IEXurl)
             if response.status_code == 200:
                 data = response.json()
@@ -100,14 +100,11 @@ def symbolNews(symbols: list):
 
         return newsMessages
 
-
+    def info_reply(self, symbols: list):
-def symbolInfo(symbols: list):
         infoMessages = {}
 
         for symbol in symbols:
-        IEXurl = (
+            IEXurl = f"https://cloud.iexapis.com/stable/stock/{symbol}/company?token={self.IEX_TOKEN}"
-            f"https://cloud.iexapis.com/stable/stock/{symbol}/company?token={IEX_TOKEN}"
-        )
             response = requests.get(IEXurl)
 
             if response.status_code == 200: