From 27d5d056fe64a711c5875a53d005538a2d1f5ab1 Mon Sep 17 00:00:00 2001 From: WhatDidYouExpect <89535984+WhatDidYouExpect@users.noreply.github.com> Date: Thu, 10 Jul 2025 20:37:57 +0200 Subject: [PATCH] pinging is fucking stupid --- bot.py | 2 - modules/central.py | 99 ---------------------------------------------- 2 files changed, 101 deletions(-) delete mode 100644 modules/central.py diff --git a/bot.py b/bot.py index b11da34..437d777 100644 --- a/bot.py +++ b/bot.py @@ -45,7 +45,6 @@ from discord.abc import Messageable from better_profanity import profanity from discord.ext import commands -from modules.central import ping_server from modules.volta.main import _, set_language from modules.markovmemory import * from modules.version import * @@ -135,7 +134,6 @@ async def on_ready() -> None: synced: List[discord.app_commands.AppCommand] = await bot.tree.sync() logger.info(f"{_('synced_commands')} {len(synced)} {(_('synced_commands2'))}") slash_commands_enabled = True - ping_server() # ping_server from modules/central.py active_users: str = await fetch_active_users() logger.info(f"{(_('active_users:'))} {active_users}") diff --git a/modules/central.py b/modules/central.py deleted file mode 100644 index f13b23f..0000000 --- a/modules/central.py +++ /dev/null @@ -1,99 +0,0 @@ -import requests -import os -import modules.globalvars as gv -from modules.volta.main import _ -from modules.markovmemory import get_file_info -import logging -logger = logging.getLogger("goober") - -# Ping the server to check if it's alive and send some info -def ping_server(): - if gv.ALIVEPING == "false": - # If pinging is disabled, print message and set environment variable - print(f"{gv.YELLOW}{(_('pinging_disabled'))}") - os.environ['gooberauthenticated'] = 'No' - return - # Get server alert message - goobres = requests.get(f"{gv.VERSION_URL}/alert") - logger.info(f"{(_('goober_server_alert'))}{goobres.text}") - # Gather file info for payload - file_info = get_file_info(gv.MEMORY_FILE) - payload = { - "name": gv.NAME, - "memory_file_info": file_info, - "version": gv.local_version, - "slash_commands": gv.slash_commands_enabled, - "token": gv.gooberTOKEN - } - try: - # Send ping to server - response = requests.post(gv.VERSION_URL+"/ping", json=payload) - if response.status_code == 200: - # Success: print message and set environment variable - logger.info(f"{(_('goober_ping_success')).format(NAME=gv.NAME)}") - os.environ['gooberauthenticated'] = 'Yes' - else: - # Failure: print error and set environment variable - logger.error(f"{(_('goober_ping_fail'))} {response.status_code}") - os.environ['gooberauthenticated'] = 'No' - except Exception as e: - # Exception: print error and set environment variable - logger.error(f"{(_('goober_ping_fail2'))} {str(e)}") - os.environ['gooberauthenticated'] = 'No' - -# Check if a given name is available for registration -def is_name_available(NAME): - if os.getenv("gooberTOKEN"): - # If token is already set, skip check - return - try: - # Send request to check name availability - response = requests.post(f"{gv.VERSION_URL}/check-if-available", json={"name": NAME}, headers={"Content-Type": "application/json"}) - if response.status_code == 200: - data = response.json() - return data.get("available", False) - else: - # Print error if request failed - logger.error(f"{(_('name_check'))}", response.json()) - return False - except Exception as e: - # Print exception if request failed - logger.error(f"{(_('name_check2'))}", e) - return False - -# Register a new name with the server -def register_name(NAME): - try: - if gv.ALIVEPING == False: - # If pinging is disabled, do nothing - return - # Check if the name is available - if not is_name_available(NAME): - if os.getenv("GOOBERTOKEN"): - return - # Name taken: print error and exit - logger.critical(f"{(_('name_taken'))}") - quit() - # Register the name - response = requests.post(f"{gv.VERSION_URL}/register", json={"name": NAME}, headers={"Content-Type": "application/json"}) - if response.status_code == 200: - data = response.json() - token = data.get("token") - if not os.getenv("gooberTOKEN"): - # Print instructions to add token and exit - logger.info(f"{(_('add_token')).format(token=token)} gooberTOKEN=.") - quit() - else: - print(f"{gv.GREEN}{gv.gv.RESET}") - return token - else: - # Print error if registration failed - logger.critical(f"{gv.RED}{(_('token_exists')).format()}", response.json()) - return None - except Exception as e: - # Print exception if registration failed - logger.critical(f"{gv.RED}{(_('registration_error')).format()}", e) - return None - -# Attempt to register the name at module load -register_name(gv.NAME) \ No newline at end of file