From 1992b0a9e9e15136c40699486c39baeb8e41bfca Mon Sep 17 00:00:00 2001
From: Colette Contreras <ColetteContreras@outlook.com>
Date: Sat, 29 Feb 2020 17:00:28 +0800
Subject: [PATCH] Update poseidon

---
 .../Controllers/Server/PoseidonController.php | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Server/PoseidonController.php b/app/Http/Controllers/Server/PoseidonController.php
index e72a46bb..3a0f7d3c 100644
--- a/app/Http/Controllers/Server/PoseidonController.php
+++ b/app/Http/Controllers/Server/PoseidonController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Server;
 
+use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
@@ -25,24 +26,9 @@ class PoseidonController extends Controller
         if (!$server) {
             return $this->error("server could not be found", 404);
         }
-
         Cache::put('server_last_check_at_' . $server->id, time());
-        $users = User::whereIn('group_id', json_decode($server->group_id))
-            ->select([
-                'id',
-                'email',
-                't',
-                'u',
-                'd',
-                'transfer_enable',
-                'enable',
-                'v2ray_uuid',
-                'v2ray_alter_id',
-                'v2ray_level'
-            ])
-            ->whereRaw('u + d < transfer_enable')
-            ->where('enable', 1)
-            ->get();
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
         $result = [];
         foreach ($users as $user) {
             $user->v2ray_user = [