Development (#3)

* Bugfix * Php Stan fix
Domenikus · Jan 14, 2023 · 061dc3f · 061dc3f
1 parent afcfc96
commit 061dc3f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 124 deletions.
diff --git a/.env.example b/.env.example
@@ -1,9 +1,8 @@
-TEAMSPEAK_IP=127.0.0.1
-TEAMSPEAK_PORT=9987
+TEAMSPEAK_IP=
+TEAMSPEAK_PORT=
 TEAMSPEAK_QUERY_USER=
 TEAMSPEAK_QUERY_PASSWORD=
 TEAMSPEAK_QUERY_PORT=10011
-TEAMSPEAK_DEFAULT_CHANNEL=
 TEAMSPEAK_PARENT_CHANNEL=
 LOG_CHANNEL=stack
-LOG_LEVEL=info
+LOG_LEVEL=debug
diff --git a/app/Providers/ClientServiceProvider.php b/app/Providers/ClientServiceProvider.php
@@ -22,6 +22,7 @@ public function register(): void
         $channelAdminGroupId = config('teamspeak.channel_admin_group_id');
         $channelNeededJoinPower = config('teamspeak.channel_needed_join_power');
         $channelNeededSubscribePower = config('teamspeak.channel_needed_subscribe_power');
+        $defaultChannel = config('teamspeak.default_channel');
         $channelNameLists = config('channel-names.lists');
         $channelListName = config('channel-names.default');
 
@@ -31,6 +32,7 @@ public function register(): void
             (! is_numeric($channelAdminGroupId) && ! is_null($channelAdminGroupId)) ||
             (! is_numeric($channelNeededJoinPower) && ! is_null($channelNeededJoinPower)) ||
             (! is_numeric($channelNeededSubscribePower) && ! is_null($channelNeededSubscribePower)) ||
+            (! is_numeric($defaultChannel) && ! is_null($defaultChannel)) ||
             (! is_array($channelNameLists)) ||
             (! is_string($channelListName)) ||
             (empty($channelNameLists[$channelListName]))
@@ -45,10 +47,12 @@ public function register(): void
         /** @var int|null $channelAdminGroupId */
         /** @var int|null $channelNeededJoinPower */
         /** @var int|null $channelNeededSubscribePower */
+        /** @var int|null $defaultChannel */
         $this->app->bind(ClientServiceInterface::class, function () use (
+            $defaultChannel,
             $channelNeededSubscribePower,
             $channelNeededJoinPower, $channelClientLimit, $channelAdminGroupId, $parentChannel, $channelNames) {
-            return new ClientService((int) $parentChannel, $channelNames, $channelClientLimit, $channelAdminGroupId, $channelNeededJoinPower, $channelNeededSubscribePower);
+            return new ClientService((int) $parentChannel, $channelNames, $defaultChannel, $channelClientLimit, $channelAdminGroupId, $channelNeededJoinPower, $channelNeededSubscribePower);
         });
     }
 }
diff --git a/app/Services/ClientService.php b/app/Services/ClientService.php
@@ -12,16 +12,19 @@ class ClientService implements ClientServiceInterface
 
     protected array $channelNames;
 
+    protected ?int $defaultChannel;
+
     protected ?int $channelNeededJoinPower;
 
     protected ?int $channelNeededSubscribePower;
 
     protected int $parentChannel;
 
-    public function __construct(int $parentChannel, array $channelNames, ?int $channelClientLimit = null, ?int $channelAdminGroupId = null, ?int $channelNeededJoinPower = null, ?int $channelNeededSubscribePower = null)
+    public function __construct(int $parentChannel, array $channelNames, ?int $defaultChannel, ?int $channelClientLimit = null, ?int $channelAdminGroupId = null, ?int $channelNeededJoinPower = null, ?int $channelNeededSubscribePower = null)
     {
         $this->parentChannel = $parentChannel;
         $this->channelNames = $channelNames;
+        $this->defaultChannel = $defaultChannel;
         $this->channelClientLimit = $channelClientLimit;
         $this->channelAdminGroupId = $channelAdminGroupId;
         $this->channelNeededJoinPower = $channelNeededJoinPower;
@@ -43,7 +46,8 @@ public function handleClientMove(int $clientId, int $targetChannelId): void
             }
 
             TeamspeakGateway::moveClient($client->getId(), $newChannelId);
-            TeamspeakGateway::moveClient(TeamspeakGateway::getOwnClientId(), $this->parentChannel);
+            $botChannel = $this->defaultChannel ?: $this->parentChannel;
+            TeamspeakGateway::moveClient(TeamspeakGateway::getOwnClientId(), $botChannel);
 
             if ($this->channelAdminGroupId) {
                 TeamspeakGateway::assignChannelGroupToClient($client, $newChannelId, $this->channelAdminGroupId);

diff --git a/config/database.php b/config/database.php
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-php /app/channel-creator-bot migrate --force
 php /app/channel-creator-bot run