Update: Major code refactor for modular extensibility #2

Merged

k.eaven merged 7 commits from development into main 2026-10-24 15:33:41 +00:00

Conversation 0 Commits 7 Files Changed 16

+3358 -473

k.eaven commented 2026-10-24 15:29:59 +00:00

Owner

Copy link

Copy source

Summary

This PR contains a major refactor of the Pterodactyl Discord Bot from a monolithic pterodisbot.py into a modular structure with 10 separate modules.

Changes

Modular Refactor

• Split pterodisbot.py (1586 lines) into 10 modules:
  • config.py - Configuration management with Pelican Panel support (pacc_/papp_ prefixes)
  • api.py - PanelAPI client for Pterodactyl/Pelican
  • models.py - Pydantic data models (requires pydantic>=2.14.1)
  • metrics.py - Server metrics tracking and graph generation
  • embeds.py - Discord embed lifecycle management
  • views.py - Discord UI components (buttons, dropdowns)
  • bot.py - Main bot class, commands, events
  • main.py - New entry point
  • logging_config.py - Logging configuration
  • exceptions.py - Custom exception classes

CI/CD Updates

• Updated .gitea/workflows/ci-cd.yml with new module targets for coverage, linting (flake8, pylint, black, isort, mypy), security scanning
• Added Pelican Panel test keys to test configs

Config Generation

• Added generate_config.py with smart logic:
  • Generates config.ini from environment variables if missing
  • Uses existing config if it matches environment variables
  • Regenerates if differs (environment variables always take priority)

Docker Updates

• Updated dockerfile to use Python 3.12, new entry point via entrypoint.sh
• entrypoint.sh runs config generation then starts bot via main.py

Dependencies

• Added pydantic>=2.14.1 to requirements.txt

Tests

• All 33 tests pass with updated imports and fixed mock fixtures

Testing

• All tests pass locally (33 passed, 10 warnings)
• Config generation verified: creates from scratch, preserves matching, regenerates on mismatch with env priority
• Docker entrypoint chain verified: entrypoint.sh -> generate_config.py -> main.py

## Summary This PR contains a major refactor of the Pterodactyl Discord Bot from a monolithic `pterodisbot.py` into a modular structure with 10 separate modules. ### Changes **Modular Refactor** - Split `pterodisbot.py` (1586 lines) into 10 modules: - `config.py` - Configuration management with Pelican Panel support (pacc_/papp_ prefixes) - `api.py` - PanelAPI client for Pterodactyl/Pelican - `models.py` - Pydantic data models (requires pydantic>=2.14.1) - `metrics.py` - Server metrics tracking and graph generation - `embeds.py` - Discord embed lifecycle management - `views.py` - Discord UI components (buttons, dropdowns) - `bot.py` - Main bot class, commands, events - `main.py` - New entry point - `logging_config.py` - Logging configuration - `exceptions.py` - Custom exception classes **CI/CD Updates** - Updated `.gitea/workflows/ci-cd.yml` with new module targets for coverage, linting (flake8, pylint, black, isort, mypy), security scanning - Added Pelican Panel test keys to test configs **Config Generation** - Added `generate_config.py` with smart logic: - Generates config.ini from environment variables if missing - Uses existing config if it matches environment variables - Regenerates if differs (environment variables always take priority) **Docker Updates** - Updated `dockerfile` to use Python 3.12, new entry point via `entrypoint.sh` - `entrypoint.sh` runs config generation then starts bot via `main.py` **Dependencies** - Added `pydantic>=2.14.1` to `requirements.txt` **Tests** - All 33 tests pass with updated imports and fixed mock fixtures ### Testing - All tests pass locally (33 passed, 10 warnings) - Config generation verified: creates from scratch, preserves matching, regenerates on mismatch with env priority - Docker entrypoint chain verified: entrypoint.sh -> generate_config.py -> main.py

k.eaven added 7 commits 2026-10-24 15:29:59 +00:00

Update: Major code refactor for modular extensibility 346e6d9604

Update CI/CD workflow for modular code structure: update test targets, linting targets, coverage modules, and add Pelican Panel test keys 0adc7f44e8

Add pydantic to requirements.txt for Docker container 316416bcbe

Fix: Auto-generate config.ini from environment variables with priority logic 451e202832

Fix: Update entrypoint.sh to use main.py instead of pterodisbot.py 8105f11c32

Fix: Update Dockerfile ENTRYPOINT to use entrypoint.sh for config generation 434eb7eea6

Redirect program entrypoint via shell script in image 49848286d7

k.eaven merged commit 92104fb4bf into main 2026-10-24 15:33:41 +00:00

k.eaven referenced this pull request 2026-10-26 11:41:22 +00:00

Remove redundant original code (pterodisbot.py) #4

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

Compat/Breaking

Breaking change that won't be backward compatible

Kind/Bug

Something is not working

Kind/Documentation

Documentation changes

Kind/Enhancement

Improve existing functionality

Kind/Feature

New functionality

Kind/Security

This is security issue

Kind/Testing

Issue or pull request related to testing

Priority

Critical

1

The priority is critical

Priority

High

2

The priority is high

Priority

Medium

3

The priority is medium

Priority

Low

4

The priority is low

Reviewed

Confirmed

1

Issue has been confirmed

Reviewed

Duplicate

2

This issue or pull request already exists

Reviewed

Invalid

3

Invalid issue

Reviewed

Won't Fix

3

This issue won't be fixed

Status

Blocked

1

Something is blocking this issue or pull request

Status

Need More Info

2

Feedback is required to reproduce issue or to continue work

Status

Abandoned

3

Somebody has started to work on this but abandoned work

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

k.eaven (Eaven Kimura)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: k.eaven/Pterodisbot#2