Merge pull request #332 from czqoocavatsim/JoshuaBranch

Update some issues

app/Console/Kernel.php

@@ -110,7 +110,7 @@ protected function schedule(Schedule $schedule)
         $schedule->job(new DiscordTrainingWeeklyUpdates())->weeklyOn(6, '6:00');
 
         // Discord role updating
-        $schedule->job(new UpdateDiscordUserRoles)->twiceDaily(2, 14);
+        // $schedule->job(new UpdateDiscordUserRoles)->twiceDaily(2, 14);
     }
 
     /**

app/Http/Controllers/DiscordTestController.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Request;
 use App\Services\DiscordClient;
-use App\Jobs\ProcessShanwickController;
+use App\Jobs\UpdateDiscordUserRoles;
 
 class DiscordTestController extends Controller
 {
@@ -26,7 +26,7 @@ public function EditTagTest()
     public function Job()
     {
         // Dispatch the job
-        $job = ProcessShanwickController::dispatch();
+        $job = UpdateDiscordUserRoles::dispatch();
 
         // Call the handle method directly to get the result synchronously
         $result = $job->handle();

app/Jobs/UpdateDiscordUserRoles.php

@@ -8,7 +8,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use RestCord\DiscordClient;
+use app\Services\DiscordClient;
 
 class UpdateDiscordUserRoles implements ShouldQueue
 {

resources/views/training/applications/apply.blade.php

@@ -138,15 +138,15 @@
 @case('discord')
 
 <div class="container py-4">
-    <h1 class="font-weight-bold red-text">You are not a member of discord</h1>
+    <h1 class="font-weight-bold red-text">Discord Account Details Missing</h1>
     <p style="font-size: 1.2em;" class="mt-3">
         You must be a member of the Gander Oceanic Discord to begin your training. Once you do so, you will be able to apply.
     </p>
     <p style="font-size: 1.2em;" class="mt-3">
-        <a href="{{route('my.index')}}">Join Discord via myCZQO.</a>
+        If you are already a member of the Discord, you need to relink your discord account so we have your information.
     </p>
     <p style="font-size: 1.2em;" class="mt-3">
-        If you beleive this is a mistake, please make contact with the Senior Leadership Team.
+        <a href="{{route('my.index')}}">Join Discord via myCZQO.</a>
     </p>
 </div>
 

routes/web.php

@@ -75,7 +75,7 @@
 
 // Discord shortcut
 Route::get('/discord', [DiscordController::class, 'joinShortcut']);
-Route::get('/discord/function-test', [DiscordTestController::class, 'DiscordRoles']);
+Route::get('/discord/function-test', [DiscordTestController::class, 'Job']);
 
 // Public news articles
 Route::get('/news/{id}', [NewsController::class, 'viewArticlePublic'])->name('news.articlepublic')->where('id', '[0-9]+');