jerick/faction_war_dispatch_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Poll Interval setting

Browse Source
This commit is contained in:
jerick
2026-01-27 08:48:33 -05:00
parent 99ffe7f9e9
commit 6e3f8b46a5
6 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
routers/config.py
View File

@@ -31,24 +31,29 @@ def reload_config_from_file():
async def get_config():
"""Get all config values (with sensitive values masked)"""
path = Path("data/config.json")
if not path.exists():
# Return defaults from config.py (masked)
config_values = {
"TORN_API_KEY": config_module.TORN_API_KEY,
"FFSCOUTER_KEY": config_module.FFSCOUTER_KEY,
"DISCORD_TOKEN": config_module.DISCORD_TOKEN,
"ALLOWED_CHANNEL_ID": config_module.ALLOWED_CHANNEL_ID,
"POLL_INTERVAL": config_module.POLL_INTERVAL,
"HIT_CHECK_INTERVAL": config_module.HIT_CHECK_INTERVAL,
"REASSIGN_DELAY": config_module.REASSIGN_DELAY,
"ASSIGNMENT_TIMEOUT": config_module.ASSIGNMENT_TIMEOUT,
"ASSIGNMENT_REMINDER": config_module.ASSIGNMENT_REMINDER,
"CHAIN_TIMER_THRESHOLD": config_module.CHAIN_TIMER_THRESHOLD
}
else:
# Default config values from config.py
default_values = {
"TORN_API_KEY": config_module.TORN_API_KEY,
"FFSCOUTER_KEY": config_module.FFSCOUTER_KEY,
"DISCORD_TOKEN": config_module.DISCORD_TOKEN,
"ALLOWED_CHANNEL_ID": config_module.ALLOWED_CHANNEL_ID,
"HIT_CHECK_INTERVAL": config_module.HIT_CHECK_INTERVAL,
"REASSIGN_DELAY": config_module.REASSIGN_DELAY,
"ASSIGNMENT_TIMEOUT": config_module.ASSIGNMENT_TIMEOUT,
"ASSIGNMENT_REMINDER": config_module.ASSIGNMENT_REMINDER,
"CHAIN_TIMER_THRESHOLD": config_module.CHAIN_TIMER_THRESHOLD
}
if path.exists():
with open(path, "r", encoding="utf-8") as f:
data = json.load(f)
config_values = data.get("config", {})
file_values = data.get("config", {})
# Merge defaults with file values (file values take precedence)
config_values = {**default_values, **file_values}
else:
config_values = default_values
# Mask sensitive values
masked_config = config_values.copy()
@@ -66,6 +71,17 @@ async def update_config(req: ConfigUpdateRequest):
"""Update a single config value"""
path = Path("data/config.json")
# Valid config keys (from config.py)
valid_keys = {
"TORN_API_KEY", "FFSCOUTER_KEY", "DISCORD_TOKEN", "ALLOWED_CHANNEL_ID",
"HIT_CHECK_INTERVAL", "REASSIGN_DELAY",
"ASSIGNMENT_TIMEOUT", "ASSIGNMENT_REMINDER", "CHAIN_TIMER_THRESHOLD"
}
# Validate key is valid
if req.key not in valid_keys:
raise HTTPException(status_code=400, detail="Invalid config key")
# Load existing or create from current config
if path.exists():
with open(path, "r", encoding="utf-8") as f:
@@ -78,7 +94,6 @@ async def update_config(req: ConfigUpdateRequest):
"FFSCOUTER_KEY": config_module.FFSCOUTER_KEY,
"DISCORD_TOKEN": config_module.DISCORD_TOKEN,
"ALLOWED_CHANNEL_ID": config_module.ALLOWED_CHANNEL_ID,
"POLL_INTERVAL": config_module.POLL_INTERVAL,
"HIT_CHECK_INTERVAL": config_module.HIT_CHECK_INTERVAL,
"REASSIGN_DELAY": config_module.REASSIGN_DELAY,
"ASSIGNMENT_TIMEOUT": config_module.ASSIGNMENT_TIMEOUT,
@@ -87,9 +102,10 @@ async def update_config(req: ConfigUpdateRequest):
}
}
# Validate key exists
# Add key if it doesn't exist in config (for backwards compatibility)
if req.key not in data["config"]:
raise HTTPException(status_code=400, detail="Invalid config key")
print(f"Adding new config key: {req.key}")
data["config"][req.key] = getattr(config_module, req.key)
# Update value
data["config"][req.key] = req.value