From 88035fa29778410a426afad1fdf1aaac4de0b94f Mon Sep 17 00:00:00 2001 From: JoshuaMicallefYBSU <91457812+JoshuaMicallefYBSU@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:55:06 +1000 Subject: [PATCH] Update some issues --- app/Console/Kernel.php | 2 +- app/Http/Controllers/DiscordTestController.php | 4 ++-- app/Jobs/UpdateDiscordUserRoles.php | 2 +- resources/views/training/applications/apply.blade.php | 6 +++--- routes/web.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index df9621b7..2d90f76f 100644 --- a/app/Console/Kernel.php +++ b/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); } /** diff --git a/app/Http/Controllers/DiscordTestController.php b/app/Http/Controllers/DiscordTestController.php index 586730c2..7d47ead8 100644 --- a/app/Http/Controllers/DiscordTestController.php +++ b/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(); diff --git a/app/Jobs/UpdateDiscordUserRoles.php b/app/Jobs/UpdateDiscordUserRoles.php index 042ced35..5d24375c 100644 --- a/app/Jobs/UpdateDiscordUserRoles.php +++ b/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 { diff --git a/resources/views/training/applications/apply.blade.php b/resources/views/training/applications/apply.blade.php index 64051913..4ee5aeb4 100644 --- a/resources/views/training/applications/apply.blade.php +++ b/resources/views/training/applications/apply.blade.php @@ -138,15 +138,15 @@ @case('discord')
-

You are not a member of discord

+

Discord Account Details Missing

You must be a member of the Gander Oceanic Discord to begin your training. Once you do so, you will be able to apply.

- Join Discord via myCZQO. + If you are already a member of the Discord, you need to relink your discord account so we have your information.

- If you beleive this is a mistake, please make contact with the Senior Leadership Team. + Join Discord via myCZQO.

diff --git a/routes/web.php b/routes/web.php index 04792608..4945251f 100644 --- a/routes/web.php +++ b/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]+');