From 808c564d1c8f2de09433580a69b1a48a63fc77de Mon Sep 17 00:00:00 2001 From: diamante0018 Date: Fri, 2 Jan 2026 17:06:54 +0100 Subject: [PATCH] fix: bye getserve.rs --- bot/commands.py | 34 ------------------- bot/tasks.py | 12 +++++-- bot/utils.py | 89 +------------------------------------------------ 3 files changed, 10 insertions(+), 125 deletions(-) diff --git a/bot/commands.py b/bot/commands.py index fabe851..5e2ff88 100644 --- a/bot/commands.py +++ b/bot/commands.py @@ -5,7 +5,6 @@ import discord from discord import app_commands from bot.log import logger -from bot.utils import compile_stats, fetch_game_stats, perform_search from database import ( get_meme_patterns, add_aka_response, @@ -84,39 +83,6 @@ async def setup(bot): f"User **{user.name}** has been added to the blacklist.\n**Reason:** `{reason}`" ) - @bot.tree.command( - name="search", - description="Search for servers by hostname or IP.", - guild=discord.Object(id=GUILD_ID), - ) - async def slash_search(interaction: discord.Interaction, query: str): - results = await perform_search(query) - await interaction.response.send_message(results) - - @app_commands.checks.cooldown(1, 60, key=lambda i: (i.guild_id, i.user.id)) - @bot.tree.command( - name="stats", - description="Get stats for a specific game or all games", - guild=discord.Object(id=GUILD_ID), - ) - async def stats( - interaction: discord.Interaction, game: Literal["s1", "iw6", "t7", "all"] - ): - if game == "all": - stats_message = await compile_stats() - else: - data = await fetch_game_stats(game) - if data: - stats_message = f"**Stats for {game.upper()}:**\n" - count_servers = data.get("countServers", "N/A") - count_players = data.get("countPlayers", "N/A") - stats_message += f"Total Servers: {count_servers}\n" - stats_message += f"Total Players: {count_players}\n" - else: - stats_message = "Failed to fetch game stats. Please try again later." - - await interaction.response.send_message(stats_message, ephemeral=True) - @bot.tree.command( name="aka", description="Check if the input matches any predefined aka patterns.", diff --git a/bot/tasks.py b/bot/tasks.py index 28e6e7b..053f0b2 100644 --- a/bot/tasks.py +++ b/bot/tasks.py @@ -128,10 +128,16 @@ async def setup(bot): @tasks.loop(minutes=10) async def update_status(): data = fetch_api_data() - countPlayers = data.get("countPlayers", 0) - countServers = data.get("countServers", 0) + total_players = 0 + total_servers = 0 + + if data: + for game_key, game_data in data.items(): + total_players += game_data.get("players", 0) + total_servers += game_data.get("servers", 0) + activity = discord.Game( - name=f"with {countPlayers} players on {countServers} servers" + name=f"with {total_players} players on {total_servers} servers" ) await bot.change_presence(activity=activity) diff --git a/bot/utils.py b/bot/utils.py index 582db17..6459be9 100644 --- a/bot/utils.py +++ b/bot/utils.py @@ -19,7 +19,7 @@ def fetch_api_data(): Returns: dict: API response data or empty dict on failure """ - url = "https://api.getserve.rs/v1/servers/alterware" + url = "https://server.alterware.dev/stats.json" try: response = requests.get(url, timeout=10) @@ -54,93 +54,6 @@ def fetch_api_data(): return {} -async def fetch_game_stats(game: str): - """ - Fetch game-specific stats from the getserve.rs API - - Args: - game (str): Game identifier - - Returns: - dict: Game stats data or None on failure - """ - url = f"https://api.getserve.rs/v1/servers/alterware/{game}" - - try: - response = requests.get(url, timeout=10) - - response.raise_for_status() - - if response.status_code == 200: - return response.json() - else: - logger.warning( - f"API returned non-200 status for game {game}: {response.status_code}" - ) - return None - - except Timeout: - logger.error(f"Request to {url} timed out after 10 seconds") - return None - - except ConnectionError as e: - # This catches DNS resolution errors, connection refused, etc. - logger.error(f"Connection error for {url}: {e}") - return None - - except RequestException as e: - logger.error(f"Request failed for {url}: {e}") - return None - - except ValueError as e: - logger.error(f"Failed to parse JSON response from {url}: {e}") - return None - - except Exception as e: - logger.error(f"Unexpected error while fetching game stats from {url}: {e}") - return None - - -async def compile_stats(): - games = ["s1", "iw6", "t7"] - stats_message = "**Stats for all games:**\n" - for game in games: - data = await fetch_game_stats(game) - if data: - count_servers = data.get("countServers", "N/A") - count_players = data.get("countPlayers", "N/A") - stats_message += f"**{game.upper()}:** Total Servers: {count_servers}, Total Players: {count_players}\n" - else: - stats_message += f"**{game.upper()}:** Failed to fetch stats.\n" - return stats_message - - -async def perform_search(query: str): - data = fetch_api_data() - servers = data.get("servers", []) - matching_servers = [ - server - for server in servers - if query.lower() in server.get("hostnameDisplay", "").lower() - or query.lower() in server.get("ip", "").lower() - ] - - if not matching_servers: - return "No servers found matching your query." - - max_results = 5 - message = ( - f'Top {min(len(matching_servers), max_results)} servers matching "{query}":\n' - ) - for server in matching_servers[:max_results]: - message += ( - f"- **{server['hostnameDisplay']}** | {server['gameDisplay']} | " - f"**Gametype**: {server['gametypeDisplay']} | **Map**: {server['mapDisplay']} | " - f"**Players**: {server['realClients']}/{server['maxplayers']}\n" - ) - return message - - # Timeout a member async def timeout_member( member: discord.Member,