Skip to content

Relay the join screen to the lobby channel both ways - #112

Merged
valzargaming merged 1 commit into
mainfrom
claude/project-thread-eaek8g
Nov 17, 2026
Merged

valzargaming merged 1 commit into
mainfrom
claude/project-thread-eaek8g

Conversation

@valzargaming

Copy link
Copy Markdown
Member

Requested by Val · project thread

The server's lobby channel had nothing feeding it: the game never called /lobbymessage, and Discord messages there went nowhere. This PR pairs with Civ13/Civ13#5925.

  • /lobbymessage moves to handleLobbyWebhook. It checks the service key like the OOC/IC routes, validates the ckey, and takes kind:

    • chat (default): the existing "LOBBY ckey: message" line, moderated like OOC.
    • join_screen: "[time] Key is on the join screen."
    • entered: "[time] Key entered the world."

    The arrival lines carry no identity lookup, and markdown in the key is escaped.

  • Plain messages in a server's lobby channel relay to SQL/discord2lobby.txt (GameServer::LobbyMessage). They use the same eligibility, formatting, badword and 🔥-on-failure rules as Discord OOC. Secondary shard regions are skipped.

Tests: new tests/local/lobby-webhook.php (added to local-profile.yml), and tests/local/ooc-auto-relay.php extended with lobby routing and the real IPC record. Every php tests/... command in local-profile.yml passes locally, except tests/windows/packaged-exe-smoke.php, which needs a built Windows exe.


Generated by Claude Code

The lobby webhook now checks the service key like the other chat routes and
takes a kind: chat (the existing LOBBY line), join_screen and entered arrival
notices. Plain messages in a server's lobby channel go to the game through
SQL/discord2lobby.txt with the same eligibility, formatting and badword rules
as Discord OOC; secondary shard regions are skipped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016WTP2QxSKVCEeWYEHrcnJq
Copilot AI balanced review requested due to automatic review settings November 17, 2026 16:13
@valzargaming valzargaming self-assigned this Nov 17, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.

@coderabbitai

coderabbitai Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Explain Change →

Caution

Review failed

The pull request is closed.

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@valzargaming
valzargaming merged commit baf4b4c into main Nov 17, 2026
74 of 75 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants