make ruff happy

Resolve "inline functionality is broken"

Closes #99

See merge request simple-stock-bots/simple-telegram-stock-bot!48

.devcontainer/Dockerfile

@@ -1,20 +1,5 @@
-FROM python:3.11-buster AS builder
+FROM python:3.11
-
+
-
+COPY . .
-COPY requirements.txt /requirements.txt
+
-RUN pip install --user -r requirements.txt
+# RUN pip install -r requirements.txt
-
-
-FROM python:3.11-slim
-
-ENV MPLBACKEND=Agg
-
-COPY --from=builder /root/.local /root/.local
-
-RUN pip install --no-cache-dir black
-ENV TELEGRAM=TOKEN
-ENV IEX=TOKEN
-
-COPY . .
-
-# CMD [ "python", "./bot.py" ]

.devcontainer/devcontainer.json

@@ -1,26 +1,39 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/docker-existing-dockerfile
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
-{
+{
-	"name": "DockerDev",
+  "name": "Python 3",
-	// Sets the run context to one level up instead of the .devcontainer folder.
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"context": "..",
+  // "image": "mcr.microsoft.com/devcontainers/python:1-3-bookworm",
-	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+  "build": {
-	"dockerFile": "Dockerfile",
+    "dockerfile": "Dockerfile"
-	// Set *default* container specific settings.json values on container create.
+  },
-	"settings": {},
+  "features": {
-	// Add the IDs of extensions you want installed when the container is created.
+    "ghcr.io/devcontainers-contrib/features/black:2": {},
-	"extensions": [
+    "ghcr.io/devcontainers-contrib/features/mypy:2": {},
-		"ms-python.python",
+    "ghcr.io/devcontainers-contrib/features/pylint:2": {},
-		"ms-azuretools.vscode-docker"
+    "ghcr.io/devcontainers/features/docker-in-docker": {}
-	]
+  },
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "customizations": {
-	// "forwardPorts": [],
+    "vscode": {
-	// Uncomment the next line to run commands after the container is created - for example installing curl.
+      "extensions": [
-	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+		"ms-python.python",
-	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+		"ms-python.black-formatter",
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+		"ms-python.flake8",
-	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+		"ms-python.vscode-pylance",
-	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+		"ms-python.isort",
-	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+		"charliermarsh.ruff"
-	// "remoteUser": "vscode"
+	]
+    }
+  },
+  "postCreateCommand": "pip3 install --user -r dev-reqs.txt"
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "pip3 install --user -r requirements.txt",
+  // Configure tool-specific properties.
+  // "customizations": {},
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
 }

.gitignore

@@ -1 +1,2 @@
-__pycache__
+__pycache__
+.env

.gitlab-ci.yml

@@ -1,34 +1,21 @@
-black:
+stages:
-  stage: .pre
+  - lint
-  image: registry.gitlab.com/pipeline-components/black:latest
+  - deploy
-  script:
+
-    - black --check --verbose -- .
+black:
-
+  stage: lint
-
+  image: registry.gitlab.com/pipeline-components/black:latest
-build:master:
+  script:
-  stage: build
+    - black --check --verbose -- .
-  image:
+
-    name: gcr.io/kaniko-project/executor:v1.9.0-debug
+ruff:
-    entrypoint: [""]
+  stage: lint
-  script:
+  # image: registry.gitlab.com/pipeline-components/ruff:latest
-    - /kaniko/executor
+  image: python:3.11-slim
-      --context "${CI_PROJECT_DIR}"
+  script:
-      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+    - pip3 install ruff
-      --destination "${CI_REGISTRY_IMAGE}:latest"
+    - ruff --output-format gitlab .
-  rules:
+
-    - if: '$CI_COMMIT_BRANCH == "master"'
+
-
+include:
-
+  - local: /docs/.gitlab-ci.yml
-build:branch:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:v1.9.0-debug
-    entrypoint: [""]
-  script:
-    - /kaniko/executor
-      --context "${CI_PROJECT_DIR}"
-      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'

.vscode/launch.json

@@ -1,12 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Telegram Bot",
-            "type": "python",
-            "request": "launch",
-            "program": "bot.py",
-            "console": "integratedTerminal",
-            "python": "python3.11"
-        }
-    ]
-}

.vscode/settings.json

@@ -1,5 +1,8 @@
-{
+{
-    "python.formatting.provider": "black",
+    "editor.formatOnSave": true,
-    "python.linting.mypyEnabled": true,
+    "editor.formatOnPaste": true,
-    "python.linting.flake8Enabled": true,
+    "editor.formatOnSaveMode": "modificationsIfAvailable",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+    }
 }

LICENSE

@@ -1,21 +1,21 @@
-MIT License
+MIT License
-
+
-Copyright (c) 2019 Anson Biggs
+Copyright (c) 2019 Anson Biggs
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
+in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+furnished to do so, subject to the following conditions:
-
+
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Software.
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,32 +1,32 @@
-# Simple Telegram Stock Bot
+# Simple Telegram Stock Bot
-
+
-
+
-[![Platform](https://img.shields.io/badge/platform-Telegram-blue.svg)](https://t.me/SimpleStockBot)
+[![Platform](https://img.shields.io/badge/platform-Telegram-blue.svg)](https://t.me/SimpleStockBot)
-[![License](https://img.shields.io/badge/license-MIT-blue.svg)](/LICENSE)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](/LICENSE)
-[![Author](https://img.shields.io/badge/Maintainer-Anson-blue)](https://ansonbiggs.com)
+[![Author](https://img.shields.io/badge/Maintainer-Anson-blue)](https://ansonbiggs.com)
-
+
-## Docs
+## Docs
-
+
-https://docs.simplestockbot.com/
+https://docs.simplestockbot.com/
-
+
-## Usage
+## Usage
-
+
-https://docs.simplestockbot.com/commands/
+https://docs.simplestockbot.com/commands/
-
+
-## Donate
+## Donate
-
+
-Simple Stock Bot is run entirely on donations, and costs about $420 a year to run. All donations go directly towards paying for servers, and premium market data provided by [IEX Cloud](https://iexcloud.io/).
+Simple Stock Bot is run entirely on donations, and costs about $420 a year to run. All donations go directly towards paying for servers, and premium market data provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
-
+
-The best way to donate is through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) which accepts Paypal or Credit card.
+The best way to donate is through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) which accepts Paypal or Credit card.
-
+
-Alternatively, you can donate on Telegram with the `/donate` [command](commands.md#donate-amount-in-usd).
+Alternatively, you can donate on Telegram with the `/donate` [command](commands.md#donate-amount-in-usd).
-
+
-If you have any questions get in [touch.](contact.md)
+If you have any questions get in [touch.](contact.md)
-
+
-## Other Ways to Help:
+## Other Ways to Help:
-
+
-- Follow me on [twitter](https://twitter.com/AnsonBiggs)
+- Follow me on [twitter](https://twitter.com/AnsonBiggs)
-- Contribute to the project on [GitLab](https://gitlab.com/simple-stock-bots) or just leave a star
+- Contribute to the project on [GitLab](https://gitlab.com/simple-stock-bots) or just leave a star
-- Using my referral links to host your own Bot
+- Using my referral links to host your own Bot
-  - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
+  - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
-  - [IEX Cloud](https://iexcloud.io/s/62c8503e)
+  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)

T_info.py

@@ -1,73 +0,0 @@
-"""Functions and Info specific to the Telegram Bot
-"""
-
-import re
-
-import requests as r
-
-
-class T_info:
-    license = re.sub(
-        r"\b\n",
-        " ",
-        r.get("https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot/-/raw/master/LICENSE").text,
-    )
-
-    help_text = """
-Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
-
-Keep up with the latest news for the bot in its Telegram Channel: https://t.me/simplestockbotnews
-
-Full documentation on using and running your own stock bot can be found on the bots [docs.](https://docs.simplestockbot.com)
-
-The bot detects _"Symbols"_ using either one `$` or two `$$` dollar signs before the symbol. One dollar sign is for a stock market ticker, while two is for a cryptocurrency coin. `/chart $$eth` would return a chart of the past month of data for Ethereum, while `/dividend $psec` returns dividend information for Prospect Capital stock.
-
-Simply calling a symbol in any message that the bot can see will also return the price. So a message like: `I wonder if $$btc will go to the Moon now that $tsla accepts it as payment` would return the current price for both Bitcoin and Tesla. 
-
-**Commands**
-        - `/donate [amount in USD]` to donate. 🎗️
-        - `/dividend $[symbol]` Dividend information for the symbol. 📅
-        - `/intra $[symbol]` Plot of the stocks movement since the last market open.  📈
-        - `/chart $[symbol]` Plot of the stocks movement for the past 1 month. 📊
-        - `/news $[symbol]` News about the symbol. 📰
-        - `/info $[symbol]` General information about the symbol. ℹ️
-        - `/stat $[symbol]` Key statistics about the symbol. 🔢
-        - `/cap $[symbol]` Market Capitalization of symbol. 💰
-        - `/trending` Trending Stocks and Cryptos. 💬
-        - `/help` Get some help using the bot. 🆘
-
-**Inline Features**
-    You can type @SimpleStockBot `[search]` in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price. Then once you select the ticker want the bot will send a message as you in that chat with the latest stock price. Prices may be delayed by up to an hour.
-    
-    Market data is provided by [IEX Cloud](https://iexcloud.io)
-
-    If you believe the bot is not behaving properly run `/status` or [get in touch](https://docs.simplestockbot.com/contact).
-    """
-
-    donate_text = """
-Simple Stock Bot is run entirely on donations[.](https://www.buymeacoffee.com/Anson)
-All donations go directly towards paying for servers, and market data is provided by
-[IEX Cloud](https://iexcloud.io/).
-
-The easiest way to donate is to run the `/donate [amount in USD]` command with US dollars you would like to donate.
-
-Example: `/donate 2` would donate 2 USD.
-
-An alternative way to donate is through https://www.buymeacoffee.com/Anson which requires no account and accepts Paypal or Credit card.
-If you have any questions see the [website](https:docs.simplestockbot.com)
-
-    """
-
-
-commands = """
-donate - Donate to the bot 🎗️
-help - Get some help using the bot. 🆘
-info - $[symbol] General information about the symbol. ℹ️
-news - $[symbol] News about the symbol. 📰
-stat - $[symbol] Key statistics about the symbol. 🔢
-cap - $[symbol] Market Capitalization of symbol. 💰
-dividend - $[symbol] Dividend info 📅
-trending - Trending Stocks and Cryptos. 💬
-intra - $[symbol] Plot since the last market open. 📈
-chart - $[chart] Plot of the past month. 📊
-"""  # Not used by the bot but for updaing commands with BotFather

common/MarketData.py

@@ -1,223 +1,269 @@
-"""Class with functions for running the bot with IEX Cloud.
+import datetime as dt
-"""
+import logging
-
+import os
-import logging
+from typing import Dict
-import os
+
-import datetime as dt
+import pandas as pd
-from logging import warning
+import pytz
-from typing import Dict
+import requests as r
-
+import schedule
-import pandas as pd
+
-import requests as r
+from common.Symbol import Stock
-import schedule
+
-
+log = logging.getLogger(__name__)
-from Symbol import Stock
+
-
+
-
+class MarketData:
-class MarketData:
+    """
-    """
+    Functions for finding stock market information about symbols from MarkData.app
-    Functions for finding stock market information about symbols from MarkData.app
+    """
-    """
+
-
+    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
-    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
+
-
+    charts: Dict[Stock, pd.DataFrame] = {}
-    charts: Dict[Stock, pd.DataFrame] = {}
+
-
+    openTime = dt.time(hour=9, minute=30, second=0)
-    def __init__(self) -> None:
+    marketTimeZone = pytz.timezone("US/Eastern")
-        """Creates a Symbol Object
+
-
+    def __init__(self) -> None:
-        Parameters
+        """Creates a Symbol Object
-        ----------
+
-        MARKETDATA_TOKEN : str
+        Parameters
-            MarketData.app API Token
+        ----------
-        """
+        MARKETDATA_TOKEN : str
-        try:
+            MarketData.app API Token
-            self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
+        """
-
+
-            if self.MARKETDATA_TOKEN == "TOKEN":
+        try:
-                self.MARKETDATA_TOKEN = ""
+            self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
-        except KeyError:
+
-            self.MARKETDATA_TOKEN = ""
+            if self.MARKETDATA_TOKEN == "TOKEN":
-            warning("Starting without an MarketData.app Token will not allow you to get market data!")
+                self.MARKETDATA_TOKEN = ""
-
+        except KeyError:
-        if self.MARKETDATA_TOKEN != "":
+            self.MARKETDATA_TOKEN = ""
-            schedule.every().day.do(self.clear_charts)
+            log.warning("Starting without an MarketData.app Token will not allow you to get market data!")
-
+            log.warning("Use this affiliate link so that the bot can stay free:")
-    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
+            log.warning("https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo")
-        url = "https://api.marketdata.app/v1/" + endpoint
+
-
+        if self.MARKETDATA_TOKEN != "":
-        # set token param if it wasn't passed.
+            schedule.every().day.do(self.clear_charts)
-        params["token"] = params.get("token", self.MARKETDATA_TOKEN)
+
-
+    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
-        resp = r.get(url, params=params, timeout=timeout)
+        url = "https://api.marketdata.app/v1/" + endpoint
-
+
-        # Make sure API returned a proper status code
+        # set token param if it wasn't passed.
-        try:
+        params["token"] = self.MARKETDATA_TOKEN
-            resp.raise_for_status()
+
-        except r.exceptions.HTTPError as e:
+        # Undocumented query variable that ensures bot usage can be
-            logging.error(e)
+        # monitored even if someone doesn't make it through an affiliate link.
-            return {}
+        params["application"] = "simplestockbot"
-
+
-        # Make sure API returned valid JSON
+        resp = r.get(url, params=params, timeout=timeout)
-        try:
+
-            resp_json = resp.json()
+        # Make sure API returned a proper status code
-
+        try:
-            match resp_json["s"]:
+            resp.raise_for_status()
-                case "ok":
+        except r.exceptions.HTTPError as e:
-                    return resp_json
+            logging.error(e)
-                case "no_data":
+            return {}
-                    return resp_json
+
-                case "error":
+        # Make sure API returned valid JSON
-                    logging.error("MarketData Error:\n" + resp_json["errmsg"])
+        try:
-                    return {}
+            resp_json = resp.json()
-
+
-        except r.exceptions.JSONDecodeError as e:
+            match resp_json["s"]:
-            logging.error(e)
+                case "ok":
-
+                    return resp_json
-        return {}
+                case "no_data":
-
+                    return resp_json
-    def clear_charts(self) -> None:
+                case "error":
-        """
+                    logging.error("MarketData Error:\n" + resp_json["errmsg"])
-        Clears cache of chart data.
+                    return {}
-        Charts are cached so that only 1 API call per 24 hours is needed since the
+
-            chart data is expensive and a large download.
+        except r.exceptions.JSONDecodeError as e:
-        """
+            logging.error(e)
-        self.charts = {}
+
-
+        return {}
-    def status(self) -> str:
+
-        return "status isnt implemented by marketdata.app"
+    def clear_charts(self) -> None:
-
+        """
-    def price_reply(self, symbol: Stock) -> str:
+        Clears cache of chart data.
-        """Returns price movement of Stock for the last market day, or after hours.
+        Charts are cached so that only 1 API call per 24 hours is needed since the
-
+            chart data is expensive and a large download.
-        Parameters
+        """
-        ----------
+        self.charts = {}
-        symbol : Stock
+
-
+    def status(self) -> str:
-        Returns
+        # TODO: At the moment this API is poorly documented, this function likely needs to be revisited later.
-        -------
+
-        str
+        try:
-            Formatted markdown
+            status = r.get(
-        """
+                "https://stats.uptimerobot.com/api/getMonitorList/6Kv3zIow0A",
-
+                timeout=5,
-        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
+            )
-            price = round(quoteResp["last"][0], 2)
+            status.raise_for_status()
-            changePercent = round(quoteResp["changepct"][0], 2)
+        except r.HTTPError:
-
+            return f"API returned an HTTP error code {status.status_code} in {status.elapsed.total_seconds()} seconds."
-            message = f"The current price of {symbol.name} is ${price} and "
+        except r.Timeout:
-
+            return "API timed out before it was able to give status. This is likely due to a surge in usage or a complete outage."
-            if changePercent > 0.0:
+
-                message += f"is currently up {changePercent}% for the day."
+        statusJSON = status.json()
-            elif changePercent < 0.0:
+
-                message += f"is currently down {changePercent}% for the day."
+        if statusJSON["status"] == "ok":
-            else:
+            return (
-                message += "hasn't shown any movement for the day."
+                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} seconds."
-
+            )
-            return message
+        else:
-        else:
+            return f"MarketData.app is currently reporting the following status: {statusJSON['status']}"
-            return f"Getting a quote for {symbol} encountered an error."
+
-
+    def price_reply(self, symbol: Stock) -> str:
-    def intra_reply(self, symbol: Stock) -> pd.DataFrame:
+        """Returns price movement of Stock for the last market day, or after hours.
-        """Returns price data for a symbol of the past month up until the previous trading days close.
+
-        Also caches multiple requests made in the same day.
+        Parameters
-
+        ----------
-        Parameters
+        symbol : Stock
-        ----------
+
-        symbol : str
+        Returns
-            Stock symbol.
+        -------
-
+        str
-        Returns
+            Formatted markdown
-        -------
+        """
-        pd.DataFrame
+
-            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
-        """
+            price = round(quoteResp["last"][0], 2)
-        schedule.run_pending()
+
-
+            try:
-        try:
+                changePercent = round(quoteResp["changepct"][0], 2)
-            return self.charts[symbol.id.upper()]
+            except TypeError:
-        except KeyError:
+                return f"The price of {symbol} is {price}"
-            pass
+
-
+            message = f"The current price of {symbol.name} is ${price} and "
-        resolution = "5"  # minutes
+
-
+            if changePercent > 0.0:
-        if data := self.get(
+                message += f"is currently up {changePercent}% for the day."
-            f"stocks/candles/{resolution}/{symbol}",
+            elif changePercent < 0.0:
-            params={
+                message += f"is currently down {changePercent}% for the day."
-                "from": dt.datetime.now().strftime("%Y-%m-%d"),
+            else:
-                "to": dt.datetime.now().isoformat(),
+                message += "hasn't shown any movement for the day."
-            },
+
-        ):
+            return message
-            data.pop("s")
+        else:
-            df = pd.DataFrame(data)
+            return f"Getting a quote for {symbol} encountered an error."
-            df["t"] = pd.to_datetime(df["t"], unit="s")
+
-            df.set_index("t", inplace=True)
+    def spark_reply(self, symbol: Stock) -> str:
-
+        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
-            df.rename(
+            try:
-                columns={
+                changePercent = round(quoteResp["changepct"][0], 2)
-                    "o": "Open",
+                return f"`{symbol.tag}`: {changePercent}%"
-                    "h": "High",
+            except TypeError:
-                    "l": "Low",
+                pass
-                    "c": "Close",
+
-                    "v": "Volume",
+        return f"`{symbol.tag}`"
-                },
+
-                inplace=True,
+    def intra_reply(self, symbol: Stock) -> pd.DataFrame:
-            )
+        """Returns price data for a symbol of the past month up until the previous trading days close.
-
+        Also caches multiple requests made in the same day.
-            self.charts[symbol.id.upper()] = df
+
-            return df
+        Parameters
-
+        ----------
-        return pd.DataFrame()
+        symbol : str
-
+            Stock symbol.
-    def chart_reply(self, symbol: Stock) -> pd.DataFrame:
+
-        """Returns price data for a symbol of the past month up until the previous trading days close.
+        Returns
-        Also caches multiple requests made in the same day.
+        -------
-
+        pd.DataFrame
-        Parameters
+            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
-        ----------
+        """
-        symbol : str
+        schedule.run_pending()
-            Stock symbol.
+
-
+        try:
-        Returns
+            return self.charts[symbol.id.upper()]
-        -------
+        except KeyError:
-        pd.DataFrame
+            pass
-            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+
-        """
+        resolution = "15"  # minutes
-        schedule.run_pending()
+        now = dt.datetime.now(self.marketTimeZone)
-
+
-        try:
+        if self.openTime < now.time():
-            return self.charts[symbol.id.upper()]
+            startTime = now.replace(hour=9, minute=30)
-        except KeyError:
+        else:
-            pass
+            startTime = now - dt.timedelta(days=1)
-
+
-        to_date = dt.datetime.today().strftime("%Y-%m-%d")
+        if data := self.get(
-        from_date = (dt.datetime.today() - dt.timedelta(days=30)).strftime("%Y-%m-%d")
+            f"stocks/candles/{resolution}/{symbol}",
-        resultion = "daily"
+            params={"from": startTime.timestamp(), "to": now.timestamp(), "extended": True},
-
+        ):
-        if data := self.get(
+            data.pop("s")
-            f"stocks/candles/{resultion}/{symbol}",
+            df = pd.DataFrame(data)
-            params={
+            df["t"] = pd.to_datetime(df["t"], unit="s", utc=True)
-                "from": from_date,
+            df.set_index("t", inplace=True)
-                "to": to_date,
+
-            },
+            df.rename(
-        ):
+                columns={
-            data.pop("s")
+                    "o": "Open",
-
+                    "h": "High",
-            df = pd.DataFrame(data)
+                    "l": "Low",
-            df["t"] = pd.to_datetime(df["t"], unit="s")
+                    "c": "Close",
-            df.set_index("t", inplace=True)
+                    "v": "Volume",
-
+                },
-            df.rename(
+                inplace=True,
-                columns={
+            )
-                    "o": "Open",
+
-                    "h": "High",
+            self.charts[symbol.id.upper()] = df
-                    "l": "Low",
+            return df
-                    "c": "Close",
+
-                    "v": "Volume",
+        return pd.DataFrame()
-                },
+
-                inplace=True,
+    def chart_reply(self, symbol: Stock) -> pd.DataFrame:
-            )
+        """Returns price data for a symbol of the past month up until the previous trading days close.
-
+        Also caches multiple requests made in the same day.
-            self.charts[symbol.id.upper()] = df
+
-            return df
+        Parameters
-
+        ----------
-        return pd.DataFrame()
+        symbol : str
+            Stock symbol.
+
+        Returns
+        -------
+        pd.DataFrame
+            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+        """
+        schedule.run_pending()
+
+        try:
+            return self.charts[symbol.id.upper()]
+        except KeyError:
+            pass
+
+        to_date = dt.datetime.today().strftime("%Y-%m-%d")
+        from_date = (dt.datetime.today() - dt.timedelta(days=30)).strftime("%Y-%m-%d")
+        resultion = "daily"
+
+        if data := self.get(
+            f"stocks/candles/{resultion}/{symbol}",
+            params={
+                "from": from_date,
+                "to": to_date,
+            },
+        ):
+            data.pop("s")
+
+            df = pd.DataFrame(data)
+            df["t"] = pd.to_datetime(df["t"], unit="s")
+            df.set_index("t", inplace=True)
+
+            df.rename(
+                columns={
+                    "o": "Open",
+                    "h": "High",
+                    "l": "Low",
+                    "c": "Close",
+                    "v": "Volume",
+                },
+                inplace=True,
+            )
+
+            self.charts[symbol.id.upper()] = df
+            return df
+
+        return pd.DataFrame()

common/Symbol.py

@@ -1,50 +1,50 @@
-import pandas as pd
+import pandas as pd
-import logging
+import logging
-
+
-
+
-class Symbol:
+class Symbol:
-    """
+    """
-    symbol: What the user calls it. ie tsla or btc
+    symbol: What the user calls it. ie tsla or btc
-    id: What the api expects. ie tsla or bitcoin
+    id: What the api expects. ie tsla or bitcoin
-    name: Human readable. ie Tesla or Bitcoin
+    name: Human readable. ie Tesla or Bitcoin
-    tag: Uppercase tag to call the symbol. ie $TSLA or $$BTC
+    tag: Uppercase tag to call the symbol. ie $TSLA or $$BTC
-    """
+    """
-
+
-    currency = "usd"
+    currency = "usd"
-    pass
+    pass
-
+
-    def __init__(self, symbol) -> None:
+    def __init__(self, symbol) -> None:
-        self.symbol = symbol
+        self.symbol = symbol
-        self.id = symbol
+        self.id = symbol
-        self.name = symbol
+        self.name = symbol
-        self.tag = "$" + symbol
+        self.tag = "$" + symbol
-
+
-    def __repr__(self) -> str:
+    def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} instance of {self.id} at {id(self)}>"
+        return f"<{self.__class__.__name__} instance of {self.id} at {id(self)}>"
-
+
-    def __str__(self) -> str:
+    def __str__(self) -> str:
-        return self.id
+        return self.id
-
+
-
+
-class Stock(Symbol):
+class Stock(Symbol):
-    """Stock Market Object. Gets data from MarketData"""
+    """Stock Market Object. Gets data from MarketData"""
-
+
-    def __init__(self, symbol: str) -> None:
+    def __init__(self, symbol: str) -> None:
-        self.symbol = symbol
+        self.symbol = symbol
-        self.id = symbol
+        self.id = symbol
-        self.name = "$" + symbol.upper()
+        self.name = "$" + symbol.upper()
-        self.tag = "$" + symbol.lower()
+        self.tag = "$" + symbol.lower()
-
+
-
+
-class Coin(Symbol):
+class Coin(Symbol):
-    """Cryptocurrency Object. Gets data from CoinGecko."""
+    """Cryptocurrency Object. Gets data from CoinGecko."""
-
+
-    def __init__(self, symbol: pd.DataFrame) -> None:
+    def __init__(self, symbol: pd.DataFrame) -> None:
-        if len(symbol) > 1:
+        if len(symbol) > 1:
-            logging.info(f"Crypto with shared id:\n\t{symbol.id}")
+            logging.info(f"Crypto with shared id:\n\t{symbol.id}")
-            symbol = symbol.head(1)
+            symbol = symbol.head(1)
-
+
-        self.symbol = symbol.symbol.values[0]
+        self.symbol = symbol.symbol.values[0]
-        self.id = symbol.id.values[0]
+        self.id = symbol.id.values[0]
-        self.name = symbol.name.values[0]
+        self.name = symbol.name.values[0]
-        self.tag = symbol.type_id.values[0].upper()
+        self.tag = symbol.type_id.values[0].upper()

common/cg_Crypto.py

@@ -1,7 +1,4 @@
-"""Class with functions for running the bot with IEX Cloud.
+import logging
-"""
-
-import logging as log
 from typing import List
 
 import pandas as pd
@@ -9,7 +6,9 @@ import requests as r
 import schedule
 from markdownify import markdownify
 
-from Symbol import Coin
+from common.Symbol import Coin
+
+log = logging.getLogger(__name__)
 
 
 class cg_Crypto:
@@ -22,13 +21,6 @@ class cg_Crypto:
     trending_cache: List[str] = []
 
     def __init__(self) -> None:
-        """Creates a Symbol Object
-
-        Parameters
-        ----------
-        IEX_TOKEN : str
-            IEX Token
-        """
         self.get_symbol_list()
         schedule.every().day.do(self.get_symbol_list)
 
@@ -85,10 +77,10 @@ class cg_Crypto:
         try:
             status.raise_for_status()
             return (
-                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} seconds."
             )
         except r.HTTPError:
-            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} seconds."
 
     def price_reply(self, coin: Coin) -> str:
         """Returns current market price or after hours if its available for a given coin symbol.

common/requirements.txt

@@ -0,0 +1,6 @@
+requests==2.31.0
+pandas==2.1.1
+schedule==1.2.1
+mplfinance==0.12.10b0
+markdownify==0.11.6
+cachetools==5.3.1

common/symbol_router.py

@@ -1,399 +1,395 @@
-"""Function that routes symbols to the correct API provider.
+"""Function that routes symbols to the correct API provider.
-"""
+"""
-
+
-import datetime
+import datetime
-import logging
+import logging
-import random
+import random
-import re
+import re
-import logging as log
+
-
+import pandas as pd
-import pandas as pd
+import schedule
-import schedule
+from cachetools import TTLCache, cached
-from cachetools import TTLCache, cached
+
-
+from common.cg_Crypto import cg_Crypto
-from cg_Crypto import cg_Crypto
+from common.MarketData import MarketData
-from MarketData import MarketData
+from common.Symbol import Coin, Stock, Symbol
-from Symbol import Coin, Stock, Symbol
+
-
+from typing import Dict
-from typing import Dict
+
-
+log = logging.getLogger(__name__)
-
+
-class Router:
+
-    STOCK_REGEX = "(?:^|[^\\$])\\$([a-zA-Z.]{1,6})"
+class Router:
-    CRYPTO_REGEX = "[$]{2}([a-zA-Z]{1,20})"
+    STOCK_REGEX = "(?:^|[^\\$])\\$([a-zA-Z.]{1,6})"
-    trending_count: Dict[str, float] = {}
+    CRYPTO_REGEX = "[$]{2}([a-zA-Z]{1,20})"
-
+    trending_count: Dict[str, float] = {}
-    def __init__(self):
+
-        self.stock = MarketData()
+    def __init__(self):
-        self.crypto = cg_Crypto()
+        self.stock = MarketData()
-
+        self.crypto = cg_Crypto()
-        schedule.every().hour.do(self.trending_decay)
+
-
+        schedule.every().hour.do(self.trending_decay)
-    def trending_decay(self, decay=0.5):
+
-        """Decays the value of each trending stock by a multiplier"""
+    def trending_decay(self, decay=0.5):
-        t_copy = {}
+        """Decays the value of each trending stock by a multiplier"""
-        dead_keys = []
+        t_copy = {}
-        if self.trending_count:
+        dead_keys = []
-            t_copy = self.trending_count.copy()
+        if self.trending_count:
-            for key in t_copy.keys():
+            t_copy = self.trending_count.copy()
-                if t_copy[key] < 0.01:
+            for key in t_copy.keys():
-                    # This just makes sure were not keeping around keys that havent been called in a very long time.
+                if t_copy[key] < 0.01:
-                    dead_keys.append(key)
+                    # This just makes sure were not keeping around keys that havent been called in a very long time.
-                else:
+                    dead_keys.append(key)
-                    t_copy[key] = t_copy[key] * decay
+                else:
-        for dead in dead_keys:
+                    t_copy[key] = t_copy[key] * decay
-            t_copy.pop(dead)
+        for dead in dead_keys:
-
+            t_copy.pop(dead)
-        self.trending_count = t_copy.copy()
+
-        log.info("Decayed trending symbols.")
+        self.trending_count = t_copy.copy()
-
+        log.info("Decayed trending symbols.")
-    def find_symbols(self, text: str, *, trending_weight: int = 1) -> list[Stock | Symbol]:
+
-        """Finds stock tickers starting with a dollar sign, and cryptocurrencies with two dollar signs
+    def find_symbols(self, text: str, *, trending_weight: int = 1) -> list[Stock | Symbol]:
-        in a blob of text and returns them in a list.
+        """Finds stock tickers starting with a dollar sign, and cryptocurrencies with two dollar signs
-
+        in a blob of text and returns them in a list.
-        Parameters
+
-        ----------
+        Parameters
-        text : str
+        ----------
-            Blob of text.
+        text : str
-
+            Blob of text.
-        Returns
+
-        -------
+        Returns
-        list[Symbol]
+        -------
-            List of stock symbols as Symbol objects
+        list[Symbol]
-        """
+            List of stock symbols as Symbol objects
-        schedule.run_pending()
+        """
-
+        schedule.run_pending()
-        symbols: list[Symbol] = []
+
-        stocks = set(re.findall(self.STOCK_REGEX, text))
+        symbols: list[Symbol] = []
-        for stock in stocks:
+        stocks = set(re.findall(self.STOCK_REGEX, text))
-            # Market data lacks tools to check if a symbol is valid.
+        for stock in stocks:
-            symbols.append(Stock(stock))
+            # Market data lacks tools to check if a symbol is valid.
-
+            symbols.append(Stock(stock))
-        coins = set(re.findall(self.CRYPTO_REGEX, text))
+
-        for coin in coins:
+        coins = set(re.findall(self.CRYPTO_REGEX, text))
-            sym = self.crypto.symbol_list[self.crypto.symbol_list["symbol"].str.fullmatch(coin.lower(), case=False)]
+        for coin in coins:
-            if sym.empty:
+            sym = self.crypto.symbol_list[self.crypto.symbol_list["symbol"].str.fullmatch(coin.lower(), case=False)]
-                log.info(f"{coin} is not in list of coins")
+            if sym.empty:
-            else:
+                log.info(f"{coin} is not in list of coins")
-                symbols.append(Coin(sym))
+            else:
-        if symbols:
+                symbols.append(Coin(sym))
-            log.info(symbols)
+        if symbols:
-            for symbol in symbols:
+            for symbol in symbols:
-                self.trending_count[symbol.tag] = self.trending_count.get(symbol.tag, 0) + trending_weight
+                self.trending_count[symbol.tag] = self.trending_count.get(symbol.tag, 0) + trending_weight
-
+                log.debug(self.trending_count)
-        return symbols
+
-
+        return symbols
-    def status(self, bot_resp) -> str:
+
-        """Checks for any issues with APIs.
+    def status(self, bot_resp) -> str:
-
+        """Checks for any issues with APIs.
-        Returns
+
-        -------
+        Returns
-        str
+        -------
-            Human readable text on status of the bot and relevant APIs
+        str
-        """
+            Human readable text on status of the bot and relevant APIs
-
+        """
-        stats = f"""
+
-        Bot Status:
+        stats = f"""
-        {bot_resp}
+        Bot Status:
-
+        {bot_resp}
-        Stock Market Data:
+
-        {self.stock.status()}
+        Stock Market Data:
-
+        {self.stock.status()}
-        Cryptocurrency Data:
+
-        {self.crypto.status()}
+        Cryptocurrency Data:
-        """
+        {self.crypto.status()}
-
+        """
-        log.warning(stats)
+
-
+        log.warning(stats)
-        return stats
+
-
+        return stats
-    def inline_search(self, search: str, matches: int = 5) -> pd.DataFrame:
+
-        """Searches based on the shortest symbol that contains the same string as the search.
+    def inline_search(self, search: str, matches: int = 5) -> pd.DataFrame:
-        Should be very fast compared to a fuzzy search.
+        """Searches based on the shortest symbol that contains the same string as the search.
-
+        Should be very fast compared to a fuzzy search.
-        Parameters
+
-        ----------
+        Parameters
-        search : str
+        ----------
-            String used to match against symbols.
+        search : str
-
+            String used to match against symbols.
-        Returns
+
-        -------
+        Returns
-        list[tuple[str, str]]
+        -------
-            Each tuple contains: (Symbol, Issue Name).
+        list[tuple[str, str]]
-        """
+            Each tuple contains: (Symbol, Issue Name).
-
+        """
-        df = pd.concat([self.stock.symbol_list, self.crypto.symbol_list])
+
-
+        # df = pd.concat([self.stock.symbol_list, self.crypto.symbol_list])
-        df = df[df["description"].str.contains(search, regex=False, case=False)].sort_values(
+        df = self.crypto.symbol_list
-            by="type_id", key=lambda x: x.str.len()
+
-        )
+        df = df[df["description"].str.contains(search, regex=False, case=False)].sort_values(
-
+            by="type_id", key=lambda x: x.str.len()
-        symbols = df.head(matches)
+        )
-        symbols["price_reply"] = symbols["type_id"].apply(
+
-            lambda sym: self.price_reply(self.find_symbols(sym, trending_weight=0))[0]
+        symbols = df.head(matches)
-        )
+        symbols["price_reply"] = symbols["type_id"].apply(
-
+            lambda sym: self.price_reply(self.find_symbols(sym, trending_weight=0))[0]
-        return symbols
+        )
-
+
-    def price_reply(self, symbols: list[Symbol]) -> list[str]:
+        return symbols
-        """Returns current market price or after hours if its available for a given stock symbol.
+
-
+    def price_reply(self, symbols: list[Symbol]) -> list[str]:
-        Parameters
+        """Returns current market price or after hours if its available for a given stock symbol.
-        ----------
+
-        symbols : list
+        Parameters
-            List of stock symbols.
+        ----------
-
+        symbols : list
-        Returns
+            List of stock symbols.
-        -------
+
-        Dict[str, str]
+        Returns
-            Each symbol passed in is a key with its value being a human readable
+        -------
-            markdown formatted string of the symbols price and movement.
+        Dict[str, str]
-        """
+            Each symbol passed in is a key with its value being a human readable
-        replies = []
+            markdown formatted string of the symbols price and movement.
-
+        """
-        for symbol in symbols:
+        replies = []
-            log.info(symbol)
+
-            if isinstance(symbol, Stock):
+        for symbol in symbols:
-                replies.append(self.stock.price_reply(symbol))
+            log.info(symbol)
-            elif isinstance(symbol, Coin):
+            if isinstance(symbol, Stock):
-                replies.append(self.crypto.price_reply(symbol))
+                replies.append(self.stock.price_reply(symbol))
-            else:
+            elif isinstance(symbol, Coin):
-                log.info(f"{symbol} is not a Stock or Coin")
+                replies.append(self.crypto.price_reply(symbol))
-
+            else:
-        return replies
+                log.info(f"{symbol} is not a Stock or Coin")
-
+
-    def info_reply(self, symbols: list) -> list[str]:
+        return replies
-        """Gets information on stock symbols.
+
-
+    def info_reply(self, symbols: list) -> list[str]:
-        Parameters
+        """Gets information on stock symbols.
-        ----------
+
-        symbols : list[str]
+        Parameters
-            List of stock symbols.
+        ----------
-
+        symbols : list[str]
-        Returns
+            List of stock symbols.
-        -------
+
-        Dict[str, str]
+        Returns
-            Each symbol passed in is a key with its value being a human readable formatted
+        -------
-                string of the symbols information.
+        Dict[str, str]
-        """
+            Each symbol passed in is a key with its value being a human readable formatted
-        replies = []
+                string of the symbols information.
-
+        """
-        for symbol in symbols:
+        replies = []
-            if isinstance(symbol, Stock):
+
-                replies.append(self.stock.info_reply(symbol))
+        for symbol in symbols:
-            elif isinstance(symbol, Coin):
+            if isinstance(symbol, Stock):
-                replies.append(self.crypto.info_reply(symbol))
+                replies.append(self.stock.info_reply(symbol))
-            else:
+            elif isinstance(symbol, Coin):
-                log.debug(f"{symbol} is not a Stock or Coin")
+                replies.append(self.crypto.info_reply(symbol))
-
+            else:
-        return replies
+                log.debug(f"{symbol} is not a Stock or Coin")
-
+
-    def intra_reply(self, symbol: Symbol) -> pd.DataFrame:
+        return replies
-        """Returns price data for a symbol since the last market open.
+
-
+    def intra_reply(self, symbol: Symbol) -> pd.DataFrame:
-        Parameters
+        """Returns price data for a symbol since the last market open.
-        ----------
+
-        symbol : str
+        Parameters
-            Stock symbol.
+        ----------
-
+        symbol : str
-        Returns
+            Stock symbol.
-        -------
+
-        pd.DataFrame
+        Returns
-            Returns a timeseries dataframe with high, low, and volume data if its available.
+        -------
-                Otherwise returns empty pd.DataFrame.
+        pd.DataFrame
-        """
+            Returns a timeseries dataframe with high, low, and volume data if its available.
-
+                Otherwise returns empty pd.DataFrame.
-        if isinstance(symbol, Stock):
+        """
-            return self.stock.intra_reply(symbol)
+
-        elif isinstance(symbol, Coin):
+        if isinstance(symbol, Stock):
-            return self.crypto.intra_reply(symbol)
+            return self.stock.intra_reply(symbol)
-        else:
+        elif isinstance(symbol, Coin):
-            log.debug(f"{symbol} is not a Stock or Coin")
+            return self.crypto.intra_reply(symbol)
-            return pd.DataFrame()
+        else:
-
+            log.debug(f"{symbol} is not a Stock or Coin")
-    def chart_reply(self, symbol: Symbol) -> pd.DataFrame:
+            return pd.DataFrame()
-        """Returns price data for a symbol of the past month up until the previous trading days close.
+
-        Also caches multiple requests made in the same day.
+    def chart_reply(self, symbol: Symbol) -> pd.DataFrame:
-
+        """Returns price data for a symbol of the past month up until the previous trading days close.
-        Parameters
+        Also caches multiple requests made in the same day.
-        ----------
+
-        symbol : str
+        Parameters
-            Stock symbol.
+        ----------
-
+        symbol : str
-        Returns
+            Stock symbol.
-        -------
+
-        pd.DataFrame
+        Returns
-            Returns a timeseries dataframe with high, low, and volume data if its available.
+        -------
-                Otherwise returns empty pd.DataFrame.
+        pd.DataFrame
-        """
+            Returns a timeseries dataframe with high, low, and volume data if its available.
-        if isinstance(symbol, Stock):
+                Otherwise returns empty pd.DataFrame.
-            return self.stock.chart_reply(symbol)
+        """
-        elif isinstance(symbol, Coin):
+        if isinstance(symbol, Stock):
-            return self.crypto.chart_reply(symbol)
+            return self.stock.chart_reply(symbol)
-        else:
+        elif isinstance(symbol, Coin):
-            log.debug(f"{symbol} is not a Stock or Coin")
+            return self.crypto.chart_reply(symbol)
-            return pd.DataFrame()
+        else:
-
+            log.debug(f"{symbol} is not a Stock or Coin")
-    def stat_reply(self, symbols: list[Symbol]) -> list[str]:
+            return pd.DataFrame()
-        """Gets key statistics for each symbol in the list
+
-
+    def stat_reply(self, symbols: list[Symbol]) -> list[str]:
-        Parameters
+        """Gets key statistics for each symbol in the list
-        ----------
+
-        symbols : list[str]
+        Parameters
-            List of stock symbols
+        ----------
-
+        symbols : list[str]
-        Returns
+            List of stock symbols
-        -------
+
-        Dict[str, str]
+        Returns
-            Each symbol passed in is a key with its value being a human readable
+        -------
-                formatted string of the symbols statistics.
+        Dict[str, str]
-        """
+            Each symbol passed in is a key with its value being a human readable
-        replies = []
+                formatted string of the symbols statistics.
-
+        """
-        for symbol in symbols:
+        replies = []
-            if isinstance(symbol, Stock):
+
-                replies.append(self.stock.stat_reply(symbol))
+        for symbol in symbols:
-            elif isinstance(symbol, Coin):
+            if isinstance(symbol, Stock):
-                replies.append(self.crypto.stat_reply(symbol))
+                replies.append(self.stock.stat_reply(symbol))
-            else:
+            elif isinstance(symbol, Coin):
-                log.debug(f"{symbol} is not a Stock or Coin")
+                replies.append(self.crypto.stat_reply(symbol))
-
+            else:
-        return replies
+                log.debug(f"{symbol} is not a Stock or Coin")
-
+
-    def cap_reply(self, symbols: list[Symbol]) -> list[str]:
+        return replies
-        """Gets market cap for each symbol in the list
+
-
+    def cap_reply(self, symbols: list[Symbol]) -> list[str]:
-        Parameters
+        """Gets market cap for each symbol in the list
-        ----------
+
-        symbols : list[str]
+        Parameters
-            List of stock symbols
+        ----------
-
+        symbols : list[str]
-        Returns
+            List of stock symbols
-        -------
+
-        Dict[str, str]
+        Returns
-            Each symbol passed in is a key with its value being a human readable
+        -------
-                formatted string of the symbols market cap.
+        Dict[str, str]
-        """
+            Each symbol passed in is a key with its value being a human readable
-        replies = []
+                formatted string of the symbols market cap.
-
+        """
-        for symbol in symbols:
+        replies = []
-            if isinstance(symbol, Stock):
+
-                replies.append(self.stock.cap_reply(symbol))
+        for symbol in symbols:
-            elif isinstance(symbol, Coin):
+            if isinstance(symbol, Stock):
-                replies.append(self.crypto.cap_reply(symbol))
+                replies.append(self.stock.cap_reply(symbol))
-            else:
+            elif isinstance(symbol, Coin):
-                log.debug(f"{symbol} is not a Stock or Coin")
+                replies.append(self.crypto.cap_reply(symbol))
-
+            else:
-        return replies
+                log.debug(f"{symbol} is not a Stock or Coin")
-
+
-    def spark_reply(self, symbols: list[Symbol]) -> list[str]:
+        return replies
-        """Gets change for each symbol and returns it in a compact format
+
-
+    def spark_reply(self, symbols: list[Symbol]) -> list[str]:
-        Parameters
+        """Gets change for each symbol and returns it in a compact format
-        ----------
+
-        symbols : list[str]
+        Parameters
-            List of stock symbols
+        ----------
-
+        symbols : list[str]
-        Returns
+            List of stock symbols
-        -------
+
-        list[str]
+        Returns
-            List of human readable strings.
+        -------
-        """
+        list[str]
-        replies = []
+            List of human readable strings.
-
+        """
-        for symbol in symbols:
+        replies = []
-            if isinstance(symbol, Stock):
+
-                replies.append("Command not supported for stocks.")
+        for symbol in symbols:
-                # replies.append(self.stock.spark_reply(symbol))
+            if isinstance(symbol, Stock):
-            elif isinstance(symbol, Coin):
+                replies.append(self.stock.spark_reply(symbol))
-                replies.append(self.crypto.spark_reply(symbol))
+            elif isinstance(symbol, Coin):
-            else:
+                replies.append(self.crypto.spark_reply(symbol))
-                log.debug(f"{symbol} is not a Stock or Coin")
+            else:
-
+                log.debug(f"{symbol} is not a Stock or Coin")
-        return replies
+
-
+        return replies
-    @cached(cache=TTLCache(maxsize=1024, ttl=600))
+
-    def trending(self) -> str:
+    @cached(cache=TTLCache(maxsize=1024, ttl=600))
-        """Checks APIs for trending symbols.
+    def trending(self) -> str:
-
+        """Checks APIs for trending symbols.
-        Returns
+
-        -------
+        Returns
-        list[str]
+        -------
-            List of preformatted strings to be sent to user.
+        list[str]
-        """
+            List of preformatted strings to be sent to user.
-
+        """
-        stocks = self.stock.trending()
+
-        coins = self.crypto.trending()
+        # stocks = self.stock.trending()
-
+        coins = self.crypto.trending()
-        reply = ""
+
-
+        reply = ""
-        if self.trending_count:
+
-            reply += "🔥Trending on the Stock Bot:\n`"
+        log.warning(self.trending_count)
-            reply += "━" * len("Trending on the Stock Bot:") + "`\n"
+        if self.trending_count:
-
+            reply += "🔥Trending on the Stock Bot:\n`"
-            sorted_trending = [s[0] for s in sorted(self.trending_count.items(), key=lambda item: item[1])][::-1][0:5]
+            reply += "━" * len("Trending on the Stock Bot:") + "`\n"
-
+
-            for t in sorted_trending:
+            sorted_trending = [s[0] for s in sorted(self.trending_count.items(), key=lambda item: item[1])][::-1][0:5]
-                reply += self.spark_reply(self.find_symbols(t))[0] + "\n"
+            log.warning(sorted_trending)
-
+            for t in sorted_trending:
-        if stocks:
+                reply += self.spark_reply(self.find_symbols(t))[0] + "\n"
-            reply += "\n\n💵Trending Stocks:\n`"
+
-            reply += "━" * len("Trending Stocks:") + "`\n"
+        if coins:
-            for stock in stocks:
+            reply += "\n\n🦎Trending on CoinGecko:\n`"
-                reply += stock + "\n"
+            reply += "━" * len("Trending on CoinGecko:") + "`\n"
-
+            for coin in coins:
-        if coins:
+                reply += coin + "\n"
-            reply += "\n\n🦎Trending Crypto:\n`"
+
-            reply += "━" * len("Trending Crypto:") + "`\n"
+        if "`$GME" in reply:
-            for coin in coins:
+            reply = reply.replace("🔥", "🦍")
-                reply += coin + "\n"
+
-
+        if reply:
-        if "`$GME" in reply:
+            return reply
-            reply = reply.replace("🔥", "🦍")
+        else:
-
+            log.warning("Failed to collect trending data.")
-        if reply:
+            return "Trending data is not currently available."
-            return reply
+
-        else:
+    def random_pick(self) -> str:
-            log.warning("Failed to collect trending data.")
+        # choice = random.choice(list(self.stock.symbol_list["description"]) + list(self.crypto.symbol_list["description"]))
-            return "Trending data is not currently available."
+        choice = random.choice(list(self.crypto.symbol_list["description"]))
-
+        hold = (datetime.date.today() + datetime.timedelta(random.randint(1, 365))).strftime("%b %d, %Y")
-    def random_pick(self) -> str:
+
-        choice = random.choice(list(self.stock.symbol_list["description"]) + list(self.crypto.symbol_list["description"]))
+        return f"{choice}\nBuy and hold until: {hold}"
-        hold = (datetime.date.today() + datetime.timedelta(random.randint(1, 365))).strftime("%b %d, %Y")
+
-
+    def batch_price_reply(self, symbols: list[Symbol]) -> list[str]:
-        return f"{choice}\nBuy and hold until: {hold}"
+        """Returns current market price or after hours if its available for a given stock symbol.
-
+
-    def batch_price_reply(self, symbols: list[Symbol]) -> list[str]:
+        Parameters
-        """Returns current market price or after hours if its available for a given stock symbol.
+        ----------
-
+        symbols : list
-        Parameters
+            List of stock symbols.
-        ----------
+
-        symbols : list
+        Returns
-            List of stock symbols.
+        -------
-
+        Dict[str, str]
-        Returns
+            Each symbol passed in is a key with its value being a human readable
-        -------
+            markdown formatted string of the symbols price and movement.
-        Dict[str, str]
+        """
-            Each symbol passed in is a key with its value being a human readable
+        replies = []
-            markdown formatted string of the symbols price and movement.
+        stocks = []
-        """
+        coins = []
-        replies = []
+
-        stocks = []
+        for symbol in symbols:
-        coins = []
+            if isinstance(symbol, Stock):
-
+                stocks.append(symbol)
-        for symbol in symbols:
+            elif isinstance(symbol, Coin):
-            if isinstance(symbol, Stock):
+                coins.append(symbol)
-                stocks.append(symbol)
+            else:
-            elif isinstance(symbol, Coin):
+                log.debug(f"{symbol} is not a Stock or Coin")
-                coins.append(symbol)
+
-            else:
+        if stocks:
-                log.debug(f"{symbol} is not a Stock or Coin")
+            for stock in stocks:
-
+                replies.append(self.stock.price_reply(stock))
-        if stocks:
+        if coins:
-            # IEX batch endpoint doesnt seem to be working right now
+            replies = replies + self.crypto.batch_price(coins)
-            for stock in stocks:
+
-                replies.append(self.stock.price_reply(stock))
+        return replies
-        if coins:
-            replies = replies + self.crypto.batch_price(coins)
-
-        return replies

dev-reqs.txt

@@ -1,6 +1,10 @@
--r requirements.txt
+-r common/requirements.txt
-black==23.3.0
+-r docs/requirements.txt
-flake8==5.0.4
+black==23.7.0
-Flake8-pyproject==1.2.3
+flake8==6.1.0
-pylama==8.4.1
+Flake8-pyproject==1.2.3
-mypy==1.2.0
+pylama==8.4.1
+mypy==1.5.1
+types-cachetools==5.3.0.6
+types-pytz==2023.3.0.1
+ruff==0.0.292

discord/D_info.py

@@ -0,0 +1,59 @@
+"""Functions and Info specific to the discord Bot
+"""
+
+import re
+
+import requests as r
+
+
+class D_info:
+    license = re.sub(
+        r"\b\n",
+        " ",
+        r.get("https://gitlab.com/simple-stock-bots/simple-discord-stock-bot/-/raw/master/LICENSE").text,
+    )
+
+    help_text = """
+Thanks for using this bot. If you like it, [support me with a beer](https://www.buymeacoffee.com/Anson). 🍻
+
+For stock data or hosting your own bot, use my link. This helps keep the bot free:
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
+
+**Updates**: Join the bot's discord: https://t.me/simplestockbotnews.
+
+**Documentation**: All details about the bot are at [docs](https://docs.simplestockbot.com).
+
+The bot reads _"Symbols"_. Use `$` for stock tickers and `$$` for cryptocurrencies. For example:
+- `/chart $$eth` gives Ethereum's monthly chart.
+- `/dividend $psec` shows Prospect Capital's dividend.
+
+Type any symbol, and the bot shows its price. Like: `Is $$btc rising since $tsla accepts it?` will give Bitcoin and Tesla prices.
+
+**Commands**
+- `/donate [USD amount]`: Support the bot. 🎗️
+- `/intra $[symbol]`: See stock's latest movement. 📈
+- `/chart $[symbol]`: View a month's stock activity. 📊
+- `/trending`: Check trending stocks and cryptos. 💬
+- `/help`: Need help? Ask here. 🆘
+
+**Inline Features**
+Type @SimpleStockBot `[search]` anywhere to find and get stock/crypto prices. Note: Prices might be delayed up to an hour.
+
+Data from: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
+
+Issues with the bot? Use `/status` or [contact us](https://docs.simplestockbot.com/contact).
+    """
+
+    donate_text = """
+Simple Stock Bot runs purely on [donations.](https://www.buymeacoffee.com/Anson)
+Every donation supports server costs and
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord) provides our data.
+
+**How to Donate?**
+1. Use `/donate [amount in USD]` command.
+   - E.g., `/donate 2` donates 2 USD.
+2. Or, donate at [buymeacoffee](https://www.buymeacoffee.com/Anson).
+    - It's quick, doesn't need an account, and accepts Paypal or Credit card.
+
+Questions? Visit our [website](https://docs.simplestockbot.com).
+"""

discord/Dockerfile

@@ -1,17 +1,19 @@
-FROM python:3.11-buster AS builder
+FROM python:3.11-buster AS builder
-
+
-
+
-COPY requirements.txt /requirements.txt
+COPY discord/discord-reqs.txt .
-RUN pip install --user -r requirements.txt
+COPY common/requirements.txt .
-
+
-
+RUN pip install --user -r discord-reqs.txt
-FROM python:3.11-slim
+
-
+
-ENV MPLBACKEND=Agg
+FROM python:3.11-slim
-
+
-COPY --from=builder /root/.local /root/.local
+ENV MPLBACKEND=Agg
-
+
-
+COPY --from=builder /root/.local /root/.local
-COPY . .
+
-
+COPY common common
+COPY discord .
+
 CMD [ "python", "./bot.py" ]

discord/bot.py

@@ -0,0 +1,202 @@
+import datetime
+import io
+import logging
+import os
+
+import mplfinance as mpf
+import nextcord
+from nextcord.ext import commands
+
+from D_info import D_info
+from common.symbol_router import Router
+
+DISCORD_TOKEN = os.environ["DISCORD"]
+
+s = Router()
+d = D_info()
+
+
+intents = nextcord.Intents.default()
+
+
+client = nextcord.Client(intents=intents)
+bot = commands.Bot(command_prefix="/", description=d.help_text, intents=intents)
+
+logger = logging.getLogger("nextcord")
+logger.setLevel(logging.INFO)
+handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
+handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+logger.addHandler(handler)
+
+
+@bot.event
+async def on_ready():
+    logging.info("Starting Simple Stock Bot")
+    logging.info(f"Logged in as {bot.user.name} {bot.user.id}")
+
+
+@bot.command()
+async def status(ctx: commands):
+    """Debug command for diagnosing if the bot is experiencing any issues."""
+    logging.warning(f"Status command ran by {ctx.message.author}")
+    message = ""
+    try:
+        message = "Contact MisterBiggs#0465 if you need help.\n"
+        message += s.status(f"Bot recieved your message in: {bot.latency*10:.4f} seconds") + "\n"
+
+    except Exception as ex:
+        logging.critical(ex)
+        message += (
+            f"*\n\nERROR ENCOUNTERED:*\n{ex}\n\n"
+            + "*The bot encountered an error while attempting to find errors. Please contact the bot admin.*"
+        )
+    await ctx.send(message)
+
+
+@bot.command()
+async def license(ctx: commands):
+    """Returns the bots license agreement."""
+    await ctx.send(d.license)
+
+
+@bot.command()
+async def donate(ctx: commands):
+    """Details on how to support the development and hosting of the bot."""
+    await ctx.send(d.donate_text)
+
+
+@bot.command()
+async def search(ctx: commands, *, query: str):
+    """Search for a stock symbol using either symbol of company name."""
+    results = s.search_symbols(query)
+    if results:
+        reply = "*Search Results:*\n`$ticker: Company Name`\n"
+        for query in results:
+            reply += "`" + query[1] + "`\n"
+        await ctx.send(reply)
+
+
+@bot.command()
+async def crypto(ctx: commands, _: str):
+    """Get the price of a cryptocurrency using in USD."""
+    await ctx.send("Crypto now has native support. Any crypto can be called using two dollar signs: `$$eth` `$$btc` `$$doge`")
+
+
+@bot.command()
+async def intra(ctx: commands, sym: str):
+    """Get a chart for the stocks movement since market open."""
+    symbols = s.find_symbols(sym)
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await ctx.send("No symbols or coins found.")
+        return
+
+    df = s.intra_reply(symbol)
+    if df.empty:
+        await ctx.send("Invalid symbol please see `/help` for usage details.")
+        return
+    with ctx.channel.typing():
+        buf = io.BytesIO()
+        mpf.plot(
+            df,
+            type="renko",
+            title=f"\n{symbol.name}",
+            volume="volume" in df.keys(),
+            style="yahoo",
+            savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+        )
+
+        buf.seek(0)
+
+        # Get price so theres no request lag after the image is sent
+        price_reply = s.price_reply([symbol])[0]
+        await ctx.send(
+            file=nextcord.File(
+                buf,
+                filename=f"{symbol.name}:intra{datetime.date.today().strftime('%S%M%d%b%Y')}.png",
+            ),
+            content=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
+            + f" {df.last_valid_index().strftime('%d %b at %H:%M')}",
+        )
+        await ctx.send(price_reply)
+
+
+@bot.command()
+async def chart(ctx: commands, sym: str):
+    """returns a chart of the past month of data for a symbol"""
+
+    symbols = s.find_symbols(sym)
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await ctx.send("No symbols or coins found.")
+        return
+
+    df = s.chart_reply(symbol)
+    if df.empty:
+        await ctx.send("Invalid symbol please see `/help` for usage details.")
+        return
+    with ctx.channel.typing():
+        buf = io.BytesIO()
+        mpf.plot(
+            df,
+            type="candle",
+            title=f"\n{symbol.name}",
+            volume="volume" in df.keys(),
+            style="yahoo",
+            savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+        )
+        buf.seek(0)
+
+        # Get price so theres no request lag after the image is sent
+        price_reply = s.price_reply([symbol])[0]
+        await ctx.send(
+            file=nextcord.File(
+                buf,
+                filename=f"{symbol.name}:1M{datetime.date.today().strftime('%d%b%Y')}.png",
+            ),
+            content=f"\n1 Month chart for {symbol.name} from {df.first_valid_index().strftime('%d, %b %Y')}"
+            + f" to {df.last_valid_index().strftime('%d, %b %Y')}",
+        )
+        await ctx.send(price_reply)
+
+
+@bot.command()
+async def cap(ctx: commands, sym: str):
+    """Get the market cap of a symbol"""
+    symbols = s.find_symbols(sym)
+    if symbols:
+        with ctx.channel.typing():
+            for reply in s.cap_reply(symbols):
+                await ctx.send(reply)
+
+
+@bot.command()
+async def trending(ctx: commands):
+    """Get a list of Trending Stocks and Coins"""
+    with ctx.channel.typing():
+        await ctx.send(s.trending())
+
+
+@bot.event
+async def on_message(message):
+    if message.author.id == bot.user.id:
+        return
+    if message.content:
+        if message.content[0] == "/":
+            await bot.process_commands(message)
+            return
+
+        if "$" in message.content:
+            symbols = s.find_symbols(message.content)
+
+            if symbols:
+                for reply in s.price_reply(symbols):
+                    await message.channel.send(reply)
+                return
+
+
+bot.run(DISCORD_TOKEN)

discord/discord-reqs.txt

@@ -0,0 +1,2 @@
+nextcord==2.4.2
+-r requirements.txt

docker-compose.yaml

@@ -0,0 +1,13 @@
+version: '3'
+services:
+  telegram:
+    build:
+      context: .
+      dockerfile: telegram/Dockerfile
+    image: registry.gitlab.com/simple-stock-bots/simple-telegram-stock-bot
+    env_file: .env
+  discord:
+    build:
+      context: .
+      dockerfile: discord/Dockerfile
+    env_file: .env

docs/.gitignore

@@ -0,0 +1 @@
+.cache

docs/.gitlab-ci.yml

@@ -0,0 +1,12 @@
+image: python:3.11
+pages:
+  stage: deploy
+  script:
+    - cd ./docs
+    - pip install -r requirements.txt
+    - mkdocs build --site-dir ../public --verbose
+  artifacts:
+    paths:
+      - public
+  # rules:
+  #   - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

docs/.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+    "yaml.schemas": {
+        "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
+    },
+    "yaml.customTags": [
+        "!ENV scalar",
+        "!ENV sequence",
+        "tag:yaml.org,2002:python/name:materialx.emoji.to_svg",
+        "tag:yaml.org,2002:python/name:materialx.emoji.twemoji",
+        "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
+    ]
+}

docs/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Anson Biggs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docs/README.md

@@ -0,0 +1,30 @@
+# Simple Stock Bots
+[![Platform](https://img.shields.io/badge/platform-Telegram-blue.svg)](https://t.me/SimpleStockBot)
+[![Platform](https://img.shields.io/badge/platform-Discord-blue.svg)](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+ 
+
+## Table of Contents
++ [About](#about)
++ [Getting Started](#getting_started)
++ [Usage](#usage)
++ [Contributing](../CONTRIBUTING.md)
+
+## About <a name = "about"></a>
+Simple Stock Bots is a family of messaging bots that aim to provide simple bots that provide information on the stock market. Currently there are only [Telegram](./telegram) and [Discord](./discord) Bots.
+
+## Getting Started <a name = "getting_started"></a>
+
+The simplest way to use these bots is to use the version that I host on Digital Ocean. You can find the links to access them below:
+
++ [Telegram](https://t.me/SimpleStockBot)
++ [Discord](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot)
+
+Alternatively, this project is completely open source and instructions on how to run your own instance of the bot are provided on each of the bots pages. 
+
+## Source Code
+
+The source code for the bots is completely open and hosted on Gitlab. 
+
++ [Telegram](https://gitlab.com/simple-stock-bots/simple-telegram-bot)
++ [Discord](https://gitlab.com/simple-stock-bots/simple-discord-stock-bot)

docs/docs/LICENSE.md

@@ -0,0 +1,23 @@
+```
+MIT License
+
+Copyright (c) 2019 Anson Biggs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```

docs/docs/commands.md

@@ -0,0 +1,176 @@
+Symbols are used in headings to denote what platforms and symbol types a command supports.
+
+- Telegram Only :fontawesome-brands-telegram-plane:
+- Discord Only :fontawesome-brands-discord:
+- Bot Commands :robot:
+- Cryptocurrency Support :material-currency-btc:
+- Stock Market Support :bank:
+- OTC Support :dollar:
+
+## Symbol Detection :material-currency-btc: :bank: :dollar:
+
+The Simple Stock Bot looks at every message it can see and tries to detect stock and cryptocurrency symbols. Stock market tickers are denoted with a single `$` and cryptocurrency coins are denoted with a double `$$`. So getting the price of Tesla is as simple as `$tsla` and Bitcoin `$$btc`. These symbols can be in any part of a message and there can be multiple of them aswell.
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            I wonder how $tsla is affecting the price of $$btc
+        </div>
+        <div class="message from">
+        The current stock price of Tesla Inc is $866.57, the stock is currently up 1.68%
+        </div>
+        <div class="message from">
+        The current price of Bitcoin is $34,815, the coin is currently down -0.151% for today
+        </div>
+    </div>
+</div>
+
+## `/donate [Amount in USD]` :fontawesome-brands-telegram-plane: 
+
+The donate command is used to send money to the bot to help keep it free. The premium stock market data and server rentals add up so any amount helps. See the [Donate](donate.md) page for more information.
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /donate
+        </div>
+        <div class="message from">
+            The current stock price of Tesla Inc is $664.315, the stock is
+            currently down -0.99%
+        </div>
+    </div>
+</div>
+
+## `/intra [symbol]` :bank: :material-currency-btc:
+
+This command makes a chart of a stocks movement since the last market open, or the last 24 hours for cryptocurrency.
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /intra $astr
+        </div>
+        <div class="message from">
+          <img src="/img/TgIntraChat.jpg" alt="Tesla Motors Chart" />
+          <p>Intraday chart for $ASTR from 06 Jul at 09:30 to 06 Jul at 15:59</p>
+          <p>The current stock price of Astra Space Inc - Class A is $12.47, the stock is currently down -19.39%</p>
+        </div>
+
+    </div>
+
+</div>
+
+## `/chart [symbol]` :bank: :material-currency-btc:
+
+This command makes a chart of the last 1 month of trading data up until the day before. For example running it on May 5th creates a chart from April 5th to May 4th.
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /intra $astr
+        </div>
+        <div class="message from">
+          <img src="/img/TgChartChat.jpg" alt="Tesla Motors Chart" />
+          <p>1 Month chart for Ethereum from 07, Jun 2021 to 07, Jul 2021</p>
+          <p>The current price of Ethereum is $2,389.62, the coin is currently up 2.485% for today</p>
+        </div>
+
+    </div>
+
+</div>
+
+## `/trending` 
+
+Gets the latest trending stocks and their change in price
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /trending
+        </div>
+        <pre class="message from">
+
+🦍Trending on the Stock Bot:
+━━━━━━━━━━━━━━━━━━━━━━━━━━
+$GME: Gamestop Corporation - Class A, 5.06%
+$MMAT: Meta Materials Inc, 4.77%
+$$BTC: Bitcoin, -0.83%
+$$ETH: Ethereum, 6.06%
+$$DOGE: Binance-Peg Dogecoin, 0.14%
+
+
+💵Trending Stocks:
+━━━━━━━━━━━━━━━━
+$BBIG: Vinco Ventures Inc, 15.44%
+$GSAT: Globalstar Inc., -15.32%
+$AMC: AMC Entertainment Holdings Inc - Class A, 8.77%
+$ACIU: AC Immune SA, 16.31%
+$PLTR: Palantir Technologies Inc - Class A, 2.25%
+$AAPL: Apple Inc, -0.84%
+$XELA: Exela Technologies Inc, 12.61%
+$WFC: Wells Fargo & Co., -5.60%
+$BAC: Bank Of America Corp., 0.22%
+$AMD: Advanced Micro Devices Inc., -0.54%
+
+
+🦎Trending Crypto:
+━━━━━━━━━━━━━━━━
+$$NFD: Feisty Doge NFT, -34.32%
+$$SLP: Smooth Love Potion, -13.02%
+$$PVU: Plant vs Undead Token, -1.27%
+$$XED: Exeedme, 1.02%
+$$SOL: Solana, -3.95%
+$$BNB: Binance Coin, -0.25%
+$$EWT: Energy Web Token, 17.72%
+
+        </pre>
+    </div>
+
+</div>
+
+## /help :robot:
+
+Just a simple command to get help in app. Returns a more summarized version of this page.
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /help
+        </div>
+        <div class="message from">
+            The current stock price of Tesla Inc is $664.315, the stock is
+            currently down -0.99%
+        </div>
+    </div>
+</div>
+
+## `/status` :robot:
+
+This command is to get diagnostic information about the bot and the services it is dependant on in order to operate. Any issues should be reported to me. [Contact](contact.md)
+
+<div class="phone">
+    <div class="messages-wrapper">
+        <div class="message to">
+            /status
+        </div>
+        <pre class="message from">
+Bot Status:
+        It took 0.783369 seconds for the bot to get your message.
+
+        Stock Market Data:
+        marketdata.app is currently not reporting any issues with its API.
+
+        Cryptocurrency Data:
+        CoinGecko API responded that it was OK in 0.160962 Seconds.
+        </pre>
+    </div>
+
+</div>
+
+## Inline Features :fontawesome-brands-telegram: :material-currency-btc: :bank: :dollar:
+
+You can type @SimpleStockBot `[search]` in any chat or direct message to search for the stock bots
+full list of stock symbols and return the price of the ticker. Then once you select the ticker
+want the bot will send a message as you in that chat with the latest stock price.
+The bot also looks at every message in any chat it is in for stock symbols.Symbols start with a
+`$` followed by the stock symbol. For example:$tsla would return price information for Tesla Motors.

docs/docs/contact.md

@@ -0,0 +1,6 @@
+Feel free to reach out with bugs or suggestions at any of the following places:
+
+- Message me on [Telegram](https://t.me/MisterBiggs)
+- Message me on Discord `MisterBiggs#0465`
+- Tweet me on [Twitter](https://twitter.com/AnsonBiggs)
+- Open an issue on gitlab: [`Telegram Bot`](https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot) [`Discord Bot`](https://gitlab.com/simple-stock-bots/simple-discord-stock-bot)

docs/docs/donate.md

@@ -0,0 +1,15 @@
+Simple Stock Bot is run entirely on donations, and costs about $420 a year to run. All donations go directly towards paying for servers, and premium market data provided by [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
+
+The best way to donate is through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) which accepts Paypal or Credit card.
+
+Alternatively, you can donate on Telegram with the `/donate` [command](commands.md#donate-amount-in-usd).
+
+If you have any questions get in [touch.](contact.md)
+
+## Other Ways to Help:
+
+- Follow me on [twitter](https://twitter.com/AnsonBiggs)
+- Contribute to the project on [GitLab](https://gitlab.com/simple-stock-bots) or just leave a star
+- Using my referral links to host your own Bot
+  - [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)
+  - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)

docs/docs/host.md

@@ -0,0 +1,41 @@
+# Self Hosted Bot
+
+These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
+
+## Prerequisites
+
+This project runs neatly in a docker container, so all that you need to run it yourself is [Docker](https://hub.docker.com/?overlay=onboarding) installed on your system.
+
+Depending on what platform you'll need:
+
+- Telegram API key which can be obtained for free by talking to [BotFather](https://telegram.me/botfather), more details [here.](https://core.telegram.org/bots#3-how-do-i-create-a-bot)
+- Discord API key which can be obtained for free at [https://discord.com/developers](https://discord.com/developers)
+
+Finally, you will need a [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo) API key. They offer a free tier that should be enough for any private groups, more details [here.](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)
+
+!!! tip
+    The bot will function without a [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo) key and will fall back to only using cryptocurrency data. 
+
+!!! note
+    If you want to accept donations you also need a Stripe API key and provide a `STRIPE` key to your bot. [https://stripe.com/]
+
+## Installing
+
+Once Docker is installed and you have your API keys for Telegram and [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo) getting the bot running on any platform is extremely easy.
+
+Download or clone the repository to your machine and open a terminal in the project and build the Docker container.
+
+```
+docker build -t simple-telegram-bot .
+```
+
+Then run the bot using your API keys.
+
+```
+docker run --detach \
+     -e TELEGRAM=TELEGRAM_API_KEY \
+     -e MARKETDATA=MARKETDATA_API_KEY \
+      simple-telegram-bot
+```
+
+Your bot should be running! If you are new to Docker, I would recommend checking out its documentation for full control over your bot.

docs/docs/index.md

@@ -0,0 +1,29 @@
+# Simple Stock Bots
+
+Simple Stock Bots is a family of messaging bots that aim to provide simple interface to stock market information.
+
+## Getting Started
+
+The bots can either be added to a server or can be direct messaged for the exact same functionality. Links for each platform are below:
+
+[Telegram Bot :fontawesome-brands-telegram:](https://t.me/SimpleStockBot){ .md-button .md-button--primary }
+
+[Discord Bot :fontawesome-brands-discord:](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot){ .md-button .md-button--primary }
+
+Alternatively, this project is completely open source and instructions on how to run your own instance of the bot are provided on each of the bots pages. [Hosting](host.md)
+
+## Usage
+
+The bots are nearly identical between platforms, but sometimes a platform will have a feature that only it supports such as Telegrams inline messaging or Discords embeds. For full information see [Commands](commands.md)
+
+## Source Code
+
+The source code for the bots is completely open and hosted on GitLab. The project is licensed with an MIT License which is incredibly permissive. [The full text of the license can be read here](./LICENSE)
+
+- [Telegram Bot Source](https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot)
+- [Discord Bot Source](https://gitlab.com/simple-stock-bots/simple-discord-stock-bot)
+
+If you decide to host your own bots using my source code please consider using my referral links for marketdata.app and DigitalOcean. We both get a kickback when you use them.
+
+- [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
+- [matketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)

docs/docs/stylesheets/phone.css

@@ -0,0 +1,40 @@
+/* https://codepen.io/RG/pen/bdfDI */
+.phone {
+  background: none repeat scroll 0 0 #fff;
+  /*border-left: 1px solid #ccc;
+      border-right: 1px solid #ccc;*/
+  color: #ffffff;
+  font-family: sans-serif;
+  line-height: 20px;
+  width: 80%;
+  margin: 0 auto;
+  overflow-x: hidden;
+  position: relative;
+  border-radius: 10px;
+  margin: 50px;
+}
+.messages-wrapper {
+  position: relative;
+}
+.message {
+  margin: 10px;
+  padding: 15px 20px;
+  position: relative;
+  overflow-x: auto;
+}
+.message.to {
+  border-radius: 20px 0px 20px 20px;
+  background-color: #2095fe;
+  color: #fff;
+  margin-left: 20%;
+}
+.message.from {
+  border-radius: 20px 20px 20px 0px;
+  background-color: #e5e4e9;
+  color: #363636;
+  margin-right: 20%;
+}
+.message.to + .message.to,
+.message.from + .message.from {
+  margin-top: -7px;
+}

docs/mkdocs.yml

@@ -0,0 +1,74 @@
+site_name: Simple Stock Bot Docs
+site_url: https://docs.simplestockbot.com
+edit_uri: /simple-stock-bots/site/tree/master/docs
+repo_url: https://gitlab.com/simple-stock-bots
+repo_name: Simple Stock Bots
+
+site_description: Simple Discord and Telegram chat bots for Stock Market Data.
+site_author: Anson Biggs
+copyright: <a href="https://ansonbiggs.com">Anson Biggs</a> 2018 </br> Available Under an <a href="/LICENSE/">MIT LICENSE</a> </br>
+
+
+nav:
+  - Home: index.md
+  - Commands: commands.md
+  - Hosting: host.md
+  - Donate: donate.md
+  - Contact: contact.md
+
+theme:
+  name: material
+  language: en
+  features:
+    - navigation.instant
+    - navigation.tracking
+    - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.footer
+  icon:
+    logo: material/robot-love
+  palette:
+    - media: "(prefers-color-scheme: light)"
+      primary: green
+      scheme: default
+      toggle:
+        icon: material/lightbulb-outline
+        name: Switch to dark mode
+    - media: "(prefers-color-scheme: dark)"
+      primary: green
+      scheme: slate
+      toggle:
+        icon: material/lightbulb
+        name: Switch to light mode
+
+extra:
+  social:
+    - icon: fontawesome/solid/house
+      link: https://simplestockbot.com/
+    - icon: fontawesome/brands/telegram
+      link: https://t.me/SimpleStockBot
+      name: Get the Telegram bot
+    - icon: fontawesome/brands/discord
+      link: https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot
+      name: Get the Discord Bot
+    - icon: material/chart-line-stacked
+      link: https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo
+      name: MarketData.app for stock data
+
+
+
+
+extra_css:
+  - stylesheets/phone.css
+
+
+plugins:
+  - search
+  - social
+
+
+markdown_extensions:
+- attr_list
+- pymdownx.emoji:
+    emoji_index: !!python/name:materialx.emoji.twemoji
+    emoji_generator: !!python/name:materialx.emoji.to_svg

docs/requirements.txt

@@ -0,0 +1,5 @@
+mkdocs-material==9.4.4
+
+# Required for Social Cards
+Pillow==10.0.1
+CairoSVG==2.7.1

pyproject.toml

@@ -1,8 +1,11 @@
-[tool.black]
+[tool.black]
-line-length = 130
+line-length = 130
-
+
-[tool.flake8]
+[tool.flake8]
-max-line-length = 130
+max-line-length = 130
-
+
-[tool.pycodestyle]
+[tool.pycodestyle]
-max_line_length = 130
+max_line_length = 130
+
+[tool.ruff]
+line-length = 130

requirements.txt

@@ -1,7 +0,0 @@
-python-telegram-bot==13.5
-requests==2.25.1
-pandas==2.0.0
-schedule==1.0.0
-mplfinance==0.12.7a5
-markdownify==0.6.5
-cachetools==4.2.2

telegram/Dockerfile

@@ -0,0 +1,22 @@
+FROM python:3.11-buster AS builder
+
+
+COPY telegram/telegram-reqs.txt .
+COPY common/requirements.txt .
+
+RUN pip install --user -r telegram-reqs.txt
+
+
+FROM python:3.11-slim
+
+ENV MPLBACKEND=Agg
+
+COPY --from=builder /root/.local /root/.local
+
+
+COPY common common
+COPY telegram .
+
+
+
+CMD [ "python", "./bot.py" ]

telegram/T_info.py

@@ -0,0 +1,70 @@
+"""Functions and Info specific to the Telegram Bot
+"""
+
+import re
+
+import requests as r
+
+
+class T_info:
+    license = re.sub(
+        r"\b\n",
+        " ",
+        r.get("https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot/-/raw/master/LICENSE").text,
+    )
+
+    help_text = """
+Appreciate this bot? Show support by [buying me a beer](https://www.buymeacoffee.com/Anson) 🍻.
+
+Want stock data or to host your own bot? Help keep this bot free by using my
+[affiliate link](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
+
+📢 Stay updated on the bot's Telegram: https://t.me/simplestockbotnews.
+
+**Guide**: All about using and setting up the bot is in the [docs](https://docs.simplestockbot.com).
+
+The bot recognizes _"Symbols"_. `$` for stocks and `$$` for cryptos. Example:
+- `/chart $$eth` gets a month's Ethereum chart.
+- `/dividend $psec` shows Prospect Capital's dividend info.
+
+Mention a symbol, and the bot reveals its price.
+E.g., `What's $$btc's price since $tsla accepts it?` gives Bitcoin and Tesla prices.
+
+**Commands**
+- `/donate [USD]`: Support the bot. 🎗️
+- `/intra $[symbol]`: Today's stock activity. 📈
+- `/chart $[symbol]`: Past month's stock chart. 📊
+- `/trending`: What's hot in stocks and cryptos. 💬
+- `/help`: Bot assistance. 🆘
+
+**Inline Features**
+Search with @SimpleStockBot `[query]` anywhere.
+Pick a ticker, and the bot shares the current price in chat. Note: Prices can lag by an hour.
+
+Data thanks to [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
+
+Bot issues? Use `/status` or [contact us](https://docs.simplestockbot.com/contact).
+
+    """
+
+    donate_text = """
+Support Simple Stock Bot through [donations](https://www.buymeacoffee.com/Anson).
+All funds help maintain servers, with data from
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
+
+**How to Donate?**
+1. Use `/donate [amount in USD]`. E.g., `/donate 2` donates 2 USD.
+2. Or, quickly donate at [buymeacoffee](https://www.buymeacoffee.com/Anson). No account needed, accepts Paypal & Credit card.
+
+For questions, visit our [website](https://docs.simplestockbot.com).
+"""
+
+
+# Not used by the bot but for updating commands with BotFather
+commands = """
+donate - Donate to the bot 🎗️
+help - Get some help using the bot. 🆘
+trending - Trending Stocks and Cryptos. 💬
+intra - $[symbol] Plot since the last market open. 📈
+chart - $[chart] Plot of the past month. 📊
+"""

telegram/bot.py

@@ -1,449 +1,457 @@
-# Works with Python 3.8
+# Works with Python 3.8
-import datetime
+import datetime
-import html
+import html
-import io
+import io
-import json
+import json
-import logging
+import logging
-import os
+import os
-import random
+import random
-import string
+import string
-import traceback
+import traceback
-import logging as log
+from uuid import uuid4
-from uuid import uuid4
+
-
+import mplfinance as mpf
-import mplfinance as mpf
+import telegram
-import telegram
+from telegram import (
-from telegram import (
+    InlineQueryResultArticle,
-    InlineQueryResultArticle,
+    InputTextMessageContent,
-    InputTextMessageContent,
+    LabeledPrice,
-    LabeledPrice,
+    Update,
-    Update,
+)
-)
+
-from telegram.ext import (
+from telegram.ext import (
-    CallbackContext,
+    Application,
-    CommandHandler,
+    CommandHandler,
-    Filters,
+    InlineQueryHandler,
-    InlineQueryHandler,
+    PreCheckoutQueryHandler,
-    MessageHandler,
+    MessageHandler,
-    PreCheckoutQueryHandler,
+    filters,
-    Updater,
+    ContextTypes,
-)
+)
-
+
-from symbol_router import Router
+from common.symbol_router import Router
-from T_info import T_info
+from T_info import T_info
-
+
-TELEGRAM_TOKEN = os.environ["TELEGRAM"]
+# Enable logging
-
+logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
-try:
+
-    STRIPE_TOKEN = os.environ["STRIPE"]
+# set higher logging level for httpx to avoid all GET and POST requests being logged
-except KeyError:
+logging.getLogger("httpx").setLevel(logging.WARNING)
-    STRIPE_TOKEN = ""
+
-    log.warning("Starting without a STRIPE Token will not allow you to accept Donations!")
+log = logging.getLogger(__name__)
-
+
-s = Router()
+TELEGRAM_TOKEN = os.environ["TELEGRAM"]
-t = T_info()
+
-
+try:
-# Enable logging
+    STRIPE_TOKEN = os.environ["STRIPE"]
-logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
+except KeyError:
-
+    STRIPE_TOKEN = ""
-logger = logging.getLogger(__name__)
+    log.warning("Starting without a STRIPE Token will not allow you to accept Donations!")
-log.info("Bot script started.")
+
-
+s = Router()
-
+t = T_info()
-def start(update: Update, context: CallbackContext):
+
-    """Send help text when the command /start is issued."""
+
-    log.info(f"Start command ran by {update.message.chat.username}")
+log.info("Bot script started.")
-    update.message.reply_text(
+
-        text=t.help_text,
+
-        parse_mode=telegram.ParseMode.MARKDOWN,
+async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-        disable_notification=True,
+    """Send help text when the command /start is issued."""
-    )
+    log.info(f"Start command ran by {update.message.chat.username}")
-
+    await update.message.reply_text(
-
+        text=t.help_text,
-def help(update: Update, context: CallbackContext):
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    """Send help text when the command /help is issued."""
+        disable_notification=True,
-    log.info(f"Help command ran by {update.message.chat.username}")
+    )
-    update.message.reply_text(
+
-        text=t.help_text,
+
-        parse_mode=telegram.ParseMode.MARKDOWN,
+async def help(update: Update, context: ContextTypes.DEFAULT_TYPE):
-        disable_notification=True,
+    """Send help text when the command /help is issued."""
-    )
+    log.info(f"Help command ran by {update.message.chat.username}")
-
+    await update.message.reply_text(
-
+        text=t.help_text,
-def license(update: Update, context: CallbackContext):
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    """Send bots license when the /license command is issued."""
+        disable_notification=True,
-    log.info(f"License command ran by {update.message.chat.username}")
+    )
-    update.message.reply_text(
+
-        text=t.license,
+
-        parse_mode=telegram.ParseMode.MARKDOWN,
+async def license(update: Update, context: ContextTypes.DEFAULT_TYPE):
-        disable_notification=True,
+    """Send bots license when the /license command is issued."""
-    )
+    log.info(f"License command ran by {update.message.chat.username}")
-
+    await update.message.reply_text(
-
+        text=t.license,
-def status(update: Update, context: CallbackContext):
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    """Gather status of bot and dependant services and return important status updates."""
+        disable_notification=True,
-    log.warning(f"Status command ran by {update.message.chat.username}")
+    )
-    bot_resp_time = datetime.datetime.now(update.message.date.tzinfo) - update.message.date
+
-
+
-    bot_status = s.status(f"It took {bot_resp_time.total_seconds()} seconds for the bot to get your message.")
+async def status(update: Update, context: ContextTypes.DEFAULT_TYPE):
-
+    """Gather status of bot and dependant services and return important status updates."""
-    update.message.reply_text(
+    log.warning(f"Status command ran by {update.message.chat.username}")
-        text=bot_status,
+    bot_resp_time = datetime.datetime.now(update.message.date.tzinfo) - update.message.date
-        parse_mode=telegram.ParseMode.MARKDOWN,
+
-    )
+    bot_status = s.status(f"It took {bot_resp_time.total_seconds()} seconds for the bot to get your message.")
-
+
-
+    await update.message.reply_text(
-def donate(update: Update, context: CallbackContext):
+        text=bot_status,
-    """Sets up donation."""
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    log.info(f"Donate command ran by {update.message.chat.username}")
+    )
-    chat_id = update.message.chat_id
+
-
+
-    if update.message.text.strip() == "/donate" or "/donate@" in update.message.text:
+async def donate(update: Update, context: ContextTypes.DEFAULT_TYPE):
-        update.message.reply_text(
+    """Sets up donation."""
-            text=t.donate_text,
+    log.info(f"Donate command ran by {update.message.chat.username}")
-            parse_mode=telegram.ParseMode.MARKDOWN,
+    chat_id = update.message.chat_id
-            disable_notification=True,
+
-        )
+    if update.message.text.strip() == "/donate" or "/donate@" in update.message.text:
-        amount = 1.0
+        await update.message.reply_text(
-    else:
+            text=t.donate_text,
-        amount = float(update.message.text.replace("/donate", "").replace("$", "").strip())
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
-
+            disable_notification=True,
-    try:
+        )
-        price = int(amount * 100)
+        amount = 1.0
-    except ValueError:
+    else:
-        update.message.reply_text(f"{amount} is not a valid donation amount or number.")
+        amount = float(update.message.text.replace("/donate", "").replace("$", "").strip())
-        return
+
-    log.info(f"Donation amount: {price} by {update.message.chat.username}")
+    try:
-
+        price = int(amount * 100)
-    context.bot.send_invoice(
+    except ValueError:
-        chat_id=chat_id,
+        await update.message.reply_text(f"{amount} is not a valid donation amount or number.")
-        title="Simple Stock Bot Donation",
+        return
-        description=f"Simple Stock Bot Donation of ${amount} by {update.message.chat.username}",
+    log.info(f"Donation amount: {price} by {update.message.chat.username}")
-        payload=f"simple-stock-bot-{chat_id}",
+
-        provider_token=STRIPE_TOKEN,
+    await context.bot.send_invoice(
-        currency="USD",
+        chat_id=chat_id,
-        prices=[LabeledPrice("Donation:", price)],
+        title="Simple Stock Bot Donation",
-        start_parameter="",
+        description=f"Simple Stock Bot Donation of ${amount} by {update.message.chat.username}",
-        # suggested_tip_amounts=[100, 500, 1000, 2000],
+        payload=f"simple-stock-bot-{chat_id}",
-        photo_url="https://simple-stock-bots.gitlab.io/docs/img/Telegram.png",
+        provider_token=STRIPE_TOKEN,
-        photo_width=500,
+        currency="USD",
-        photo_height=500,
+        prices=[LabeledPrice("Donation:", price)],
-    )
+        start_parameter="",
-
+        # suggested_tip_amounts=[100, 500, 1000, 2000],
-
+        photo_url="https://simple-stock-bots.gitlab.io/docs/img/Telegram.png",
-def precheckout_callback(update: Update, context: CallbackContext):
+        photo_width=500,
-    """Approves donation"""
+        photo_height=500,
-    log.info("precheckout_callback queried")
+    )
-    query = update.pre_checkout_query
+
-
+
-    query.answer(ok=True)
+async def precheckout_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    # I dont think I need to check since its only donations.
+    """Approves donation"""
-    # if query.invoice_payload == "simple-stock-bot":
+    log.info("precheckout_callback queried")
-    #     # answer False pre_checkout_query
+    query = update.pre_checkout_query
-    #     query.answer(ok=True)
+
-    # else:
+    await query.answer(ok=True)
-    #     query.answer(ok=False, error_message="Something went wrong...")
+    # I dont think I need to check since its only donations.
-
+    # if query.invoice_payload == "simple-stock-bot":
-
+    #     # answer False pre_checkout_query
-def successful_payment_callback(update: Update, context: CallbackContext):
+    #     await query.answer(ok=True)
-    """Thanks user for donation"""
+    # else:
-    log.info("Successful payment!")
+    #     await query.answer(ok=False, error_message="Something went wrong...")
-    update.message.reply_text("Thank you for your donation! It goes a long way to keeping the bot free!")
+
-
+
-
+async def successful_payment_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
-def symbol_detect_image(update: Update, context: CallbackContext):
+    """Thanks user for donation"""
-    """
+    log.info("Successful payment!")
-    Makes image captions into text then passes the `update` and `context`
+    await update.message.reply_text("Thank you for your donation! It goes a long way to keeping the bot free!")
-        to symbol detect so that it can reply cashtags in image captions.
+
-    """
+
-    if update.message.caption:
+async def symbol_detect_image(update: Update, context: ContextTypes.DEFAULT_TYPE):
-        update.message.text = update.message.caption
+    """
-        symbol_detect(update, context)
+    Makes image captions into text then passes the `update` and `context`
-
+        to symbol detect so that it can reply cashtags in image captions.
-
+    """
-def symbol_detect(update: Update, context: CallbackContext):
+    try:
-    """
+        if update.message.caption:
-    Runs on any message that doesn't have a command and searches for cashtags,
+            update.message.text = update.message.caption
-        then returns the prices of any symbols found.
+            await symbol_detect(update, context)
-    """
+    except AttributeError:
-    try:
+        return
-        message = update.message.text
+
-        chat_id = update.message.chat_id
+
-        if "$" in message:
+async def symbol_detect(update: Update, context: ContextTypes.DEFAULT_TYPE):
-            symbols = s.find_symbols(message)
+    """
-            log.info("Looking for Symbols")
+    Runs on any message that doesn't have a command and searches for cashtags,
-        else:
+        then returns the prices of any symbols found.
-            return
+    """
-    except AttributeError as ex:
+    try:
-        log.info(ex)
+        message = update.message.text
-        return
+        chat_id = update.message.chat_id
-    if symbols:
+        if "$" in message:
-        # Let user know bot is working
+            symbols = s.find_symbols(message)
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
+            log.info("Looking for Symbols")
-        log.info(f"Symbols found: {symbols}")
+        else:
-
+            return
-        for reply in s.price_reply(symbols):
+    except AttributeError as ex:
-            update.message.reply_text(
+        log.info(ex)
-                text=reply,
+        return
-                parse_mode=telegram.ParseMode.MARKDOWN,
+    if symbols:
-                disable_notification=True,
+        # Let user know bot is working
-            )
+        await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
-
+        log.info(f"Symbols found: {symbols}")
-
+
-def intra(update: Update, context: CallbackContext):
+        for reply in s.price_reply(symbols):
-    """returns a chart of intraday data for a symbol"""
+            await update.message.reply_text(
-    log.info(f"Intra command ran by {update.message.chat.username}")
+                text=reply,
-
+                parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    message = update.message.text
+                disable_notification=True,
-    chat_id = update.message.chat_id
+            )
-
+
-    if message.strip().split("@")[0] == "/intra":
+
-        update.message.reply_text(
+async def intra(update: Update, context: ContextTypes.DEFAULT_TYPE):
-            "This command returns a chart of the stocks movement since the most recent market open.\nExample: /intra $tsla"
+    """returns a chart of intraday data for a symbol"""
-        )
+    log.info(f"Intra command ran by {update.message.chat.username}")
-        return
+
-
+    message = update.message.text
-    symbols = s.find_symbols(message, trending_weight=5)
+    chat_id = update.message.chat_id
-    symbol = symbols[0]
+
-
+    if message.strip().split("@")[0] == "/intra":
-    if len(symbols):
+        await update.message.reply_text(
-        symbol = symbols[0]
+            "This command returns a chart of the stocks movement since the most recent market open.\nExample: /intra $tsla"
-    else:
+        )
-        update.message.reply_text("No symbols or coins found.")
+        return
-        return
+
-
+    symbols = s.find_symbols(message, trending_weight=5)
-    df = s.intra_reply(symbol)
+    symbol = symbols[0]
-    if df.empty:
+
-        update.message.reply_text(
+    if len(symbols):
-            text="Invalid symbol please see `/help` for usage details.",
+        symbol = symbols[0]
-            parse_mode=telegram.ParseMode.MARKDOWN,
+    else:
-            disable_notification=True,
+        await update.message.reply_text("No symbols or coins found.")
-        )
+        return
-        return
+
-
+    df = s.intra_reply(symbol)
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO)
+    if df.empty:
-
+        await update.message.reply_text(
-    buf = io.BytesIO()
+            text="Invalid symbol please see `/help` for usage details.",
-    mpf.plot(
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
-        df,
+            disable_notification=True,
-        type="renko",
+        )
-        title=f"\n{symbol.name}",
+        return
-        volume="Volume" in df.keys(),
+
-        style="yahoo",
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
-        savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+
-    )
+    buf = io.BytesIO()
-    buf.seek(0)
+    mpf.plot(
-
+        df,
-    update.message.reply_photo(
+        type="renko",
-        photo=buf,
+        title=f"\n{symbol.name}",
-        caption=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
+        volume="Volume" in df.keys(),
-        + f" {df.last_valid_index().strftime('%d %b at %H:%M')}"
+        style="yahoo",
-        + f"\n\n{s.price_reply([symbol])[0]}",
+        savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
-        parse_mode=telegram.ParseMode.MARKDOWN,
+    )
-        disable_notification=True,
+    buf.seek(0)
-    )
+
-
+    await update.message.reply_photo(
-
+        photo=buf,
-def chart(update: Update, context: CallbackContext):
+        caption=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
-    """returns a chart of the past month of data for a symbol"""
+        + f" {df.last_valid_index().strftime('%d %b at %H:%M %Z')}"
-    log.info(f"Chart command ran by {update.message.chat.username}")
+        + f"\n\n{s.price_reply([symbol])[0]}",
-
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    message = update.message.text
+        disable_notification=True,
-    chat_id = update.message.chat_id
+    )
-
+
-    if message.strip().split("@")[0] == "/chart":
+
-        update.message.reply_text(
+async def chart(update: Update, context: ContextTypes.DEFAULT_TYPE):
-            "This command returns a chart of the stocks movement for the past month.\nExample: /chart $tsla"
+    """returns a chart of the past month of data for a symbol"""
-        )
+    log.info(f"Chart command ran by {update.message.chat.username}")
-        return
+
-
+    message = update.message.text
-    symbols = s.find_symbols(message, trending_weight=10)
+    chat_id = update.message.chat_id
-
+
-    if len(symbols):
+    if message.strip().split("@")[0] == "/chart":
-        symbol = symbols[0]
+        await update.message.reply_text(
-    else:
+            "This command returns a chart of the stocks movement for the past month.\nExample: /chart $tsla"
-        update.message.reply_text("No symbols or coins found.")
+        )
-        return
+        return
-
+
-    df = s.chart_reply(symbol)
+    symbols = s.find_symbols(message, trending_weight=10)
-    if df.empty:
+
-        update.message.reply_text(
+    if len(symbols):
-            text="Invalid symbol please see `/help` for usage details.",
+        symbol = symbols[0]
-            parse_mode=telegram.ParseMode.MARKDOWN,
+    else:
-            disable_notification=True,
+        await update.message.reply_text("No symbols or coins found.")
-        )
+        return
-        return
+
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO)
+    df = s.chart_reply(symbol)
-
+    if df.empty:
-    buf = io.BytesIO()
+        await update.message.reply_text(
-    mpf.plot(
+            text="Invalid symbol please see `/help` for usage details.",
-        df,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
-        type="candle",
+            disable_notification=True,
-        title=f"\n{symbol.name}",
+        )
-        volume="Volume" in df.keys(),
+        return
-        style="yahoo",
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
-        savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+
-    )
+    buf = io.BytesIO()
-    buf.seek(0)
+    mpf.plot(
-
+        df,
-    update.message.reply_photo(
+        type="candle",
-        photo=buf,
+        title=f"\n{symbol.name}",
-        caption=f"\n1 Month chart for {symbol.name} from {df.first_valid_index().strftime('%d, %b %Y')}"
+        volume="Volume" in df.keys(),
-        + f" to {df.last_valid_index().strftime('%d, %b %Y')}\n\n{s.price_reply([symbol])[0]}",
+        style="yahoo",
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
-        disable_notification=True,
+    )
-    )
+    buf.seek(0)
-
+
-
+    await update.message.reply_photo(
-def trending(update: Update, context: CallbackContext):
+        photo=buf,
-    """returns currently trending symbols and how much they've moved in the past trading day."""
+        caption=f"\n1 Month chart for {symbol.name} from {df.first_valid_index().strftime('%d, %b %Y')}"
-    log.info(f"Trending command ran by {update.message.chat.username}")
+        + f" to {df.last_valid_index().strftime('%d, %b %Y')}\n\n{s.price_reply([symbol])[0]}",
-
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    chat_id = update.message.chat_id
+        disable_notification=True,
-
+    )
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
+
-
+
-    trending_list = s.trending()
+async def trending(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    log.info(trending_list)
+    """returns currently trending symbols and how much they've moved in the past trading day."""
-
+    log.info(f"Trending command ran by {update.message.chat.username}")
-    update.message.reply_text(
+
-        text=trending_list,
+    chat_id = update.message.chat_id
-        parse_mode=telegram.ParseMode.MARKDOWN,
+
-        disable_notification=True,
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
-    )
+
-
+    trending_list = s.trending()
-
+
-def inline_query(update: Update, context: CallbackContext):
+    await update.message.reply_text(
-    """
+        text=trending_list,
-    Handles inline query. Searches by looking if query is contained
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-        in the symbol and returns matches in alphabetical order.
+        disable_notification=True,
-    """
+    )
-    # info(f"Inline command ran by {update.message.chat.username}")
+
-    log.info(f"Query: {update.inline_query.query}")
+
-
+async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    ignored_queries = {"$", "$$", " ", ""}
+    """
-
+    Handles inline query. Searches by looking if query is contained
-    if update.inline_query.query.strip() in ignored_queries:
+        in the symbol and returns matches in alphabetical order.
-        default_message = """
+    """
-        You can type:\n@SimpleStockBot `[search]`
+
-        in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price.
+    if not update.inline_query.query:
-        """
+        return
-
+
-        update.inline_query.answer(
+    print(f"Query: {update.inline_query.query}")
-            [
+
-                InlineQueryResultArticle(
+    ignored_queries = {"$", "$$", " ", ""}
-                    str(uuid4()),
+
-                    title="Please enter a query. It can be a ticker or a name of a company.",
+    if update.inline_query.query.strip() in ignored_queries:
-                    input_message_content=InputTextMessageContent(default_message, parse_mode=telegram.ParseMode.MARKDOWN),
+        default_message = """
-                )
+        You can type:\n@SimpleStockBot `[search]`
-            ]
+        in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price.
-        )
+        """
-
+
-    matches = s.inline_search(update.inline_query.query)
+        await update.inline_query.answer(
-
+            [
-    results = []
+                InlineQueryResultArticle(
-    for _, row in matches.iterrows():
+                    str(uuid4()),
-        results.append(
+                    title="Please enter a query. It can be a ticker or a name of a company.",
-            InlineQueryResultArticle(
+                    input_message_content=InputTextMessageContent(
-                str(uuid4()),
+                        default_message, parse_mode=telegram.constants.ParseMode.MARKDOWN
-                title=row["description"],
+                    ),
-                input_message_content=InputTextMessageContent(row["price_reply"], parse_mode=telegram.ParseMode.MARKDOWN),
+                )
-            )
+            ]
-        )
+        )
-
+
-        if len(results) == 5:
+    matches = s.inline_search(update.inline_query.query)
-            update.inline_query.answer(results, cache_time=60 * 60)
+
-            log.info("Inline Command was successful")
+    results = []
-            return
+    for _, row in matches.iterrows():
-    update.inline_query.answer(results)
+        results.append(
-
+            InlineQueryResultArticle(
-
+                str(uuid4()),
-def rand_pick(update: Update, context: CallbackContext):
+                title=row["description"],
-    """For the gamblers. Returns a random symbol to buy and a sell date"""
+                input_message_content=InputTextMessageContent(
-    log.info(f"Someone is gambling! Random_pick command ran by {update.message.chat.username}")
+                    row["price_reply"], parse_mode=telegram.constants.ParseMode.MARKDOWN
-
+                ),
-    update.message.reply_text(
+            )
-        text=s.random_pick(),
+        )
-        parse_mode=telegram.ParseMode.MARKDOWN,
+
-        disable_notification=True,
+        if len(results) == 5:
-    )
+            await update.inline_query.answer(results, cache_time=60 * 60)
-
+            log.info("Inline Command was successful")
-
+            return
-def error(update: Update, context: CallbackContext):
+    await update.inline_query.answer(results)
-    """Log Errors caused by Updates."""
+
-    log.warning('Update "%s" caused error "%s"', update, error)
+
-
+async def rand_pick(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    tb_list = traceback.format_exception(None, context.error, context.error.__traceback__)
+    """For the gamblers. Returns a random symbol to buy and a sell date"""
-    tb_string = "".join(tb_list)
+    log.info(f"Someone is gambling! Random_pick command ran by {update.message.chat.username}")
-
+
-    err_code = "".join([random.choice(string.ascii_lowercase) for i in range(5)])
+    await update.message.reply_text(
-    log.warning(f"Logging error: {err_code}")
+        text=s.random_pick(),
-
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
-    if update:
+        disable_notification=True,
-        message = (
+    )
-            f"An exception was raised while handling an update\n"
+
-            f"<pre>update = {html.escape(json.dumps(update.to_dict(), indent=2, ensure_ascii=False))}"
+
-            "</pre>\n\n"
+async def error(update: Update, context: ContextTypes.DEFAULT_TYPE):
-            f"<pre>context.chat_data = {html.escape(str(context.chat_data))}</pre>\n\n"
+    """Log Errors caused by Updates."""
-            f"<pre>context.user_data = {html.escape(str(context.user_data))}</pre>\n\n"
+    log.warning('Update "%s" caused error "%s"', update, error)
-            f"<pre>{html.escape(tb_string)}</pre>"
+
-        )
+    tb_list = traceback.format_exception(None, context.error, context.error.__traceback__)
-        log.warning(message)
+    tb_string = "".join(tb_list)
-    else:
+
-        log.warning(tb_string)
+    err_code = "".join([random.choice(string.ascii_lowercase) for i in range(5)])
-
+    log.warning(f"Logging error: {err_code}")
-    update.message.reply_text(
+
-        text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
+    if update:
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        log.warning(
-    )
+            f"An exception was raised while handling an update\n"
-
+            f"\tupdate = {html.escape(json.dumps(update.to_dict(), indent=2, ensure_ascii=False))}\n"
-
+            f"\tcontext.chat_data = {str(context.chat_data)}\n"
-def main():
+            f"\tcontext.user_data = {str(context.user_data)}\n"
-    """Start the context.bot."""
+            f"\t{html.escape(tb_string)}"
-    # Create the EventHandler and pass it your bot's token.
+        )
-    updater = Updater(TELEGRAM_TOKEN)
+
-
+        await update.message.reply_text(
-    # Get the dispatcher to register handlers
+            text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
-    dp = updater.dispatcher
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
-
+        )
-    # on different commands - answer in Telegram
+    else:
-    dp.add_handler(CommandHandler("start", start))
+        log.warning("No message to send to user.")
-    dp.add_handler(CommandHandler("help", help))
+        log.warning(tb_string)
-    dp.add_handler(CommandHandler("license", license))
+
-    dp.add_handler(CommandHandler("trending", trending))
+
-    dp.add_handler(CommandHandler("random", rand_pick))
+def main():
-    dp.add_handler(CommandHandler("donate", donate))
+    """Start the context.bot."""
-    dp.add_handler(CommandHandler("status", status))
+    # Create the EventHandler and pass it your bot's token.
-    dp.add_handler(CommandHandler("inline", inline_query))
+    application = Application.builder().token(TELEGRAM_TOKEN).build()
-
+
-    # Charting can be slow so they run async.
+    # on different commands - answer in Telegram
-    dp.add_handler(CommandHandler("intra", intra, run_async=True))
+    application.add_handler(CommandHandler("start", start))
-    dp.add_handler(CommandHandler("intraday", intra, run_async=True))
+    application.add_handler(CommandHandler("help", help))
-    dp.add_handler(CommandHandler("day", intra, run_async=True))
+    application.add_handler(CommandHandler("license", license))
-    dp.add_handler(CommandHandler("chart", chart, run_async=True))
+    application.add_handler(CommandHandler("trending", trending))
-    dp.add_handler(CommandHandler("month", chart, run_async=True))
+    application.add_handler(CommandHandler("random", rand_pick))
-
+    application.add_handler(CommandHandler("donate", donate))
-    # on noncommand i.e message - echo the message on Telegram
+    application.add_handler(CommandHandler("status", status))
-    dp.add_handler(MessageHandler(Filters.text, symbol_detect))
+    application.add_handler(CommandHandler("inline", inline_query))
-    dp.add_handler(MessageHandler(Filters.photo, symbol_detect_image))
+
-
+    # Charting can be slow so they run async.
-    # Inline Bot commands
+    application.add_handler(CommandHandler("intra", intra, block=False))
-    dp.add_handler(InlineQueryHandler(inline_query))
+    application.add_handler(CommandHandler("intraday", intra, block=False))
-
+    application.add_handler(CommandHandler("day", intra, block=False))
-    # Pre-checkout handler to final check
+    application.add_handler(CommandHandler("chart", chart, block=False))
-    dp.add_handler(PreCheckoutQueryHandler(precheckout_callback))
+    application.add_handler(CommandHandler("month", chart, block=False))
-
+
-    # Payment success
+    # on noncommand i.e message - echo the message on Telegram
-    dp.add_handler(MessageHandler(Filters.successful_payment, successful_payment_callback))
+    application.add_handler(MessageHandler(filters.TEXT, symbol_detect))
-
+    application.add_handler(MessageHandler(filters.PHOTO, symbol_detect_image))
-    # log all errors
+
-    dp.add_error_handler(error)
+    # Inline Bot commands
-
+    application.add_handler(InlineQueryHandler(inline_query))
-    # Start the Bot
+
-    updater.start_polling()
+    # Pre-checkout handler to final check
-
+    application.add_handler(PreCheckoutQueryHandler(precheckout_callback))
-    updater.idle()
+
-
+    # Payment success
-
+    application.add_handler(MessageHandler(filters.SUCCESSFUL_PAYMENT, successful_payment_callback))
-if __name__ == "__main__":
+
-    main()
+    # log all errors
+    application.add_error_handler(error)
+
+    # Start the Bot
+    application.run_polling(allowed_updates=Update.ALL_TYPES)
+
+
+if __name__ == "__main__":
+    main()

telegram/telegram-reqs.txt

@@ -0,0 +1,2 @@
+python-telegram-bot==20.5
+-r requirements.txt

tests.py

@@ -1,33 +1,33 @@
-import keyboard
+import keyboard
-import time
+import time
-
+
-
+
-tests = """$$xno
+tests = """$$xno
-/info $tsla
+/info $tsla
-/info $$btc
+/info $$btc
-/news $tsla
+/news $tsla
-/news $$btc
+/news $$btc
-/stat $tsla
+/stat $tsla
-/stat $$btc
+/stat $$btc
-/cap $tsla
+/cap $tsla
-/cap $$btc
+/cap $$btc
-/dividend $tsla
+/dividend $tsla
-/dividend $msft
+/dividend $msft
-/dividend $$btc
+/dividend $$btc
-/intra $tsla
+/intra $tsla
-/intra $$btc
+/intra $$btc
-/chart $tsla
+/chart $tsla
-/chart $$btc
+/chart $$btc
-/help
+/help
-/trending""".split(
+/trending""".split(
-    "\n"
+    "\n"
-)
+)
-
+
-print("press enter to start")
+print("press enter to start")
-keyboard.wait("enter")
+keyboard.wait("enter")
-
+
-for test in tests:
+for test in tests:
-    print(test)
+    print(test)
-    keyboard.write(test)
+    keyboard.write(test)
-    time.sleep(1)
+    time.sleep(1)
-    keyboard.press_and_release("enter")
+    keyboard.press_and_release("enter")