Don't show passengers in status driver command when no passengers joined

afup · May 15, 2024 · c76663d · c76663d
1 parent dfe3a39
commit c76663d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/src/Discord/Command/StatusCommand.php b/app/src/Discord/Command/StatusCommand.php
@@ -59,11 +59,20 @@ public function callback(Discord $discord): void
                     $status .= $this->translator->trans('discord.status.row_not_driver', ['driver_id' => $traveler->transport->getDriver()->userId]);
                 } else {
                     $sharedWith = [];
+                    $passengerCount = 0;
                     foreach ($traveler->transport->getPassengers() as $passenger) {
                         $sharedWith[] = sprintf('<@%d>', $passenger->user->userId);
+                        ++$passengerCount;
                     }
 
-                    $status .= $this->translator->trans('discord.status.row_driver', ['seats_remaining' => $traveler->transport->availableSeats(), 'seats_total' => $traveler->transport->seats, 'travelers' => implode(', ', $sharedWith)]);
+                    $translationKey = 'discord.status.row_driver_no_passengers';
+                    $translationData = ['seats_remaining' => $traveler->transport->availableSeats(), 'seats_total' => $traveler->transport->seats];
+                    if ($passengerCount > 0) {
+                        $translationKey = 'discord.status.row_driver';
+                        $translationData['travelers'] = implode(', ', $sharedWith);
+                    }
+
+                    $status .= $this->translator->trans($translationKey, $translationData);
                 }
 
                 $content .= $status . "\n";

diff --git a/app/translations/messages+intl-icu.en.php b/app/translations/messages+intl-icu.en.php
@@ -136,6 +136,7 @@
             'row' => '- [{traveler_type}] Leaving at {hour} on {date} from {postal_code}',
             'row_not_driver' => ' (transported by <@{driver_id}>)',
             'row_driver' => ' ({seats_remaining}/{seats_total} passenger seats available, including {travelers})',
+            'row_driver_no_passengers' => ' ({seats_remaining}/{seats_total} passenger seats available',
             'empty' => 'You have not registered in any transport for "{name}" event.',
         ],
     ],

diff --git a/app/translations/messages+intl-icu.fr.php b/app/translations/messages+intl-icu.fr.php
@@ -136,6 +136,7 @@
             'row' => '- [{traveler_type}] Part à {hour} le {date} depuis {postal_code}',
             'row_not_driver' => ' (conduit par <@{driver_id}>)',
             'row_driver' => ' ({seats_remaining}/{seats_total} places disponibles, dont {travelers})',
+            'row_driver_no_passengers' => ' ({seats_remaining}/{seats_total} places disponibles)',
             'empty' => 'Vous n’êtes enregistré·e dans aucun transport pour l’événement "{name}".',
         ],
     ],