make ruff happy

.devcontainer/Dockerfile

@@ -1,3 +1,5 @@
 FROM python:3.11
 
 COPY . .
+
+# RUN pip install -r requirements.txt

.devcontainer/devcontainer.json

@@ -5,8 +5,7 @@
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
   // "image": "mcr.microsoft.com/devcontainers/python:1-3-bookworm",
   "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".."
+    "dockerfile": "Dockerfile"
   },
   "features": {
     "ghcr.io/devcontainers-contrib/features/black:2": {},
@@ -19,15 +18,14 @@
       "extensions": [
 		"ms-python.python",
 		"ms-python.black-formatter",
+		"ms-python.flake8",
 		"ms-python.vscode-pylance",
 		"ms-python.isort",
-        "charliermarsh.ruff",
-        "ms-toolsai.jupyter",
-        "esbenp.prettier-vscode"
+		"charliermarsh.ruff"
 	]
     }
   },
-  "postCreateCommand": "pip3 install --user -r dev-reqs.txt && apt-get update && apt-get install -y nodejs npm --fix-missing && npm install"
+  "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.

.gitignore

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

.gitlab-ci.yml

@@ -1,21 +1,21 @@
 stages:
   - lint
-  - build_site
   - deploy
 
-# ruff:
-#   stage: lint
-#   image: python:3.11-slim
-#   script:
-#     - pip3 install ruff
-#     - ruff . --output-format gitlab; ruff format . --diff
+black:
+  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 .
 
-# prettier:
-#   stage: lint
-#   image: node:16-slim # Use Node.js image since prettier is a Node.js tool
-#   script:
-#     - npm install prettier
-#     - npx prettier --check . # Adjust the path as needed
 
 include:
-  - local: /site/.gitlab-ci.yml
+  - local: /docs/.gitlab-ci.yml

.vscode/settings.json

@@ -3,8 +3,6 @@
     "editor.formatOnPaste": true,
     "editor.formatOnSaveMode": "modificationsIfAvailable",
     "[python]": {
-    "editor.defaultFormatter": "charliermarsh.ruff",
-    "editor.formatOnSave": true,
-    "editor.formatOnSaveMode": "file"
+        "editor.defaultFormatter": "ms-python.black-formatter",
     }
 }

README.md

@@ -1,48 +1,32 @@
-# Simple Stock Bots
+# Simple Telegram Stock Bot
 
-[![Platform](https://img.shields.io/badge/platform-Telegram%20%7C%20Discord-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)
-[![Maintainer](https://img.shields.io/badge/Maintainer-Anson-blue)](https://ansonbiggs.com)
+[![Author](https://img.shields.io/badge/Maintainer-Anson-blue)](https://ansonbiggs.com)
 
-Enhance your group chats on Telegram and Discord with real-time stock and cryptocurrency insights. Simple Stock Bots deliver timely stock quotes, charts, and market trends directly to your chats, making financial discussions more engaging and informed.
+## Docs
 
-## Documentation
+https://docs.simplestockbot.com/
 
-Comprehensive documentation is available to help you understand the features and capabilities of Simple Stock Bots:
+## Usage
 
-- [Official Documentation](https://simplestockbot.com/)
-- [Command Reference](https://simplestockbot.com/commands/)
+https://docs.simplestockbot.com/commands/
 
-## Support the Project
+## Donate
 
-Simple Stock Bots is sustained entirely through donations, with an annual expense of about $420 for server and premium market data subscriptions from [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
+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).
 
-You can contribute by:
+The best way to donate is through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) which accepts Paypal or Credit card.
 
-- Donating through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) (PayPal or Credit Card accepted).
-- Using the `/donate` [command](commands.md#donate-amount-in-usd) on Telegram.
-- [Getting in touch](contact.md) for any inquiries or suggestions.
+Alternatively, you can donate on Telegram with the `/donate` [command](commands.md#donate-amount-in-usd).
 
-### Additional Support:
+If you have any questions get in [touch.](contact.md)
 
-- Follow on [Twitter](https://twitter.com/AnsonBiggs)
-- Contribute or star the project on [GitLab](https://gitlab.com/simple-stock-bots/simple-stock-bot)
-- Utilize referral links for self-hosting:
+## 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
   - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
-  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=web)
-
-## Hosting
-
-Self-hosting instructions are provided for those interested in running the bot on their own servers:
-
-- [Hosting Guide](https://simplestockbot.com/hosting/)
-
-## Contact
-
-Reach out for bug reports, feature requests, or other inquiries:
-
-- [Contact Page](https://simplestockbot.com/contact/)
-
----
-
-Your support in any form is immensely appreciated and ensures the continuous improvement and availability of Simple Stock Bots for everyone.
+  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)

common/MarketData.py

@@ -1,16 +1,13 @@
 import datetime as dt
 import logging
 import os
-from collections import OrderedDict
 from typing import Dict
 
-import humanize
 import pandas as pd
 import pytz
 import requests as r
 import schedule
 
-
 from common.Symbol import Stock
 
 log = logging.getLogger(__name__)
@@ -23,7 +20,6 @@ class MarketData:
 
     SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
 
-    symbol_list: Dict[str, Dict] = {}
     charts: Dict[Stock, pd.DataFrame] = {}
 
     openTime = dt.time(hour=9, minute=30, second=0)
@@ -52,15 +48,9 @@ class MarketData:
         if self.MARKETDATA_TOKEN != "":
             schedule.every().day.do(self.clear_charts)
 
-        self.get_symbol_list()
-        schedule.every().day.do(self.get_symbol_list)
-
-    def get(self, endpoint, params=None, timeout=10, headers=None) -> dict:
+    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
         url = "https://api.marketdata.app/v1/" + endpoint
 
-        if params is None:
-            params = {}
-
         # set token param if it wasn't passed.
         params["token"] = self.MARKETDATA_TOKEN
 
@@ -68,13 +58,7 @@ class MarketData:
         # monitored even if someone doesn't make it through an affiliate link.
         params["application"] = "simplestockbot"
 
-        if headers is None:
-            headers = {}
-        headers = {"User-Agent": "Simple Stock Bot anson@ansonbiggs.com"} | headers
-
-        resp = r.get(url, params=params, timeout=timeout, headers=headers)
-
-        logging.error(resp.headers.items())
+        resp = r.get(url, params=params, timeout=timeout)
 
         # Make sure API returned a proper status code
         try:
@@ -101,29 +85,6 @@ class MarketData:
 
         return {}
 
-    def symbol_id(self, symbol: str) -> Dict[str, Dict]:
-        return self.symbol_list.get(symbol.upper(), None)
-
-    def get_symbol_list(self):
-        # Doesn't use `self.get()` since needs are much different
-        sec_resp = r.get(
-            "https://www.sec.gov/files/company_tickers.json",
-            headers={
-                "User-Agent": "Simple Stock Bot anson@ansonbiggs.com",
-                "Accept-Encoding": "gzip, deflate",
-                "Host": "www.sec.gov",
-            },
-        )
-        sec_resp.raise_for_status()
-        sec_data = sec_resp.json()
-
-        for rank, ticker_info in sec_data.items():
-            self.symbol_list[ticker_info["ticker"]] = {
-                "ticker": ticker_info["ticker"],
-                "title": ticker_info["title"],
-                "mkt_cap_rank": rank,
-            }
-
     def clear_charts(self) -> None:
         """
         Clears cache of chart data.
@@ -168,13 +129,13 @@ class MarketData:
             Formatted markdown
         """
 
-        if quoteResp := self.get(f"stocks/quotes/{symbol.symbol}/"):
+        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.name} is ${price}"
+                return f"The price of {symbol} is {price}"
 
             message = f"The current price of {symbol.name} is ${price} and "
 
@@ -230,11 +191,7 @@ class MarketData:
 
         if data := self.get(
             f"stocks/candles/{resolution}/{symbol}",
-            params={
-                "from": startTime.timestamp(),
-                "to": now.timestamp(),
-                "extended": True,
-            },
+            params={"from": startTime.timestamp(), "to": now.timestamp(), "extended": True},
         ):
             data.pop("s")
             df = pd.DataFrame(data)
@@ -310,58 +267,3 @@ class MarketData:
             return df
 
         return pd.DataFrame()
-
-    def options_reply(self, request: str) -> str:
-        """Undocumented API Usage!"""
-
-        options_data = self.get(f"options/quotes/{request}")
-
-        for key in options_data.keys():
-            options_data[key] = options_data[key][0]
-
-        options_data["underlying"] = "$" + options_data["underlying"]
-
-        options_data["updated"] = humanize.naturaltime(dt.datetime.now() - dt.datetime.fromtimestamp(options_data["updated"]))
-
-        options_data["expiration"] = humanize.naturaltime(
-            dt.datetime.now() - dt.datetime.fromtimestamp(options_data["expiration"])
-        )
-
-        options_data["firstTraded"] = humanize.naturaltime(
-            dt.datetime.now() - dt.datetime.fromtimestamp(options_data["firstTraded"])
-        )
-
-        rename = {
-            "optionSymbol": "Option Symbol",
-            "underlying": "Underlying",
-            "expiration": "Expiration",
-            "side": "side",
-            "strike": "strike",
-            "firstTraded": "First Traded",
-            "updated": "Last Updated",
-            "bid": "bid",
-            "bidSize": "bidSize",
-            "mid": "mid",
-            "ask": "ask",
-            "askSize": "askSize",
-            "last": "last",
-            "openInterest": "Open Interest",
-            "volume": "Volume",
-            "inTheMoney": "inTheMoney",
-            "intrinsicValue": "Intrinsic Value",
-            "extrinsicValue": "Extrinsic Value",
-            "underlyingPrice": "Underlying Price",
-            "iv": "Implied Volatility",
-            "delta": "delta",
-            "gamma": "gamma",
-            "theta": "theta",
-            "vega": "vega",
-            "rho": "rho",
-        }
-
-        options_cleaned = OrderedDict()
-        for old, new in rename.items():
-            if old in options_data:
-                options_cleaned[new] = options_data[old]
-
-        return options_cleaned

common/Symbol.py

@@ -1,6 +1,5 @@
-import logging
-
 import pandas as pd
+import logging
 
 
 class Symbol:
@@ -26,19 +25,15 @@ class Symbol:
     def __str__(self) -> str:
         return self.id
 
-    def __hash__(self):
-        return hash(self.id)
-
 
 class Stock(Symbol):
     """Stock Market Object. Gets data from MarketData"""
 
-    def __init__(self, symbol_info: dict) -> None:
-        self.symbol = symbol_info["ticker"]
-        self.id = symbol_info["ticker"]
-        self.name = symbol_info["title"]
-        self.tag = "$" + symbol_info["ticker"]
-        self.market_cap_rank = symbol_info["mkt_cap_rank"]
+    def __init__(self, symbol: str) -> None:
+        self.symbol = symbol
+        self.id = symbol
+        self.name = "$" + symbol.upper()
+        self.tag = "$" + symbol.lower()
 
 
 class Coin(Symbol):

common/cg_Crypto.py

@@ -5,10 +5,8 @@ import pandas as pd
 import requests as r
 import schedule
 from markdownify import markdownify
-from common.Symbol import Coin
-from common.utilities import rate_limited
 
-import time
+from common.Symbol import Coin
 
 log = logging.getLogger(__name__)
 
@@ -26,21 +24,10 @@ class cg_Crypto:
         self.get_symbol_list()
         schedule.every().day.do(self.get_symbol_list)
 
-    # Coingecko's rate limit is 30 requests per minute.
-    # Since there are two bots sharing the same IP, we allocate half of that limit to each bot.
-    # This results in a rate limit of 15 requests per minute for each bot.
-    # Given this, the rate limit effectively becomes 1 request every 4 seconds for each bot.
-    @rate_limited(0.25)
     def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
         url = "https://api.coingecko.com/api/v3" + endpoint
         resp = r.get(url, params=params, timeout=timeout)
         # Make sure API returned a proper status code
-
-        if resp.status_code == 429:
-            log.warning(f"CoinGecko returned 429 - Too Many Requests for endpoint: {endpoint}. Sleeping and trying again.")
-            time.sleep(10)
-            return self.get(endpoint=endpoint, params=params, timeout=timeout)
-
         try:
             resp.raise_for_status()
         except r.exceptions.HTTPError as e:

common/requirements.txt

@@ -1,8 +1,6 @@
-cachetools==5.3.1
-humanize==4.8.0
-markdownify==0.11.6
-mplfinance==0.12.10b0
-pandas==2.1.1
 requests==2.31.0
-rush==2021.4.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

@@ -5,7 +5,6 @@ import datetime
 import logging
 import random
 import re
-from typing import Dict
 
 import pandas as pd
 import schedule
@@ -15,6 +14,8 @@ from common.cg_Crypto import cg_Crypto
 from common.MarketData import MarketData
 from common.Symbol import Coin, Stock, Symbol
 
+from typing import Dict
+
 log = logging.getLogger(__name__)
 
 
@@ -37,7 +38,7 @@ class Router:
             t_copy = self.trending_count.copy()
             for key in t_copy.keys():
                 if t_copy[key] < 0.01:
-                    # Prune Keys
+                    # This just makes sure were not keeping around keys that havent been called in a very long time.
                     dead_keys.append(key)
                 else:
                     t_copy[key] = t_copy[key] * decay
@@ -47,7 +48,7 @@ class Router:
         self.trending_count = t_copy.copy()
         log.info("Decayed trending symbols.")
 
-    def find_symbols(self, text: str, *, trending_weight: int = 1) -> list[Stock | Coin]:
+    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
         in a blob of text and returns them in a list.
 
@@ -64,20 +65,16 @@ class Router:
         schedule.run_pending()
 
         symbols: list[Symbol] = []
-        stock_matches = set(re.findall(self.STOCK_REGEX, text))
-        coin_matches = set(re.findall(self.CRYPTO_REGEX, text))
-
-        for stock_match in stock_matches:
+        stocks = set(re.findall(self.STOCK_REGEX, text))
+        for stock in stocks:
             # Market data lacks tools to check if a symbol is valid.
-            if stock_info := self.stock.symbol_id(stock_match):
-                symbols.append(Stock(stock_info))
-            else:
-                log.info(f"{stock_match} is not in list of stocks")
+            symbols.append(Stock(stock))
 
-        for coin_match in coin_matches:
-            sym = self.crypto.symbol_list[self.crypto.symbol_list["symbol"].str.fullmatch(coin_match.lower(), case=False)]
+        coins = set(re.findall(self.CRYPTO_REGEX, text))
+        for coin in coins:
+            sym = self.crypto.symbol_list[self.crypto.symbol_list["symbol"].str.fullmatch(coin.lower(), case=False)]
             if sym.empty:
-                log.info(f"{coin_match} is not in list of coins")
+                log.info(f"{coin} is not in list of coins")
             else:
                 symbols.append(Coin(sym))
         if symbols:
@@ -396,12 +393,3 @@ class Router:
             replies = replies + self.crypto.batch_price(coins)
 
         return replies
-
-    def options(self, request: str, symbols: list[Symbol]) -> Dict:
-        request = request.lower()
-        if len(symbols) == 1:
-            symbol = symbols[0]
-            request = request.replace(symbol.tag.lower(), symbol.symbol.lower())
-            return self.stock.options_reply(request)
-        else:
-            return self.stock.options_reply(request)

common/utilities.py

@@ -1,31 +0,0 @@
-import time
-import logging
-
-log = logging.getLogger(__name__)
-
-
-def rate_limited(max_per_second):
-    """
-    Decorator that ensures the wrapped function is called at most `max_per_second` times per second.
-    """
-    min_interval = 1.0 / max_per_second
-
-    def decorate(func):
-        last_called = [0.0]
-
-        def rate_limited_function(*args, **kwargs):
-            elapsed = time.time() - last_called[0]
-            left_to_wait = min_interval - elapsed
-
-            if left_to_wait > 0:
-                log.info(f"Rate limit exceeded. Waiting for {left_to_wait:.2f} seconds.")
-                time.sleep(left_to_wait)
-
-            ret = func(*args, **kwargs)
-            last_called[0] = time.time()
-
-            return ret
-
-        return rate_limited_function
-
-    return decorate

dev-reqs.txt

@@ -1,10 +1,10 @@
 -r common/requirements.txt
--r site/requirements.txt
-ipython==8.16.1
-jupyter_client==8.4.0
-jupyter_core==5.4.0
+-r docs/requirements.txt
+black==23.7.0
+flake8==6.1.0
+Flake8-pyproject==1.2.3
 pylama==8.4.1
 mypy==1.5.1
 types-cachetools==5.3.0.6
-types-pytz==2023.3.1.1
-ruff==0.1.6
+types-pytz==2023.3.0.1
+ruff==0.0.292

discord/D_info.py

@@ -10,7 +10,7 @@ class D_info:
     license = re.sub(
         r"\b\n",
         " ",
-        r.get("https://gitlab.com/simple-stock-bots/simple-stock-bot/-/raw/master/LICENSE").text,
+        r.get("https://gitlab.com/simple-stock-bots/simple-discord-stock-bot/-/raw/master/LICENSE").text,
     )
 
     help_text = """
@@ -21,7 +21,7 @@ For stock data or hosting your own bot, use my link. This helps keep the bot fre
 
 **Updates**: Join the bot's discord: https://t.me/simplestockbotnews.
 
-**Documentation**: All details about the bot are at [docs](https://simplestockbot.com).
+**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.
@@ -41,7 +41,7 @@ Type @SimpleStockBot `[search]` anywhere to find and get stock/crypto prices. No
 
 Data from: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
 
-Issues with the bot? Use `/status` or [contact us](https://simplestockbot.com/contact).
+Issues with the bot? Use `/status` or [contact us](https://docs.simplestockbot.com/contact).
     """
 
     donate_text = """
@@ -55,5 +55,5 @@ Every donation supports server costs and
 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://simplestockbot.com).
+Questions? Visit our [website](https://docs.simplestockbot.com).
 """

discord/bot.py

@@ -5,9 +5,9 @@ import os
 
 import mplfinance as mpf
 import nextcord
-from D_info import D_info
 from nextcord.ext import commands
 
+from D_info import D_info
 from common.symbol_router import Router
 
 DISCORD_TOKEN = os.environ["DISCORD"]
@@ -38,7 +38,7 @@ async def on_ready():
 @bot.command()
 async def status(ctx: commands):
     """Debug command for diagnosing if the bot is experiencing any issues."""
-    logging.info(f"Status command ran by {ctx.message.author}")
+    logging.warning(f"Status command ran by {ctx.message.author}")
     message = ""
     try:
         message = "Contact MisterBiggs#0465 if you need help.\n"
@@ -183,74 +183,20 @@ async def trending(ctx: commands):
 
 @bot.event
 async def on_message(message):
-    # Ignore messages from the bot itself
     if message.author.id == bot.user.id:
         return
-
-    content_lower = message.content.lower()
-
-    # Process commands starting with "/"
-    if message.content.startswith("/"):
+    if message.content:
+        if message.content[0] == "/":
             await bot.process_commands(message)
             return
 
-    symbols = None
         if "$" in message.content:
             symbols = s.find_symbols(message.content)
 
-    if "call" in content_lower or "put" in content_lower:
-        await handle_options(message, symbols)
-        return
-
             if symbols:
                 for reply in s.price_reply(symbols):
                     await message.channel.send(reply)
                 return
 
 
-async def handle_options(message, symbols):
-    logging.info("Options detected")
-    try:
-        options_data = s.options(message.content.lower(), symbols)
-
-        # Create the embed directly within the function
-        embed = nextcord.Embed(title=options_data["Option Symbol"], description=options_data["Underlying"], color=0x3498DB)
-
-        # Key details
-        details = (
-            f"Expiration: {options_data['Expiration']}\n" f"Side: {options_data['side']}\n" f"Strike: {options_data['strike']}"
-        )
-        embed.add_field(name="Details", value=details, inline=False)
-
-        # Pricing info
-        pricing_info = (
-            f"Bid: {options_data['bid']} (Size: {options_data['bidSize']})\n"
-            f"Mid: {options_data['mid']}\n"
-            f"Ask: {options_data['ask']} (Size: {options_data['askSize']})\n"
-            f"Last: {options_data['last']}"
-        )
-        embed.add_field(name="Pricing", value=pricing_info, inline=False)
-
-        # Volume and open interest
-        volume_info = f"Open Interest: {options_data['Open Interest']}\n" f"Volume: {options_data['Volume']}"
-        embed.add_field(name="Activity", value=volume_info, inline=False)
-
-        # Greeks
-        greeks_info = (
-            f"IV: {options_data['Implied Volatility']}\n"
-            f"Delta: {options_data['delta']}\n"
-            f"Gamma: {options_data['gamma']}\n"
-            f"Theta: {options_data['theta']}\n"
-            f"Vega: {options_data['vega']}\n"
-            f"Rho: {options_data['rho']}"
-        )
-        embed.add_field(name="Greeks", value=greeks_info, inline=False)
-
-        # Send the created embed
-        await message.channel.send(embed=embed)
-
-    except KeyError as ex:
-        logging.warning(f"KeyError processing options for message {message.content}: {ex}")
-
-
 bot.run(DISCORD_TOKEN)

discord/discord-reqs.txt

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

docker-compose.yaml

@@ -1,9 +1,10 @@
-version: "3"
+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:

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/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/commands.md

@@ -1,16 +1,13 @@
 Symbols are used in headings to denote what platforms and symbol types a command supports.
 
-- Telegram Only :fontawesome-brands-telegram:
+- 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:
 
-## Get the Bots
-
-[:fontawesome-brands-telegram: Telegram](https://t.me/SimpleStockBot){ .md-button } [:fontawesome-brands-discord: Discord](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot){ .md-button }
-
-## Symbol Detection :material-currency-btc: :bank:
+## 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.
 
@@ -28,12 +25,6 @@ The Simple Stock Bot looks at every message it can see and tries to detect stock
     </div>
 </div>
 
-## Options Detection :bank:
-
-This command allows you to query real-time data for stock options. By simply inputting the stock symbol, strike price, month, and specifying either a call or a put, you can get the latest options data right at your fingertips. For example, `AAPL $220 December call` will provide the current data for Apple's call option with a $220 strike price expiring in December.
-
-![Image of the telegram bot providing options info.](img/telegram_options.png)
-
 ## `/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.
@@ -103,9 +94,7 @@ Gets the latest trending stocks and their change in price
 ━━━━━━━━━━━━━━━━━━━━━━━━━━
 $GME: Gamestop Corporation - Class A, 5.06%
 $MMAT: Meta Materials Inc, 4.77%
-
-$$
-BTC: Bitcoin, -0.83%
+$$BTC: Bitcoin, -0.83%
 $$ETH: Ethereum, 6.06%
 $$DOGE: Binance-Peg Dogecoin, 0.14%
 
@@ -178,11 +167,10 @@ Bot Status:
 
 </div>
 
-## Inline Features :fontawesome-brands-telegram: :material-currency-btc: :bank:
+## 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/mkdocs.yml

@@ -1,30 +1,30 @@
-site_name: Simple Stock Bot
-site_url: https://simplestockbot.com
-repo_url: https://gitlab.com/simple-stock-bots/simple-stock-bot
+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
-  - Self-Host: host.md
-  # - Donate: donate.md
+  - Hosting: host.md
+  - Donate: donate.md
   - Contact: contact.md
-  - Blog: blog/index.md
 
 theme:
   name: material
-  custom_dir: overrides
   language: en
   features:
     - navigation.instant
     - navigation.tracking
     - navigation.tabs
     - navigation.tabs.sticky
-    - content.code.copy
+    - navigation.footer
   icon:
     logo: material/robot-love
   palette:
@@ -52,22 +52,23 @@ extra:
       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=web
+      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
-  - blog
+
 
 markdown_extensions:
 - attr_list
 - pymdownx.emoji:
-      emoji_index: !!python/name:material.extensions.emoji.twemoji
-      emoji_generator: !!python/name:material.extensions.emoji.to_svg
-  - admonition
-  - pymdownx.details
-  - pymdownx.superfences
+    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

package-lock.json

@@ -1,27 +0,0 @@
-{
-  "name": "simple-stock-bot",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "devDependencies": {
-        "prettier": "3.0.3"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    }
-  }
-}

package.json

@@ -1,5 +0,0 @@
-{
-  "devDependencies": {
-    "prettier": "3.0.3"
-  }
-}

pyproject.toml

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

site/.gitlab-ci.yml

@@ -1,23 +0,0 @@
-image: python:3.11
-
-build_mkdocs:
-  stage: build_site
-  script:
-    - cd ./site
-    - pip install -r requirements.txt
-    - mkdocs build --site-dir ../public --verbose
-  artifacts:
-    paths:
-      - public
-
-pages:
-  stage: deploy
-  script:
-    - echo "Publishing site..."
-  dependencies:
-    - build_mkdocs
-  artifacts:
-    paths:
-      - public
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"

site/.vscode/settings.json

@@ -1,12 +0,0 @@
-{
-  "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"
-  ]
-}

site/docs/blog/.authors.yml

@@ -1,5 +0,0 @@
-authors:
-  Anson:
-    name: Anson Biggs
-    description: Creator
-    avatar: https://gitlab.com/uploads/-/system/user/avatar/1377308/avatar.png

site/docs/blog/index.md

@@ -1 +0,0 @@
-# Blog

site/docs/blog/posts/intro.md

@@ -1,66 +0,0 @@
----
-title: "Introducing Simple Stock Bot: Your Chat Group's Financial Whiz"
-date: 2023-10-10
-tags: [Simple Stock Bot, Introduction, Telegram, Discord, Financial Insights]
-authors: [Anson]
-description: >
-  Welcome to the world of Simple Stock Bot, where real-time financial insights are integrated seamlessly into your group chats on Telegram and Discord!
----
-
-## What is Simple Stock Bot?
-
-Simple Stock Bot is a chatbot designed to enrich your financial discussions on Telegram and Discord. Regardless of whether you're a seasoned trader or a beginner in the stock market, this bot is here to make your discussions more informative and engaging.
-
-<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>
-
-<!-- more -->
-
-With Simple Stock Bot, you can:
-
-- **Fetch Real-time Quotes**: Obtain the latest stock and cryptocurrency prices instantly within your group chat.
-- **View Charts**: Delve into intraday movements or assess a month's trading data right inside your group chat.
-- **Stay Updated on Market Trends**: Discover what's buzzing in the stock and crypto spheres.
-
-## Add the Bot to your Group
-
-[:fontawesome-brands-telegram: Telegram](https://t.me/SimpleStockBot){ .md-button }
-
-[:fontawesome-brands-discord: Discord](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot){ .md-button }
-
-## Using the Bot
-
-Embarking on your journey with Simple Stock Bot is effortless. Just add the bot to your Telegram or Discord group, and you're all set to dive into financial discussions right from your chat!
-
-Here are some simple commands to get you started:
-
-- `/intra` to view intraday charts.
-- `/chart` for a glimpse of the last month's trading data.
-- `/trending` to catch up on the latest trending stocks and cryptocurrencies.
-
-## Keeping It Free
-
-Simple Stock Bot is a community-supported project, thriving on the contributions from its users. It's sustained entirely through donations to cover server costs and premium market data subscriptions, ensuring it remains free for everyone.
-
-Feeling generous? You can support the project by [donating](https://simplestockbot.com/donate/), following on [Twitter](https://twitter.com/AnsonBiggs), or contributing on [GitLab](https://gitlab.com/simple-stock-bots/simple-stock-bot).
-
-## Dive Deeper
-
-Craving more insights and features? Explore the [official documentation](https://simplestockbot.com/) to uncover all the capabilities of Simple Stock Bot.
-
-Get ready to elevate your financial discussions with Simple Stock Bot! Your group chats will never be the same again.
-
----
-
-Stay tuned for more updates, tips, and financial insights brought to you by Simple Stock Bot. Here’s to making every financial discussion enriched and informed!

site/docs/blog/posts/marketdata-release.md

@@ -1,40 +0,0 @@
----
-title: "v2023.1 Release! New Stock Market Data Provider and More!"
-date: 2023-10-16
-tags: [Simple Stock Bot, Telegram, Discord, MarketDataApp]
-authors: [Anson]
-description: >
-  Discover the latest updates for Simple Stock Bot, including our new integration with MarketData.app for enhanced real-time stock market insights.
----
-
-## 🌐 General Updates:
-
-- **New Home**: We've transitioned to our fresh and updated website at [simplestockbot.com](https://simplestockbot.com/).
-- **New Data Provider**: We're excited to announce [MarketData.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=web) as our new provider for real-time stock market data, ensuring timely and accurate insights for our users.
-
-<!-- more -->
-
-## 📈 MarketData.app Integration Enhancements:
-
-- We've introduced **additional options** to our MarketData.app integration, ensuring even more precise and varied financial data.
-- **Afterhours Data Fix**: Addressed an issue where after hours stock market data caused errors.
-- **Trending Symbol Accuracy**: Fixed a bug that led to the display of invalid symbols in the `/trending` command.
-
-## 🤖 Bot Improvements & Fixes:
-
-- **Unified Repository**: To streamline our development and deployment, we've merged the Discord and Telegram bots into a single monorepo. Check it out on [GitLab](https://gitlab.com/simple-stock-bots/simple-stock-bot). Contributions welcome!
-- **Inline Functionality Restoration**: Fixed the telegram bot's inline functionality.
-- **Python Telegram Bot Update**: Migrated to the latest version of `Python Telegram Bot` for superior performance and more features.
-- **Rate Limiting Addition**: Implemented rate limiting to ensure optimal performance during peak usage times.
-- **SO MUCH MORE**: [Move to Marketdata.app GitLab Issues](https://gitlab.com/simple-stock-bots/simple-stock-bot/-/milestones/3)
-
-## 📝 Documentation & Repository Overhauls:
-
-- **Centralized Documentation**: For convenience and improved maintenance, we've shifted our documentation into the monorepo.
-- **Documentation Refinement**: Updated our documentation to reflect the latest homepage details.
-
-**Special Mention**: Immense gratitude to our dedicated community for their continual feedback and unwavering support. Dive deeper into the financial realm with Simple Stock Bot!
-
----
-
-📥 For any concerns, queries, or feedback, don't hesitate to [Contact Us](../../contact.md).

site/docs/blog/posts/sunset.md

@@ -1,14 +0,0 @@
----
-title: "Simple Bot End-of-Life"
-date: 2024-05-12
-tags: [Simple Stock Bot, Introduction, Telegram, Discord, Financial Insights]
-authors: [Anson]
-description: >
-  Simple Stock Bot is being sunset. 
----
-
-## What is Simple Stock Bot?
-
-For full details see my full blog post: https://notes.ansonbiggs.com/simple-stock-bot-end-of-life/
-
-I am shutting down Simple Stock Bot, a popular Telegram and Discord bot that provided live stock and cryptocurrency market data. The bot was created in 2018 after my group chat lost access to the Google Allo, which had integrated market data. The bot grew to 15,000 monthly active users, but maintaining the service has become challenging due to increasing data costs and changes to the Discord API. I really appreciate the community and everyone that has donated along the way, this has been a seriously great ride. The bot will soon no longer function on Telegram and Discord.

site/docs/contact.md

@@ -1,8 +0,0 @@
-# I Would Love to Hear From You!
-
-Your feedback and experience with Simple Stock Bot is invaluable. Whether you've encountered a bug, have a suggestion for improvement, or just want to share your experience, I'm all ears. Here are several ways you can get in touch:
-
-- **Telegram**: Drop me a message on [Telegram](https://t.me/MisterBiggs).
-- **Discord**: Feel free to reach out on Discord at `MisterBiggs#0465`.
-- **Twitter**: Send me a tweet on [Twitter](https://twitter.com/AnsonBiggs).
-- **GitLab**: For technical issues or feature requests, feel free to open an issue on our [GitLab Repository](https://gitlab.com/simple-stock-bots/simple-stock-bot).

site/docs/donate.md

@@ -1,21 +0,0 @@
-# Support Simple Stock Bot
-
-Running Simple Stock Bot incurs a yearly expense of about $420, covering server costs and premium market data subscription from [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo). Every donation helps in maintaining the bot and ensuring its continued availability for all users.
-
-Your support through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) is greatly appreciated, which accepts both PayPal and Credit Card donations.
-
-For Telegram users, a convenient way to donate is by using the `/donate` [command](commands.md#donate-amount-in-usd).
-
-Should you have any inquiries, feel free to get in [touch](contact.md).
-
-## Additional Support:
-
-Your engagement also counts as support! Here are other ways to contribute:
-
-- Stay updated by following me on [Twitter](https://twitter.com/AnsonBiggs).
-- Contribute to the project or star it on [GitLab](https://gitlab.com/simple-stock-bots).
-- If you plan to host your own bot, consider using my referral links:
-  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=web)
-  - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
-
-Your support in any form is immensely appreciated and helps in keeping Simple Stock Bot operational and free for everyone.

site/docs/host.md

@@ -1,54 +0,0 @@
-# Self-Hosting Guide
-
-This guide provides step-by-step instructions for setting up and running this project on your local machine, whether for development, testing, or personal use.
-
-## Get the Bots
-
-[:fontawesome-brands-telegram: Telegram](https://t.me/SimpleStockBot){ .md-button } [:fontawesome-brands-discord: Discord](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot){ .md-button }
-
-## Pre-requisites
-
-Ensure the following are installed or obtained before proceeding:
-
-- **[Docker](https://hub.docker.com/?overlay=onboarding)**: The project is containerized using Docker Compose, allowing it to run on any system with Docker installed.
-- **API Keys**:
-  - **Telegram**: Obtain a free API key by interacting with [BotFather](https://telegram.me/botfather). More details [here](https://core.telegram.org/bots#3-how-do-i-create-a-bot).
-  - **Discord**: Get a free API key at [https://discord.com/developers](https://discord.com/developers).
-  - **[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=web)**: Sign up to get an API key. A free tier is available and should suffice for private groups. More details [here](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
-
-!!! tip
-The bot will still operate without a [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo) key but will revert to using only cryptocurrency data.
-
-!!! note
-To enable donation acceptance, obtain a Stripe API key and provide a `STRIPE` key to your bot. [https://stripe.com/]()
-
-## Setup Instructions
-
-1. **Download/Clone the Repository**:
-
-   - Download or clone this repository to your local machine.
-
-2. **Configure Environment Variables**:
-
-   - Navigate to the project directory and locate the `.env` file.
-   - Fill in the `.env` file with your obtained API keys:
-
-   ```plaintext
-   MARKETDATA=your_marketdata_api_key
-   STRIPE=your_stripe_api_key
-   TELEGRAM=your_telegram_api_key
-   DISCORD=your_discord_api_key
-   ```
-
-   Alternatively, pass the variables using Docker Compose environment variables or command-line arguments.
-
-3. **Build and Run the Bot:**
-
-   - Open a terminal in the project directory.
-   - Build and run both bots using Docker Compose:
-
-   ```bash
-   docker-compose up
-   ```
-
-Now, your bot(s) should be up and running! If you're unfamiliar with Docker, reviewing the [Docker documentation](https://docs.docker.com/) is highly recommended to gain better control over your bot and understand Docker commands better.

site/docs/index.md

@@ -1,41 +0,0 @@
-# Elevate Your Groupchats with Real-time Stock Insights
-
-Discover a new level of financial discussion with Simple Stock Bot, your go-to solution for real-time stock market and cryptocurrency insights within your Telegram or Discord group chats. Transform your everyday discussions into an interactive financial exploration experience. With Simple Stock Bot, keeping up with the stock market or cryptocurrency trends has never been more seamless and engaging.
-
-## Get the Bots
-
-[:fontawesome-brands-telegram: Telegram](https://t.me/SimpleStockBot){ .md-button } [:fontawesome-brands-discord: Discord](https://discordapp.com/api/oauth2/authorize?client_id=532045200823025666&permissions=36507338752&scope=bot){ .md-button }
-
-## [Commands](commands.md)
-
-### Real-Time Stock and Cryptocurrency Updates
-
-- Get live price updates of stocks and cryptocurrencies.
-- Symbol Detection: Use `$` for stocks and `$$` for cryptocurrencies, e.g., `$tsla` for Tesla and `$$btc` for Bitcoin.
-
-### Intraday and Historical Data Visualization
-
-- `/intra`: View a stock's movement since the last market open or a cryptocurrency's 24-hour chart.
-- `/chart`: Provides a chart of the last month's trading data up till the day before.
-
-### Trending Assets Awareness
-
-- `/trending`: Discover the latest trending stocks and cryptocurrencies and their price changes.
-
-### In-App Assistance and Support
-
-- `/help`: Provides a quick summary of available commands for easy reference.
-- `/donate`: Support the maintenance of the bot to ensure continued free access.
-
-### User-Friendly Interaction
-
-- Easy symbol and command usage for a smooth user experience.
-- Engage with a community of financial enthusiasts and share insights effortlessly.
-
-## [Contact](contact.md)
-
-Need assistance or have inquiries? Feel free to reach out and I'll be happy to help.
-
-## Powered by MarketData.app
-
-Simple Stock Bots is able to provide real-time stock market insights thanks to the data supplied by [MarketData.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=web). MarketData.app delivers accurate and up-to-date financial data, fueling the bot's capabilities in delivering timely stock quotes, charts, and other market-related information directly to your Telegram or Discord groups. The robust data infrastructure provided by MarketData.app not only ensures the reliability and accuracy of the information you receive but also enables the offering of Simple Stock Bots for free to all users. By leveraging MarketData.app's comprehensive financial data, the goal is to foster informed financial discussions and make market monitoring an effortless and accessible experience for everyone.

site/overrides/main.html

@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-
-<!-- Announcement bar -->
-{% block announce %}
-
-<div class="admonition danger" style="min-height: 20vh;">
-  <p class="admonition-title">This project is now archived!</p>
-  <p>
-    Please
-    <a href="/blog/2024/05/12/simple-bot-end-of-life/"
-      >click here for more information.</a
-    >
-  </p>
-</div>
-<div class="" admoniton></div>
-
-{% endblock %}

site/requirements.txt

@@ -1,6 +0,0 @@
-mkdocs-material==9.5.22
-mkdocs-material-extensions==1.3.1
-
-# Required for Social Cards
-Pillow==10.0.1
-CairoSVG==2.7.1

telegram/T_info.py

@@ -10,7 +10,7 @@ class T_info:
     license = re.sub(
         r"\b\n",
         " ",
-        r.get("https://gitlab.com/simple-stock-bots/simple-stock-bot/-/raw/master/LICENSE").text,
+        r.get("https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot/-/raw/master/LICENSE").text,
     )
 
     help_text = """
@@ -21,7 +21,7 @@ Want stock data or to host your own bot? Help keep this bot free by using my
 
 📢 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://simplestockbot.com).
+**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.
@@ -43,7 +43,7 @@ Pick a ticker, and the bot shares the current price in chat. Note: Prices can la
 
 Data thanks to [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
 
-Bot issues? Use `/status` or [contact us](https://simplestockbot.com/contact).
+Bot issues? Use `/status` or [contact us](https://docs.simplestockbot.com/contact).
 
     """
 
@@ -56,7 +56,7 @@ All funds help maintain servers, with data from
 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://simplestockbot.com).
+For questions, visit our [website](https://docs.simplestockbot.com).
 """
 
 

telegram/bot.py

@@ -11,21 +11,27 @@ import traceback
 from uuid import uuid4
 
 import mplfinance as mpf
-from T_info import T_info
-
 import telegram
-from common.symbol_router import Router
-from telegram import InlineQueryResultArticle, InputTextMessageContent, LabeledPrice, Update
+from telegram import (
+    InlineQueryResultArticle,
+    InputTextMessageContent,
+    LabeledPrice,
+    Update,
+)
+
 from telegram.ext import (
     Application,
     CommandHandler,
-    ContextTypes,
     InlineQueryHandler,
-    MessageHandler,
     PreCheckoutQueryHandler,
+    MessageHandler,
     filters,
+    ContextTypes,
 )
 
+from common.symbol_router import Router
+from T_info import T_info
+
 # Enable logging
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
 
@@ -172,33 +178,17 @@ async def symbol_detect(update: Update, context: ContextTypes.DEFAULT_TYPE):
         message = update.message.text
         chat_id = update.message.chat_id
         if "$" in message:
-            log.info("Looking for Symbols")
             symbols = s.find_symbols(message)
+            log.info("Looking for Symbols")
         else:
             return
     except AttributeError as ex:
         log.info(ex)
         return
-
-    # Detect Options
-    if ("call" in message.lower()) or ("put" in message.lower()):
-        log.info("Options detected")
-        await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
-        try:
-            options_data = s.options(message, symbols)
-
-            await update.message.reply_text(
-                text=generate_options_reply(options_data),
-                parse_mode=telegram.constants.ParseMode.MARKDOWN,
-            )
-            return
-        except KeyError as ex:
-            logging.warning(ex)
-            pass
-
     if symbols:
-        log.info(f"Symbols found: {symbols}")
+        # 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}")
 
         for reply in s.price_reply(symbols):
             await update.message.reply_text(
@@ -208,47 +198,6 @@ async def symbol_detect(update: Update, context: ContextTypes.DEFAULT_TYPE):
             )
 
 
-def generate_options_reply(options_data: dict):
-    # Header with Option Symbol and Underlying
-    message_text = f"*{options_data['Option Symbol']} ({options_data['Underlying']})*\n\n"
-
-    # Key details
-    details = (
-        f"*Expiration:* `{options_data['Expiration']}`\n"
-        f"*Side:* `{options_data['side']}`\n"
-        f"*Strike:* `{options_data['strike']}`\n"
-        f"*First Traded:* `{options_data['First Traded']}`\n"
-        f"*Last Updated:* `{options_data['Last Updated']}`\n\n"
-    )
-    message_text += details
-
-    # Pricing info
-    pricing_info = (
-        f"*Bid:* `{options_data['bid']}` (Size: `{options_data['bidSize']}`)\n"
-        f"*Mid:* `{options_data['mid']}`\n"
-        f"*Ask:* `{options_data['ask']}` (Size: `{options_data['askSize']}`)\n"
-        f"*Last:* `{options_data['last']}`\n\n"
-    )
-    message_text += pricing_info
-
-    # Volume and open interest
-    volume_info = f"*Open Interest:* `{options_data['Open Interest']}`\n" f"*Volume:* `{options_data['Volume']}`\n\n"
-    message_text += volume_info
-
-    # Greeks
-    greeks_info = (
-        f"*IV:* `{options_data['Implied Volatility']}`\n"
-        f"*Delta:* `{options_data['delta']}`\n"
-        f"*Gamma:* `{options_data['gamma']}`\n"
-        f"*Theta:* `{options_data['theta']}`\n"
-        f"*Vega:* `{options_data['vega']}`\n"
-        f"*Rho:* `{options_data['rho']}`\n"
-    )
-    message_text += greeks_info
-
-    return message_text
-
-
 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}")

telegram/telegram-reqs.txt

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

tests.py

@@ -1,15 +1,27 @@
+import keyboard
 import time
 
-import keyboard
 
 tests = """$$xno
-$tsla
+/info $tsla
+/info $$btc
+/news $tsla
+/news $$btc
+/stat $tsla
+/stat $$btc
+/cap $tsla
+/cap $$btc
+/dividend $tsla
+/dividend $msft
+/dividend $$btc
 /intra $tsla
 /intra $$btc
 /chart $tsla
 /chart $$btc
 /help
-/trending""".split("\n")
+/trending""".split(
+    "\n"
+)
 
 print("press enter to start")
 keyboard.wait("enter")