Skip to content

Commit d5829d7

Browse files
committed
Readability testing
1 parent e0a4b71 commit d5829d7

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/Civ13/Slash.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -755,14 +755,21 @@ private function __declareListeners(): void
755755
{
756756
if (! isset($interaction->data->options['server']) || ! $server = $interaction->data->options['server']->value) return $this->respondWithMessage($interaction, MessageBuilder::new()->setContent("No server specified"), true);
757757
if (! $gameserver = $this->civ13->enabled_gameservers[$server]) return $this->respondWithMessage($interaction, MessageBuilder::new()->setContent("No enabled server found for `{$server}`"), true);
758-
return $interaction->acknowledge()->then(fn(): PromiseInterface => // wait until the bot says "Is thinking..."
759-
$gameserver->recalculateRanking()->then(
760-
fn() => $gameserver->getRanking()->then(
761-
fn(string $ranking) => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent($ranking), true),
762-
fn(MissingSystemPermissionException $e) => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent(/*"Ranking for the `{$gameserver->name}` server are not currently available." . */$e->getMessage()), true)
763-
), fn(MissingSystemPermissionException $e) => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent(/*"Ranking for the `{$gameserver->name}` server are not currently available." . */$e->getMessage()), true)
764-
)
758+
759+
$promise = $interaction->acknowledge(); // wait until the bot says "Is thinking..."
760+
$promise = $promise->then(
761+
fn(): PromiseInterface => $gameserver->recalculateRanking(),
762+
fn($e) => $this->logger->error($e->getMessage())
763+
);
764+
$promise = $promise->then(
765+
fn(): PromiseInterface => $gameserver->getRanking(),
766+
fn(MissingSystemPermissionException $e): PromiseInterface => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent($e->getMessage()), true)
767+
);
768+
$promise = $promise->then(
769+
fn(string $ranking): PromiseInterface => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent($ranking), true),
770+
fn(MissingSystemPermissionException $e): PromiseInterface => $this->sendFollowUpMessage($interaction, MessageBuilder::new()->setContent($e->getMessage()), true)
765771
);
772+
return $promise;
766773
});
767774

768775
/**

0 commit comments

Comments
 (0)