move things into right area and dump old shit

Author: ptrlrd

bot/bot.py

@@ -1,7 +1,6 @@
 import nextcord
 from nextcord.ext import commands
-from shared.config import CHANNEL_ID, DISCORD_TOKEN, GUILD_ID
-from main import BOT_STATUS, bot_name
+from shared.config import CHANNEL_ID, DISCORD_TOKEN, GUILD_ID, BOT_STATUS, BOT_NAME
 
 # Create an instance of the bot with all intents enabled
 intents = nextcord.Intents.all()
@@ -41,18 +40,14 @@ async def on_ready():
 
     Prints a message to the console to indicate that the bot is ready.
     """
-    print(f'{bot_name} has connected to Discord!')
+    print(f'{BOT_NAME} has connected to Discord!')
     # Mark the bot as "up" when it is online
-    BOT_STATUS.labels(bot_name=bot_name).set(1)
+    BOT_STATUS.labels(bot_name=BOT_NAME).set(1)
 
 
 @bot.event
 async def on_disconnect():
-    print(f'{bot_name} has disconnected from Discord!')
+    print(f'{BOT_NAME} has disconnected from Discord!')
     # Mark the bot as "down" when it is offline
-    BOT_STATUS.labels(bot_name=bot_name).set(0)
+    BOT_STATUS.labels(bot_name=BOT_NAME).set(0)
 
-if __name__ == '__main__':
-
-    # Run the bot with the specified token
-    bot.run(DISCORD_TOKEN)

main.py

@@ -3,11 +3,9 @@
 from web.app import app
 from shared.config import DISCORD_TOKEN, ENABLE_LOGGING
 from shared.logger import setup_logging  # Importing from your logger module
-from prometheus_client import start_http_server, Gauge
+from prometheus_client import start_http_server
 import time
 
-BOT_STATUS = Gauge('discord_bot_status', 'Status of the Discord bot', ['bot_name'])
-bot_name = 'Kernel'
 
 def start_prometheus_server():
     # Start a Prometheus HTTP server on port 8000
@@ -31,5 +29,4 @@ def run():
     bot.load_extension('bot.news_feed')
     # bot.load_extension('bot.moderation') Turning off because it's not working
     # Start the bot
-    start_prometheus_server()
     bot.run(DISCORD_TOKEN)

shared/config.py

@@ -1,5 +1,6 @@
 from dotenv import load_dotenv
 import os
+from prometheus_client import Gauge
 
 GUILD_ID = 930170875049820181
 CHANNEL_ID = 978644045519802378  # This will be imported in both bot and web modules
@@ -19,3 +20,5 @@
                  "https://www.wired.com/feed/rss",
                  ]
 
+BOT_STATUS = Gauge('discord_bot_status', 'Status of the Discord bot', ['bot_name'])
+BOT_NAME = 'Kernel'