Merge development into main: Multi-guild support + fixes #5

Merged

k.eaven merged 4 commits from development into main 2026-11-03 10:25:34 +00:00

Conversation 0 Commits 4 Files Changed 9

+803 -409

k.eaven commented 2026-11-03 10:13:32 +00:00

Owner

Copy link

Copy source

Summary

This PR merges the development branch into main, bringing multi-guild support and several fixes.

Changes

Features

• Multi-guild support implementation (commit bec06bd):
  • Per-guild server tracking and embed isolation
  • Role-based access control per guild ("Game Server User" role)
  • Multi-guild command handling with guild validation
  • Updated Discord permission validation per guild
  • Embed storage migration from single-guild to multi-guild format

Fixes

• chore: Remove stray file (commit 9a3122a)
• chore: correct errors in README (commit 204cc67): Fixed note from "multiple Pterodactyl domains" to "singular Pterodactyl or Pelican domain with multiple Discord guilds"
• Format resource usage denominators left-aligned in embeds (commit f3f7bb9): Changed format_limit() to use left-alignment for cleaner visual formatting

Testing

• All 33 Pterodisbot tests pass
• All 19 APIcord tests pass
• Linting (flake8, isort, black) passes

Deployment Notes

• Backwards compatible with existing single-guild deployments
• Persistent volume paths unchanged (logs/, embed/)
• Docker builds work with existing configurations
• Embed locations automatically migrate on first run

## Summary This PR merges the `development` branch into `main`, bringing multi-guild support and several fixes. ## Changes ### Features - **Multi-guild support implementation** (commit `bec06bd`): - Per-guild server tracking and embed isolation - Role-based access control per guild ("Game Server User" role) - Multi-guild command handling with guild validation - Updated Discord permission validation per guild - Embed storage migration from single-guild to multi-guild format ### Fixes - **chore: Remove stray file** (commit `9a3122a`) - **chore: correct errors in README** (commit `204cc67`): Fixed note from "multiple Pterodactyl domains" to "singular Pterodactyl or Pelican domain with multiple Discord guilds" - **Format resource usage denominators left-aligned in embeds** (commit `f3f7bb9`): Changed format_limit() to use left-alignment for cleaner visual formatting ## Testing - All 33 Pterodisbot tests pass - All 19 APIcord tests pass - Linting (flake8, isort, black) passes ## Deployment Notes - Backwards compatible with existing single-guild deployments - Persistent volume paths unchanged (`logs/`, `embed/`) - Docker builds work with existing configurations - Embed locations automatically migrate on first run

k.eaven added 4 commits 2026-11-03 10:13:32 +00:00

feat: Multi-guild support implementation ... bec06bd909

- Added multi-guild support with comma-separated AllowedGuildIDs config
- Per-guild embed tracking with isolated state
- Per-server action locking to prevent race conditions across guilds
- Cross-guild embed updates after power actions
- Debug logging for embed update triggers
- Fixed resource usage field formatting (brackets now properly closed)
- Updated config.ini.sample, generate_config.py for backward compatibility
- Updated README.md with multi-guild documentation
- Updated tests for multi-guild support

chore: Remove stray file 9a3122a259

Chore: correct errors in README 204cc6704c

Format resource usage denominators left-aligned in embeds ... f3f7bb9c4a

- Changed format_limit() in _add_resource_fields() to use left-alignment (<8) instead of right-alignment (>8)
- Denominators (limits/∞) now align left relative to the '/' separator
- Produces cleaner visual formatting in resource usage section

k.eaven merged commit 3743d19d9d into main 2026-11-03 10:25:34 +00:00

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#5