commit before utter laptop death

modules/globalvars.py

@@ -1,80 +1,71 @@
 import os
 import platform
+from typing import Callable, List
+from dotenv import load_dotenv
 import pathlib
 import subprocess
 
-from dotenv import load_dotenv
-import discord
-from discord import Colour, Embed, File, Interaction, Message
-from discord.ext import commands
-from discord import app_commands
-from discord.abc import Messageable
 
-env_path = pathlib.Path(__file__).parent.parent / '.env'
+def get_git_branch():
+    try:
+        branch = (
+            subprocess.check_output(
+                ["git", "rev-parse", "--abbrev-ref", "HEAD"], stderr=subprocess.DEVNULL
+            )
+            .decode("utf-8")
+            .strip()
+        )
+        return branch
+    except subprocess.CalledProcessError:
+        return None
+
+
+env_path = pathlib.Path(__file__).parent.parent / ".env"
 load_dotenv(dotenv_path=env_path)
 
-# ANSI colors
+available_cogs: Callable[[], List[str]] = lambda: [
+    file[:-3] for file in os.listdir("assets/cogs") if file.endswith(".py")
+]
+
 ANSI = "\033["
 RED = f"{ANSI}31m"
 GREEN = f"{ANSI}32m"
 YELLOW = f"{ANSI}33m"
 PURPLE = f"{ANSI}35m"
-DEBUG = f"{ANSI}1;30m"
+DEBUG = f"{ANSI}90m"
 RESET = f"{ANSI}0m"
 
 VERSION_URL = "https://raw.githubusercontent.com/gooberinc/version/main"
-UPDATE_URL = f"{VERSION_URL}/latest_version.json"
+UPDATE_URL = VERSION_URL + "/latest_version.json"
 print(UPDATE_URL)
-
 LOCAL_VERSION_FILE = "current_version.txt"
-MEMORY_FILE = "memory.json"
-MEMORY_LOADED_FILE = "MEMORY_LOADED"  # used in markov module
-local_version = "3.0.0"
-latest_version = "0.0.0"
-os.environ['gooberlocal_version'] = local_version
 
-def get_git_branch() -> str | None:
-    try:
-        return subprocess.check_output(
-            ["git", "rev-parse", "--abbrev-ref", "HEAD"],
-            stderr=subprocess.DEVNULL
-        ).decode().strip()
-    except subprocess.CalledProcessError:
-        return None
+# TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
+# PREFIX = os.getenv("BOTPREFIX", "g.")
+# PING_LINE = os.getenv("PINGLINE")
+# CHECKS_DISABLED = os.getenv("CHECKSDISABLED")
+# LOCALE = os.getenv("LOCALE", "en")
+# BLACKLISTED_USERS = os.getenv("BLACKLISTEDUSERS", "").split(",")
+# USERTRAIN_ENABLED = os.getenv("USERTRAINENABLED", "true").lower() == "true"
+# NAME = os.getenv("NAME")
+# MEMORY_FILE = "memory.json"
+# MEMORY_LOADED_FILE = "MEMORY_LOADED" # is this still even used?? okay just checked its used in the markov module
+# ALIVEPING = os.getenv("ALIVEPING")
+# AUTOUPDATE = os.getenv("AUTOUPDATE")
+# REACT = os.getenv("REACT")
 
-branch = get_git_branch()
-beta = branch != "main" if branch else True
+# gooberTOKEN = os.getenv("GOOBERTOKEN")
+# splashtext = os.getenv("SPLASHTEXT")
+# ownerid = int(os.getenv("OWNERID", "0"))
+# showmemenabled = os.getenv("SHOWMEMENABLED")
 
-TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
-PREFIX = os.getenv("BOTPREFIX", "g.")
-PING_LINE = os.getenv("PINGLINE")
-CHECKS_DISABLED = os.getenv("CHECKSDISABLED")
-LOCALE = os.getenv("LOCALE", "en")
-gooberTOKEN = os.getenv("GOOBERTOKEN")
-splashtext = os.getenv("SPLASHTEXT")
-ownerid = int(os.getenv("OWNERID", "0"))
-status = os.getenv("STATUS")
-showmemenabled = os.getenv("SHOWMEMENABLED")
-BLACKLISTED_USERS = os.getenv("BLACKLISTEDUSERS", "").split(",")
-USERTRAIN_ENABLED = os.getenv("USERTRAINENABLED", "true").lower() == "true"
-NAME = os.getenv("NAME")
-ALIVEPING = os.getenv("ALIVEPING")
-AUTOUPDATE = os.getenv("AUTOUPDATE")
-song = os.getenv("SONG")
-REACT = os.getenv("REACT")
-
-intents = discord.Intents.default()
-intents.messages = True
-intents.presences = True
-intents.members = True
-intents.message_content = True
-
-bot = commands.Bot(
-    command_prefix=PREFIX,
-    intents=intents,
-    allowed_mentions=discord.AllowedMentions(
-        everyone=False, roles=False, users=False, replied_user=True
-    )
-)
 
+# IGNOREWARNING = False # is this either??? i don't think so?
+# song = os.getenv("song")
+arch = platform.machine()
+slash_commands_enabled = True  # 100% broken, its a newer enough version so its probably enabled by default.... fix this at somepoint or hard code it in goober central code
 launched = False
+latest_version = "0.0.0"
+local_version = "3.0.0"
+os.environ["gooberlocal_version"] = local_version
+beta = get_git_branch() == "dev"