Merge pull request #339 from czqoocavatsim/JoshuaBranch

Further Updates
czqoocavatsim · Aug 30, 2024 · ad49783 · ad49783
2 parents 59a5232 + d013d37
commit ad49783
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -42,7 +42,7 @@ protected function schedule(Schedule $schedule)
         $schedule->job(new ProcessSessionLogging())->everyMinute();
 
         //Inactivity checks
-        $schedule->job(new ProcessRosterInactivity())->dailyAt('8:05');
+        $schedule->job(new ProcessRosterInactivity())->dailyAt('8:20');
 
         //CRONS FOR INACTIVITY EMAILS 2 weeks
         // $schedule->call(function () {

diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php
@@ -139,14 +139,14 @@ public function handle()
                 $termination_notice++;
             }
         }
-
-        // Send Web Notification if any changes have been made
-        $discord = new DiscordClient();
-        $discord->sendMessageWithEmbed(env('DISCORD_WEB_LOGS'), 'AUTO: Roster Inactivity Update', 
-'60 Days till Removed: '.$first_notice.'
-30 Days till Removed: '.$second_notice.'
-7 Days till Removed: '.$third_notice.'
-Removed from Roster: '.$termination_notice
-);
     }
+
+    // Send Web Notification if any changes have been made
+    $discord = new DiscordClient();
+    $discord->sendMessageWithEmbed(env('DISCORD_WEB_LOGS'), 'AUTO: Roster Inactivity Update', 
+    '60 Days till Removed: '.$first_notice.'
+    30 Days till Removed: '.$second_notice.'
+    7 Days till Removed: '.$third_notice.'
+    Removed from Roster: '.$termination_notice
+    );
 }}
diff --git a/app/Services/DiscordClient.php b/app/Services/DiscordClient.php
@@ -40,17 +40,23 @@ public function sendMessage($channelId, $message)
 
     public function sendDM($userId, $title, $message)
     {
-        $response = $this->client->post("https://discord.com/api/v10/users/@me/channels", [
-            'json' => [
-                'recipient_id' => $userId, // Replace $userId with the Discord user ID
-            ],
-        ]);
-
-        $channel = json_decode($response->getBody(), true);
-        $channelId = $channel['id'];
-
-        // Step 2: Send the Message to the DM Channel
-        $this->sendMessageWithEmbed($channelId, $title, $message);
+        try{
+
+            $response = $this->client->post("https://discord.com/api/v10/users/@me/channels", [
+                'json' => [
+                    'recipient_id' => $userId, // Replace $userId with the Discord user ID
+                ],
+            ]);
+
+            $channel = json_decode($response->getBody(), true);
+            $channelId = $channel['id'];
+
+            // Step 2: Send the Message to the DM Channel
+            $this->sendMessageWithEmbed($channelId, $title, $message);
+
+        } catch (GuzzleHttp\Exception\ClientException $e) {
+
+        }
     }
 
     public function sendMessageWithEmbed($channelId, $title, $description)