Merge pull request #320 from czqoocavatsim/JoshuaBranch

SessionLog Error Intro
czqoocavatsim · Aug 20, 2024 · 4d035ba · 4d035ba
2 parents 8552575 + 1ba6126
commit 4d035ba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/app/Jobs/ProcessSessionLogging.php b/app/Jobs/ProcessSessionLogging.php
@@ -70,13 +70,18 @@ public function handle()
                     }        
 
                 if($session->discord_id == null){
-                    $discord = new DiscordClient();
-                    $discord_id = $discord->ControllerConnection($controller->callsign, $name);
+                    try{
+                        $discord = new DiscordClient();
+                        $discord_id = $discord->ControllerConnection($controller->callsign, $name);
+
+                        $session->discord_id = $discord_id;
+                        $session->save();
+                    } catch (\Exception $e) {
+                        $discord = new DiscordClient();
+                        $discord->sendMessageWithEmbed(env('DISCORD_WEB_LOGS'), 'Discord Controller Connect Error', $e->getMessage());
+                    }
                 }
 
-                $session->discord_id = $discord_id;
-                $session->save();
-
                 array_push($positionsFound, $controller->callsign);
             }
         }
@@ -98,13 +103,18 @@ public function handle()
                 }        
 
                 if($log->discord_id !== null){
-                    $discord = new DiscordClient();
-                    $data = $discord->ControllerDisconnect($log->discord_id, $log->callsign, $name, $log->session_start, $log->duration);
-
-                    $log->discord_id = null;
-                    $log->save;
+                    try{
+                        $discord = new DiscordClient();
+                        $data = $discord->ControllerDisconnect($log->discord_id, $log->callsign, $name, $log->session_start, $log->duration);
+                    } catch (\Exception $e) {
+                        $discord = new DiscordClient();
+                        $discord->sendMessageWithEmbed(env('DISCORD_WEB_LOGS'), 'Discord Controller Disconnect Error', $e->getMessage());
+                    }
                 }
 
+                $log->discord_id = null;
+                $log->save;
+
                 //If there is an associated roster member, give them the hours
                 if ($rosterMember = $log->rosterMember) {
                     if (($rosterMember->certification == 'certified' || $rosterMember->certification == 'training') && $rosterMember->active) {

diff --git a/app/Models/Network/SessionLog.php b/app/Models/Network/SessionLog.php
@@ -53,7 +53,7 @@ class SessionLog extends Model
 
     public function user()
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'cid', 'id');
     }
 
     public function position()

diff --git a/app/Services/DiscordClient.php b/app/Services/DiscordClient.php
@@ -63,11 +63,11 @@ public function ControllerConnection($callsign, $name)
                 "tts" => false,
                 "embeds" => [
                     [
-                        'title' => $callsign.' Just Connected!',
-                        'description' => 'A new controller has just connected to the network!
+                        'title' => $callsign.' is currently online!',
+                        'description' => 'There is currently ATC being provided over the Ocean!
 
-Controller Name: '.$name.'
-Online from: <t:'.Carbon::now()->timestamp.':t>',
+**Controller:** '.$name.'
+**Online from:** <t:'.Carbon::now()->timestamp.':t>',
                         'color' => hexdec('6EC40C'),
                     ]
                 ]