Skip to content

Stop the bot crashing when hosted verification is unavailable #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valzargaming merged 1 commit into from
Oct 29, 2026
Merged

Stop the bot crashing when hosted verification is unavailable #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/Civ13/Moderator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Civ13;

use Civ13\Exceptions\VerifierException;
use Discord\Discord;
use Monolog\Logger;
use React\Promise\PromiseInterface;
Expand Down Expand Up @@ -169,9 +170,15 @@ public function scrutinizeCkey(string $ckey): void
}
}
}
if ($this->civ13->verifier->get('ss13', $ckey)) {
try {
if ($this->civ13->verifier->get('ss13', $ckey)) {
return;
} // Verified users are exempt from further checks
} catch (VerifierException $e) { // Verification status is unknown, so never treat the user as unverified
$this->logger->warning("Skipped new-account checks for `$ckey`: {$e->getMessage()}");

return;
} // Verified users are exempt from further checks
}
if (! isset($this->civ13->permitted[$ckey]) && ! isset($this->civ13->ages[$ckey]) && ($age = $this->civ13->getByondAge($ckey)) && ! $this->civ13->checkByondAge($age)) { // Force new accounts to register in Discord
$ban = ['ckey' => $ckey, 'duration' => '999 years', 'reason' => "Byond account `$ckey` must register and be approved to play. ($age) Verify at {$this->civ13->discord_formatted}"];
if (isset($this->civ13->channel_ids['staff_bot']) && $channel = $this->discord->getChannel($this->civ13->channel_ids['staff_bot'])) {
Expand Down Expand Up @@ -235,7 +242,14 @@ private function __relayViolation(GameServer $gameserver, string $ckey, array $b

if (isset($this->civ13->verifier)) {
if ($guild = $this->discord->guilds->get('id', $this->civ13->civ13_guild_id)) {
if ($item = $this->civ13->verifier->get('ss13', $ckey)) {
try {
$item = $this->civ13->verifier->get('ss13', $ckey);
} catch (VerifierException $e) { // Admin status is unknown; warn only rather than risk banning staff
$this->logger->warning("Skipped chat-moderation ban for `$ckey`: {$e->getMessage()}");

return false;
}
if ($item) {
if (isset($item['discord']) && $member = $guild->members->get('id', $item['discord'])) {
if ($member->roles->has($this->civ13->role_ids['Admin'])) {
return false;
Expand Down
Loading