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 requirements.txt /requirements.txt
-RUN pip install --user -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 MARKETDATA=TOKEN
 
 COPY . .
 
-# CMD [ "python", "./bot.py" ]
+# RUN pip install -r requirements.txt

.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": {},
+    "ghcr.io/devcontainers-contrib/features/mypy:2": {},
+    "ghcr.io/devcontainers-contrib/features/pylint:2": {},
+    "ghcr.io/devcontainers/features/docker-in-docker": {}
+  },
+  "customizations": {
+    "vscode": {
       "extensions": [
 		"ms-python.python",
-		"ms-azuretools.vscode-docker"
+		"ms-python.black-formatter",
+		"ms-python.flake8",
+		"ms-python.vscode-pylance",
+		"ms-python.isort",
+		"charliermarsh.ruff"
 	]
+    }
+  },
+  "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": [],
-	// Uncomment the next line to run commands after the container is created - for example installing curl.
+  // Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+  // "postCreateCommand": "pip3 install --user -r requirements.txt",
-	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+  // Configure tool-specific properties.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+  // "customizations": {},
-	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+  // "remoteUser": "root"
-	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
-	// "remoteUser": "vscode"
 }

.gitlab-ci.yml

@@ -1,5 +1,21 @@
+stages:
+  - lint
+  - deploy
+
 black:
-  # stage: .pre
+  stage: lint
   image: registry.gitlab.com/pipeline-components/black:latest
   script:
     - black --check --verbose -- .
+
+ruff:
+  stage: lint
+  # image: registry.gitlab.com/pipeline-components/ruff:latest
+  image: python:3.11-slim
+  script:
+    - pip3 install ruff
+    - ruff --output-format gitlab .
+
+
+include:
+  - local: /docs/.gitlab-ci.yml

.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",
+    }
 }

common/MarketData.py

@@ -103,7 +103,7 @@ class MarketData:
             )
             status.raise_for_status()
         except r.HTTPError:
-            return f"API returned an HTTP error code {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+            return f"API returned an HTTP error code {status.status_code} in {status.elapsed.total_seconds()} seconds."
         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."
 
@@ -111,7 +111,7 @@ class MarketData:
 
         if statusJSON["status"] == "ok":
             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."
             )
         else:
             return f"MarketData.app is currently reporting the following status: {statusJSON['status']}"
@@ -131,7 +131,11 @@ class MarketData:
 
         if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
             price = round(quoteResp["last"][0], 2)
+
+            try:
                 changePercent = round(quoteResp["changepct"][0], 2)
+            except TypeError:
+                return f"The price of {symbol} is {price}"
 
             message = f"The current price of {symbol.name} is ${price} and "
 
@@ -148,10 +152,12 @@ class MarketData:
 
     def spark_reply(self, symbol: Stock) -> str:
         if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
+            try:
                 changePercent = round(quoteResp["changepct"][0], 2)
                 return f"`{symbol.tag}`: {changePercent}%"
-        else:
+            except TypeError:
-            logging.warning(f"{symbol} did not have 'changepct' field.")
+                pass
+
         return f"`{symbol.tag}`"
 
     def intra_reply(self, symbol: Stock) -> pd.DataFrame:

common/cg_Crypto.py

@@ -77,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

@@ -123,7 +123,8 @@ class Router:
             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 = self.crypto.symbol_list
 
         df = df[df["description"].str.contains(search, regex=False, case=False)].sort_values(
             by="type_id", key=lambda x: x.str.len()
@@ -338,8 +339,8 @@ class Router:
                 reply += self.spark_reply(self.find_symbols(t))[0] + "\n"
 
         if coins:
-            reply += "\n\n🦎Trending Crypto:\n`"
+            reply += "\n\n🦎Trending on CoinGecko:\n`"
-            reply += "━" * len("Trending Crypto:") + "`\n"
+            reply += "━" * len("Trending on CoinGecko:") + "`\n"
             for coin in coins:
                 reply += coin + "\n"
 
@@ -353,7 +354,8 @@ class Router:
             return "Trending data is not currently available."
 
     def random_pick(self) -> str:
-        choice = random.choice(list(self.stock.symbol_list["description"]) + list(self.crypto.symbol_list["description"]))
+        # choice = random.choice(list(self.stock.symbol_list["description"]) + list(self.crypto.symbol_list["description"]))
+        choice = random.choice(list(self.crypto.symbol_list["description"]))
         hold = (datetime.date.today() + datetime.timedelta(random.randint(1, 365))).strftime("%b %d, %Y")
 
         return f"{choice}\nBuy and hold until: {hold}"

dev-reqs.txt

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

discord/D_info.py

@@ -14,52 +14,46 @@ class D_info:
     )
 
     help_text = """
-Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
+Thanks for using this bot. If you like it, [support me with a beer](https://www.buymeacoffee.com/Anson). 🍻
 
-If you are interested in stock market data, or want to host your own bot, be sure to use my affiliate link so that the bot can stay free: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord)
+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).
 
-Keep up with the latest news for the bot in its discord Channel: https://t.me/simplestockbotnews
+**Updates**: Join the bot's discord: 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)
+**Documentation**: All details about the bot are at [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.
+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.
 
-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. 
+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 [amount in USD]` to donate. 🎗️
+- `/donate [USD amount]`: Support the bot. 🎗️
-        - `/intra $[symbol]` Plot of the stocks movement since the last market open.  📈
+- `/intra $[symbol]`: See stock's latest movement. 📈
-        - `/chart $[symbol]` Plot of the stocks movement for the past 1 month. 📊
+- `/chart $[symbol]`: View a month's stock activity. 📊
-        - `/trending` Trending Stocks and Cryptos. 💬
+- `/trending`: Check trending stocks and cryptos. 💬
-        - `/help` Get some help using the bot. 🆘
+- `/help`: Need help? Ask here. 🆘
 
 **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.
+Type @SimpleStockBot `[search]` anywhere to find and get stock/crypto prices. Note: Prices might be delayed up to an hour.
 
-    Market data is provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord)
+Data from: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
 
-    If you believe the bot is not behaving properly run `/status` or [get in touch](https://docs.simplestockbot.com/contact).
+Issues with the bot? Use `/status` or [contact us](https://docs.simplestockbot.com/contact).
     """
 
     donate_text = """
-Simple Stock Bot is run entirely on donations[.](https://www.buymeacoffee.com/Anson)
+Simple Stock Bot runs purely on [donations.](https://www.buymeacoffee.com/Anson)
-All donations go directly towards paying for servers, and market data is provided by
+Every donation supports server costs and
-[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord) provides our data.
 
-The easiest way to donate is to run the `/donate [amount in USD]` command with US dollars you would like to donate.
+**How to Donate?**
-
+1. Use `/donate [amount in USD]` command.
-Example: `/donate 2` would donate 2 USD.
+   - E.g., `/donate 2` donates 2 USD.
-
+2. Or, donate at [buymeacoffee](https://www.buymeacoffee.com/Anson).
-An alternative way to donate is through https://www.buymeacoffee.com/Anson which requires no account and accepts Paypal or Credit card.
+    - It's quick, doesn't need an account, and accepts Paypal or Credit card.
-If you have any questions see the [website](https://docs.simplestockbot.com)
 
-    """
+Questions? Visit our [website](https://docs.simplestockbot.com).
-
-
-commands = """ # Not used by the bot but for updating commands with BotFather
-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. 📊
 """

discord/Dockerfile

@@ -1,9 +1,10 @@
 FROM python:3.11-buster AS builder
 
 
-COPY discord/requirements.txt .
+COPY discord/discord-reqs.txt .
+COPY common/requirements.txt .
 
-RUN pip install --user -r requirements.txt
+RUN pip install --user -r discord-reqs.txt
 
 
 FROM python:3.11-slim

discord/bot.py

@@ -42,7 +42,7 @@ async def status(ctx: commands):
     message = ""
     try:
         message = "Contact MisterBiggs#0465 if you need help.\n"
-        message += s.status(f"Bot recieved your message in: {bot.latency*1000:.4f}ms") + "\n"
+        message += s.status(f"Bot recieved your message in: {bot.latency*10:.4f} seconds") + "\n"
 
     except Exception as ex:
         logging.critical(ex)

discord/discord-reqs.txt

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

discord/requirements.txt

@@ -1,7 +0,0 @@
-nextcord==2.4.2
-requests==2.25.1
-pandas==2.0.0
-schedule==1.0.0
-mplfinance==0.12.7a5
-markdownify==0.6.5
-cachetools==4.2.2

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

@@ -6,3 +6,6 @@ max-line-length = 130
 
 [tool.pycodestyle]
 max_line_length = 130
+
+[tool.ruff]
+line-length = 130

telegram/Dockerfile

@@ -1,9 +1,10 @@
 FROM python:3.11-buster AS builder
 
 
-COPY telegram/requirements.txt .
+COPY telegram/telegram-reqs.txt .
+COPY common/requirements.txt .
 
-RUN pip install --user -r requirements.txt
+RUN pip install --user -r telegram-reqs.txt
 
 
 FROM python:3.11-slim

telegram/T_info.py

@@ -14,49 +14,54 @@ class T_info:
     )
 
     help_text = """
-Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
+Appreciate this bot? Show support by [buying me a beer](https://www.buymeacoffee.com/Anson) 🍻.
 
-If you are interested in stock market data, or want to host your own bot, be sure to use my affiliate link so that the bot can stay free: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram)
+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).
 
-Keep up with the latest news for the bot in its Telegram Channel: https://t.me/simplestockbotnews
+📢 Stay updated on the bot's Telegram: 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)
+**Guide**: All about using and setting up the bot is in the [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.
+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.
 
-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. 
+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 [amount in USD]` to donate. 🎗️
+- `/donate [USD]`: Support the bot. 🎗️
-        - `/intra $[symbol]` Plot of the stocks movement since the last market open.  📈
+- `/intra $[symbol]`: Today's stock activity. 📈
-        - `/chart $[symbol]` Plot of the stocks movement for the past 1 month. 📊
+- `/chart $[symbol]`: Past month's stock chart. 📊
-        - `/trending` Trending Stocks and Cryptos. 💬
+- `/trending`: What's hot in stocks and cryptos. 💬
-        - `/help` Get some help using the bot. 🆘
+- `/help`: Bot assistance. 🆘
 
 **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.
+Search with @SimpleStockBot `[query]` anywhere.
+Pick a ticker, and the bot shares the current price in chat. Note: Prices can lag by an hour.
 
-    Market data is provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram)
+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).
 
-    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)
+Support Simple Stock Bot through [donations](https://www.buymeacoffee.com/Anson).
-All donations go directly towards paying for servers, and market data is provided by
+All funds help maintain servers, with data from
 [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
 
-The easiest way to donate is to run the `/donate [amount in USD]` command with US dollars you would like to donate.
+**How to Donate?**
-
+1. Use `/donate [amount in USD]`. E.g., `/donate 2` donates 2 USD.
-Example: `/donate 2` would donate 2 USD.
+2. Or, quickly donate at [buymeacoffee](https://www.buymeacoffee.com/Anson). No account needed, accepts Paypal & Credit card.
-
-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)
 
+For questions, visit our [website](https://docs.simplestockbot.com).
 """
 
 
-commands = """ # Not used by the bot but for updating commands with BotFather
+# 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. 💬

telegram/bot.py

@@ -18,14 +18,15 @@ from telegram import (
     LabeledPrice,
     Update,
 )
+
 from telegram.ext import (
-    CallbackContext,
+    Application,
     CommandHandler,
-    Filters,
     InlineQueryHandler,
-    MessageHandler,
     PreCheckoutQueryHandler,
-    Updater,
+    MessageHandler,
+    filters,
+    ContextTypes,
 )
 
 from common.symbol_router import Router
@@ -33,6 +34,10 @@ from T_info import T_info
 
 # Enable logging
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
+
+# set higher logging level for httpx to avoid all GET and POST requests being logged
+logging.getLogger("httpx").setLevel(logging.WARNING)
+
 log = logging.getLogger(__name__)
 
 TELEGRAM_TOKEN = os.environ["TELEGRAM"]
@@ -50,58 +55,58 @@ t = T_info()
 log.info("Bot script started.")
 
 
-def start(update: Update, context: CallbackContext):
+async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Send help text when the command /start is issued."""
     log.info(f"Start command ran by {update.message.chat.username}")
-    update.message.reply_text(
+    await update.message.reply_text(
         text=t.help_text,
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def help(update: Update, context: CallbackContext):
+async def help(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Send help text when the command /help is issued."""
     log.info(f"Help command ran by {update.message.chat.username}")
-    update.message.reply_text(
+    await update.message.reply_text(
         text=t.help_text,
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def license(update: Update, context: CallbackContext):
+async def license(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Send bots license when the /license command is issued."""
     log.info(f"License command ran by {update.message.chat.username}")
-    update.message.reply_text(
+    await update.message.reply_text(
         text=t.license,
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def status(update: Update, context: CallbackContext):
+async def status(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Gather status of bot and dependant services and return important status updates."""
     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.")
 
-    update.message.reply_text(
+    await update.message.reply_text(
         text=bot_status,
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
     )
 
 
-def donate(update: Update, context: CallbackContext):
+async def donate(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Sets up donation."""
     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:
-        update.message.reply_text(
+        await update.message.reply_text(
             text=t.donate_text,
-            parse_mode=telegram.ParseMode.MARKDOWN,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
             disable_notification=True,
         )
         amount = 1.0
@@ -111,11 +116,11 @@ def donate(update: Update, context: CallbackContext):
     try:
         price = int(amount * 100)
     except ValueError:
-        update.message.reply_text(f"{amount} is not a valid donation amount or number.")
+        await update.message.reply_text(f"{amount} is not a valid donation amount or number.")
         return
     log.info(f"Donation amount: {price} by {update.message.chat.username}")
 
-    context.bot.send_invoice(
+    await context.bot.send_invoice(
         chat_id=chat_id,
         title="Simple Stock Bot Donation",
         description=f"Simple Stock Bot Donation of ${amount} by {update.message.chat.username}",
@@ -131,27 +136,27 @@ def donate(update: Update, context: CallbackContext):
     )
 
 
-def precheckout_callback(update: Update, context: CallbackContext):
+async def precheckout_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Approves donation"""
     log.info("precheckout_callback queried")
     query = update.pre_checkout_query
 
-    query.answer(ok=True)
+    await query.answer(ok=True)
     # I dont think I need to check since its only donations.
     # if query.invoice_payload == "simple-stock-bot":
     #     # answer False pre_checkout_query
-    #     query.answer(ok=True)
+    #     await query.answer(ok=True)
     # else:
-    #     query.answer(ok=False, error_message="Something went wrong...")
+    #     await query.answer(ok=False, error_message="Something went wrong...")
 
 
-def successful_payment_callback(update: Update, context: CallbackContext):
+async def successful_payment_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Thanks user for donation"""
     log.info("Successful payment!")
-    update.message.reply_text("Thank you for your donation! It goes a long way to keeping the bot free!")
+    await update.message.reply_text("Thank you for your donation! It goes a long way to keeping the bot free!")
 
 
-def symbol_detect_image(update: Update, context: CallbackContext):
+async def symbol_detect_image(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """
     Makes image captions into text then passes the `update` and `context`
         to symbol detect so that it can reply cashtags in image captions.
@@ -159,12 +164,12 @@ def symbol_detect_image(update: Update, context: CallbackContext):
     try:
         if update.message.caption:
             update.message.text = update.message.caption
-            symbol_detect(update, context)
+            await symbol_detect(update, context)
     except AttributeError:
         return
 
 
-def symbol_detect(update: Update, context: CallbackContext):
+async def symbol_detect(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """
     Runs on any message that doesn't have a command and searches for cashtags,
         then returns the prices of any symbols found.
@@ -182,18 +187,18 @@ def symbol_detect(update: Update, context: CallbackContext):
         return
     if symbols:
         # Let user know bot is working
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
+        await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
         log.info(f"Symbols found: {symbols}")
 
         for reply in s.price_reply(symbols):
-            update.message.reply_text(
+            await update.message.reply_text(
                 text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
+                parse_mode=telegram.constants.ParseMode.MARKDOWN,
                 disable_notification=True,
             )
 
 
-def intra(update: Update, context: CallbackContext):
+async def intra(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """returns a chart of intraday data for a symbol"""
     log.info(f"Intra command ran by {update.message.chat.username}")
 
@@ -201,7 +206,7 @@ def intra(update: Update, context: CallbackContext):
     chat_id = update.message.chat_id
 
     if message.strip().split("@")[0] == "/intra":
-        update.message.reply_text(
+        await update.message.reply_text(
             "This command returns a chart of the stocks movement since the most recent market open.\nExample: /intra $tsla"
         )
         return
@@ -212,19 +217,19 @@ def intra(update: Update, context: CallbackContext):
     if len(symbols):
         symbol = symbols[0]
     else:
-        update.message.reply_text("No symbols or coins found.")
+        await update.message.reply_text("No symbols or coins found.")
         return
 
     df = s.intra_reply(symbol)
     if df.empty:
-        update.message.reply_text(
+        await update.message.reply_text(
             text="Invalid symbol please see `/help` for usage details.",
-            parse_mode=telegram.ParseMode.MARKDOWN,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
             disable_notification=True,
         )
         return
 
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO)
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
 
     buf = io.BytesIO()
     mpf.plot(
@@ -237,17 +242,17 @@ def intra(update: Update, context: CallbackContext):
     )
     buf.seek(0)
 
-    update.message.reply_photo(
+    await update.message.reply_photo(
         photo=buf,
         caption=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 %Z')}"
         + f"\n\n{s.price_reply([symbol])[0]}",
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def chart(update: Update, context: CallbackContext):
+async def chart(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """returns a chart of the past month of data for a symbol"""
     log.info(f"Chart command ran by {update.message.chat.username}")
 
@@ -255,7 +260,7 @@ def chart(update: Update, context: CallbackContext):
     chat_id = update.message.chat_id
 
     if message.strip().split("@")[0] == "/chart":
-        update.message.reply_text(
+        await update.message.reply_text(
             "This command returns a chart of the stocks movement for the past month.\nExample: /chart $tsla"
         )
         return
@@ -265,18 +270,18 @@ def chart(update: Update, context: CallbackContext):
     if len(symbols):
         symbol = symbols[0]
     else:
-        update.message.reply_text("No symbols or coins found.")
+        await update.message.reply_text("No symbols or coins found.")
         return
 
     df = s.chart_reply(symbol)
     if df.empty:
-        update.message.reply_text(
+        await update.message.reply_text(
             text="Invalid symbol please see `/help` for usage details.",
-            parse_mode=telegram.ParseMode.MARKDOWN,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
             disable_notification=True,
         )
         return
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO)
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
 
     buf = io.BytesIO()
     mpf.plot(
@@ -289,39 +294,42 @@ def chart(update: Update, context: CallbackContext):
     )
     buf.seek(0)
 
-    update.message.reply_photo(
+    await update.message.reply_photo(
         photo=buf,
         caption=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')}\n\n{s.price_reply([symbol])[0]}",
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def trending(update: Update, context: CallbackContext):
+async def trending(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """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}")
 
     chat_id = update.message.chat_id
 
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
 
     trending_list = s.trending()
 
-    update.message.reply_text(
+    await update.message.reply_text(
         text=trending_list,
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def inline_query(update: Update, context: CallbackContext):
+async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     """
     Handles inline query. Searches by looking if query is contained
         in the symbol and returns matches in alphabetical order.
     """
-    # info(f"Inline command ran by {update.message.chat.username}")
+
-    log.info(f"Query: {update.inline_query.query}")
+    if not update.inline_query.query:
+        return
+
+    print(f"Query: {update.inline_query.query}")
 
     ignored_queries = {"$", "$$", " ", ""}
 
@@ -331,12 +339,14 @@ def inline_query(update: Update, context: CallbackContext):
         in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price.
         """
 
-        update.inline_query.answer(
+        await update.inline_query.answer(
             [
                 InlineQueryResultArticle(
                     str(uuid4()),
                     title="Please enter a query. It can be a ticker or a name of a company.",
-                    input_message_content=InputTextMessageContent(default_message, parse_mode=telegram.ParseMode.MARKDOWN),
+                    input_message_content=InputTextMessageContent(
+                        default_message, parse_mode=telegram.constants.ParseMode.MARKDOWN
+                    ),
                 )
             ]
         )
@@ -349,29 +359,31 @@ def inline_query(update: Update, context: CallbackContext):
             InlineQueryResultArticle(
                 str(uuid4()),
                 title=row["description"],
-                input_message_content=InputTextMessageContent(row["price_reply"], parse_mode=telegram.ParseMode.MARKDOWN),
+                input_message_content=InputTextMessageContent(
+                    row["price_reply"], parse_mode=telegram.constants.ParseMode.MARKDOWN
+                ),
             )
         )
 
         if len(results) == 5:
-            update.inline_query.answer(results, cache_time=60 * 60)
+            await update.inline_query.answer(results, cache_time=60 * 60)
             log.info("Inline Command was successful")
             return
-    update.inline_query.answer(results)
+    await update.inline_query.answer(results)
 
 
-def rand_pick(update: Update, context: CallbackContext):
+async def rand_pick(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """For the gamblers. Returns a random symbol to buy and a sell date"""
     log.info(f"Someone is gambling! Random_pick command ran by {update.message.chat.username}")
 
-    update.message.reply_text(
+    await update.message.reply_text(
         text=s.random_pick(),
-        parse_mode=telegram.ParseMode.MARKDOWN,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
         disable_notification=True,
     )
 
 
-def error(update: Update, context: CallbackContext):
+async def error(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Log Errors caused by Updates."""
     log.warning('Update "%s" caused error "%s"', update, error)
 
@@ -390,9 +402,9 @@ def error(update: Update, context: CallbackContext):
             f"\t{html.escape(tb_string)}"
         )
 
-        update.message.reply_text(
+        await update.message.reply_text(
             text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
-            parse_mode=telegram.ParseMode.MARKDOWN,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
         )
     else:
         log.warning("No message to send to user.")
@@ -402,48 +414,43 @@ def error(update: Update, context: CallbackContext):
 def main():
     """Start the context.bot."""
     # Create the EventHandler and pass it your bot's token.
-    updater = Updater(TELEGRAM_TOKEN)
+    application = Application.builder().token(TELEGRAM_TOKEN).build()
-
-    # Get the dispatcher to register handlers
-    dp = updater.dispatcher
 
     # on different commands - answer in Telegram
-    dp.add_handler(CommandHandler("start", start))
+    application.add_handler(CommandHandler("start", start))
-    dp.add_handler(CommandHandler("help", help))
+    application.add_handler(CommandHandler("help", help))
-    dp.add_handler(CommandHandler("license", license))
+    application.add_handler(CommandHandler("license", license))
-    dp.add_handler(CommandHandler("trending", trending))
+    application.add_handler(CommandHandler("trending", trending))
-    dp.add_handler(CommandHandler("random", rand_pick))
+    application.add_handler(CommandHandler("random", rand_pick))
-    dp.add_handler(CommandHandler("donate", donate))
+    application.add_handler(CommandHandler("donate", donate))
-    dp.add_handler(CommandHandler("status", status))
+    application.add_handler(CommandHandler("status", status))
-    dp.add_handler(CommandHandler("inline", inline_query))
+    application.add_handler(CommandHandler("inline", inline_query))
 
     # Charting can be slow so they run async.
-    dp.add_handler(CommandHandler("intra", intra, run_async=True))
+    application.add_handler(CommandHandler("intra", intra, block=False))
-    dp.add_handler(CommandHandler("intraday", intra, run_async=True))
+    application.add_handler(CommandHandler("intraday", intra, block=False))
-    dp.add_handler(CommandHandler("day", intra, run_async=True))
+    application.add_handler(CommandHandler("day", intra, block=False))
-    dp.add_handler(CommandHandler("chart", chart, run_async=True))
+    application.add_handler(CommandHandler("chart", chart, block=False))
-    dp.add_handler(CommandHandler("month", chart, run_async=True))
+    application.add_handler(CommandHandler("month", chart, block=False))
 
     # on noncommand i.e message - echo the message on Telegram
-    dp.add_handler(MessageHandler(Filters.text, symbol_detect))
+    application.add_handler(MessageHandler(filters.TEXT, symbol_detect))
-    dp.add_handler(MessageHandler(Filters.photo, symbol_detect_image))
+    application.add_handler(MessageHandler(filters.PHOTO, symbol_detect_image))
 
     # Inline Bot commands
-    dp.add_handler(InlineQueryHandler(inline_query))
+    application.add_handler(InlineQueryHandler(inline_query))
 
     # Pre-checkout handler to final check
-    dp.add_handler(PreCheckoutQueryHandler(precheckout_callback))
+    application.add_handler(PreCheckoutQueryHandler(precheckout_callback))
 
     # Payment success
-    dp.add_handler(MessageHandler(Filters.successful_payment, successful_payment_callback))
+    application.add_handler(MessageHandler(filters.SUCCESSFUL_PAYMENT, successful_payment_callback))
 
     # log all errors
-    dp.add_error_handler(error)
+    application.add_error_handler(error)
 
     # Start the Bot
-    updater.start_polling()
+    application.run_polling(allowed_updates=Update.ALL_TYPES)
-
-    updater.idle()
 
 
 if __name__ == "__main__":

telegram/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/telegram-reqs.txt

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