This commit addresses critical bugs in the injury command system and establishes best practices for Discord command groups. ## Critical Fixes ### 1. GroupCog → app_commands.Group Migration - **Problem**: `commands.GroupCog` has a duplicate interaction processing bug causing "404 Unknown interaction" errors when deferring responses - **Root Cause**: GroupCog triggers command handler twice, consuming the interaction token before the second execution can respond - **Solution**: Migrated InjuryCog to InjuryGroup using `app_commands.Group` pattern (same as ChartManageGroup and ChartCategoryGroup) - **Result**: Reliable command execution, no more 404 errors ### 2. GiphyService GIF URL Fix - **Problem**: Giphy service returned web page URLs (https://giphy.com/gifs/...) instead of direct image URLs, preventing Discord embed display - **Root Cause**: Code accessed `data.url` instead of `data.images.original.url` - **Solution**: Updated both `get_disappointment_gif()` and `get_gif()` methods to use correct API response path for embeddable GIF URLs - **Result**: GIFs now display correctly in Discord embeds ## Documentation ### Command Groups Best Practices (commands/README.md) Added comprehensive section documenting: - **Critical Warning**: Never use `commands.GroupCog` - use `app_commands.Group` - **Technical Explanation**: Why GroupCog fails (duplicate execution bug) - **Migration Guide**: Step-by-step conversion from GroupCog to Group - **Comparison Table**: Key differences between the two approaches - **Working Examples**: References to ChartManageGroup, InjuryGroup patterns ## Architecture Changes ### Injury Commands (`commands/injuries/`) - Converted from `commands.GroupCog` to `app_commands.Group` - Registration via `bot.tree.add_command()` instead of `bot.add_cog()` - Removed workarounds for GroupCog duplicate interaction issues - Clean defer/response pattern with `@logged_command` decorator ### GiphyService (`services/giphy_service.py`) - Centralized from `commands/soak/giphy_service.py` - Now returns direct GIF image URLs for Discord embeds - Maintains Trump GIF filtering (legacy behavior) - Added gif_url to log output for debugging ### Configuration (`config.py`) - Added `giphy_api_key` and `giphy_translate_url` settings - Environment variable support via `GIPHY_API_KEY` - Default values provided for out-of-box functionality ## Files Changed - commands/injuries/: New InjuryGroup with app_commands.Group pattern - services/giphy_service.py: Centralized service with GIF URL fix - commands/soak/giphy_service.py: Backwards compatibility wrapper - commands/README.md: Command groups best practices documentation - config.py: Giphy configuration settings - services/__init__.py: GiphyService exports 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
104 lines
2.8 KiB
Python
104 lines
2.8 KiB
Python
"""
|
|
Configuration management for Discord Bot v2.0
|
|
"""
|
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
|
|
|
# Baseball position constants (static, not configurable)
|
|
PITCHER_POSITIONS = {"SP", "RP", "P"}
|
|
POSITION_FIELDERS = {"C", "1B", "2B", "3B", "SS", "LF", "CF", "RF", "OF", "DH"}
|
|
ALL_POSITIONS = PITCHER_POSITIONS | POSITION_FIELDERS
|
|
|
|
|
|
class BotConfig(BaseSettings):
|
|
"""Application configuration with environment variable support."""
|
|
|
|
# Discord settings
|
|
bot_token: str
|
|
guild_id: int
|
|
|
|
# Database API settings
|
|
api_token: str
|
|
db_url: str
|
|
|
|
# Discord Limits
|
|
discord_embed_limit: int = 6000
|
|
discord_field_value_limit: int = 1024
|
|
discord_embed_description_limit: int = 4096
|
|
|
|
# League settings
|
|
sba_season: int = 12
|
|
pd_season: int = 9
|
|
fa_lock_week: int = 14
|
|
sba_color: str = "a6ce39"
|
|
weeks_per_season: int = 18
|
|
games_per_week: int = 4
|
|
modern_stats_start_season: int = 8
|
|
|
|
# Current Season Constants
|
|
sba_current_season: int = 12
|
|
pd_current_season: int = 9
|
|
|
|
# API Constants
|
|
api_version: str = "v3"
|
|
default_timeout: int = 10
|
|
max_retries: int = 3
|
|
|
|
# Draft Constants
|
|
default_pick_minutes: int = 10
|
|
draft_rounds: int = 25
|
|
|
|
# Special Team IDs
|
|
free_agent_team_id: int = 498
|
|
|
|
# Role Names
|
|
help_editor_role_name: str = "Help Editor"
|
|
sba_players_role_name: str = "Season 12 Players"
|
|
|
|
# Channel Names
|
|
sba_network_news_channel: str = "sba-network-news"
|
|
|
|
# Base URLs
|
|
sba_base_url: str = "https://sba.manticorum.com"
|
|
|
|
# Application settings
|
|
log_level: str = "INFO"
|
|
environment: str = "development"
|
|
testing: bool = False
|
|
|
|
# Google Sheets settings
|
|
sheets_credentials_path: str = "/app/data/major-domo-service-creds.json"
|
|
|
|
# Giphy API settings
|
|
giphy_api_key: str = "H86xibttEuUcslgmMM6uu74IgLEZ7UOD"
|
|
giphy_translate_url: str = "https://api.giphy.com/v1/gifs/translate"
|
|
|
|
# Optional Redis caching settings
|
|
redis_url: str = "" # Empty string means no Redis caching
|
|
redis_cache_ttl: int = 300 # 5 minutes default TTL
|
|
|
|
model_config = SettingsConfigDict(
|
|
env_file=".env",
|
|
case_sensitive=False,
|
|
extra="ignore" # Ignore extra environment variables
|
|
)
|
|
|
|
@property
|
|
def is_development(self) -> bool:
|
|
"""Check if running in development mode."""
|
|
return self.environment.lower() == "development"
|
|
|
|
@property
|
|
def is_testing(self) -> bool:
|
|
"""Check if running in test mode."""
|
|
return self.testing
|
|
|
|
|
|
# Global configuration instance - lazily initialized to avoid import-time errors
|
|
_config = None
|
|
|
|
def get_config() -> BotConfig:
|
|
"""Get the global configuration instance."""
|
|
global _config
|
|
if _config is None:
|
|
_config = BotConfig() # type: ignore
|
|
return _config |