From d4407e157fb3431571dec24372ebca13fae0dce7 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Tue, 1 Jun 2021 21:36:29 +0100 Subject: [PATCH 01/36] Create 2021_06_01_202948_medialibrary_v8_update_media_table.php --- ...948_medialibrary_v8_update_media_table.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 database/migrations/2021_06_01_202948_medialibrary_v8_update_media_table.php diff --git a/database/migrations/2021_06_01_202948_medialibrary_v8_update_media_table.php b/database/migrations/2021_06_01_202948_medialibrary_v8_update_media_table.php new file mode 100644 index 00000000..f66e621d --- /dev/null +++ b/database/migrations/2021_06_01_202948_medialibrary_v8_update_media_table.php @@ -0,0 +1,34 @@ +uuid('uuid')->nullable()->unique(); + $table->string('conversions_disk')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('media', function($table) { + $table->dropColumn('uuid'); + $table->dropColumn('conversions_disk'); + }); + } +} From 3ff7d5d6ab45e1e8cec067d8cec620bc2762a225 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sat, 12 Jun 2021 21:37:52 +0100 Subject: [PATCH 02/36] Update discord, remove permissions/steam/username --- app/Http/Controllers/Missions/MissionController.php | 2 +- app/Http/Controllers/Users/SettingsController.php | 2 +- .../views/join/admin/email-submissions.blade.php | 2 +- resources/views/missions/comments/item.blade.php | 2 +- resources/views/missions/item.blade.php | 2 +- resources/views/missions/notes/item.blade.php | 2 +- resources/views/missions/show.blade.php | 2 +- .../views/missions/show/verification.blade.php | 2 +- resources/views/nav/user.blade.php | 2 +- resources/views/share/mission.blade.php | 2 +- resources/views/user/admin/index.blade.php | 2 +- resources/views/user/admin/item.blade.php | 2 +- resources/views/user/settings/account.blade.php | 2 +- routes/web.php | 13 ++++++------- 14 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/Missions/MissionController.php b/app/Http/Controllers/Missions/MissionController.php index 3d22ce92..22eb9f47 100644 --- a/app/Http/Controllers/Missions/MissionController.php +++ b/app/Http/Controllers/Missions/MissionController.php @@ -266,7 +266,7 @@ public function updateVerification(Request $request, Mission $mission) Discord::missionUpdate($content, $mission, true); } - $updated_by = auth()->user()->username; + $updated_by = auth()->user()->name; return "Verified by {$updated_by}"; } diff --git a/app/Http/Controllers/Users/SettingsController.php b/app/Http/Controllers/Users/SettingsController.php index 192b36e7..e30ccd05 100644 --- a/app/Http/Controllers/Users/SettingsController.php +++ b/app/Http/Controllers/Users/SettingsController.php @@ -43,7 +43,7 @@ public function store(Request $request) { // Update user's username if (strlen($request->username) != 0) { - auth()->user()->username = $request->username; + auth()->user()->name = $request->username; auth()->user()->save(); } } diff --git a/resources/views/join/admin/email-submissions.blade.php b/resources/views/join/admin/email-submissions.blade.php index 46cd6f14..210c41a2 100644 --- a/resources/views/join/admin/email-submissions.blade.php +++ b/resources/views/join/admin/email-submissions.blade.php @@ -7,7 +7,7 @@
- Sent by {{ $sent->user->username }} {{ $sent->created_at->diffForHumans() }} + Sent by {{ $sent->user->name }} {{ $sent->created_at->diffForHumans() }} @endforeach diff --git a/resources/views/missions/comments/item.blade.php b/resources/views/missions/comments/item.blade.php index aea6695e..f12ae5dd 100644 --- a/resources/views/missions/comments/item.blade.php +++ b/resources/views/missions/comments/item.blade.php @@ -6,7 +6,7 @@ class="mission-comment-item-avatar" - {{ $comment->user->username }} + {{ $comment->user->name }} diff --git a/resources/views/missions/item.blade.php b/resources/views/missions/item.blade.php index 9870c721..9d5592ea 100644 --- a/resources/views/missions/item.blade.php +++ b/resources/views/missions/item.blade.php @@ -14,7 +14,7 @@ class="mission-item ripple {{ (isset($classes)) ? $classes : '' }}"
- By {{ $mission->user->username }} on {{ $mission->map->display_name }} + By {{ $mission->user->name }} on {{ $mission->map->display_name }}

diff --git a/resources/views/missions/notes/item.blade.php b/resources/views/missions/notes/item.blade.php index 97276282..55ad31ba 100644 --- a/resources/views/missions/notes/item.blade.php +++ b/resources/views/missions/notes/item.blade.php @@ -5,7 +5,7 @@ class="mission-comment-item-avatar" - {{ $note->user->username }} + {{ $note->user->name }} diff --git a/resources/views/missions/show.blade.php b/resources/views/missions/show.blade.php index f037d709..3f40f2ff 100644 --- a/resources/views/missions/show.blade.php +++ b/resources/views/missions/show.blade.php @@ -71,7 +71,7 @@

- By {{ $mission->user->username }} + By {{ $mission->user->name }}

diff --git a/resources/views/missions/show/verification.blade.php b/resources/views/missions/show/verification.blade.php index df0c4884..a0b1f8f0 100644 --- a/resources/views/missions/show/verification.blade.php +++ b/resources/views/missions/show/verification.blade.php @@ -36,7 +36,7 @@ class="nav-link {{ ($mission->verified) ? 'mission-verified' : 'mission-unverifi @if ($mission->verifiedByUser()) - Verified by {{ $mission->verifiedByUser()->username }} + Verified by {{ $mission->verifiedByUser()->name }} @endif diff --git a/resources/views/nav/user.blade.php b/resources/views/nav/user.blade.php index b729d5a4..1a19b153 100644 --- a/resources/views/nav/user.blade.php +++ b/resources/views/nav/user.blade.php @@ -5,7 +5,7 @@
  • diff --git a/resources/views/share/mission.blade.php b/resources/views/share/mission.blade.php index 92bca33c..12e7086e 100644 --- a/resources/views/share/mission.blade.php +++ b/resources/views/share/mission.blade.php @@ -54,7 +54,7 @@

    - By {{ $mission->user->username }} + By {{ $mission->user->name }}

    diff --git a/resources/views/user/admin/index.blade.php b/resources/views/user/admin/index.blade.php index a25b0a31..e8fdb613 100644 --- a/resources/views/user/admin/index.blade.php +++ b/resources/views/user/admin/index.blade.php @@ -18,7 +18,7 @@ @foreach ($users as $user)
  • - {{ $user->username }} + {{ $user->name }}
    • @endforeach
    diff --git a/resources/views/user/admin/item.blade.php b/resources/views/user/admin/item.blade.php index d5625a55..d9d25d83 100644 --- a/resources/views/user/admin/item.blade.php +++ b/resources/views/user/admin/item.blade.php @@ -3,5 +3,5 @@ class="list-group-item list-group-item-action" data-id="{{ $user->id }}"> - {{ $user->username }} + {{ $user->name }} diff --git a/resources/views/user/settings/account.blade.php b/resources/views/user/settings/account.blade.php index ef7ceffe..b07b2ce6 100644 --- a/resources/views/user/settings/account.blade.php +++ b/resources/views/user/settings/account.blade.php @@ -41,7 +41,7 @@
    - +
    diff --git a/routes/web.php b/routes/web.php index b7203de5..c1d5cd2e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,15 +39,14 @@ Route::post('/hub/applications/api/send-email', 'Join\JoinController@email'); Route::get('/hub/applications/api/email-submissions', 'Join\JoinController@emailSubmissions'); - // Statuses - Route::post('/hub/applications/api/status', 'Join\JoinStatusController@store'); - Route::put('/hub/applications/api/{jr}/status', 'Join\JoinStatusController@update'); - Route::get('/hub/applications/api/{jr}/status', 'Join\JoinStatusController@show'); +// Statuses +Route::post('/hub/applications/api/status', 'Join\JoinStatusController@store'); +Route::put('/hub/applications/api/{jr}/status', 'Join\JoinStatusController@update'); +Route::get('/hub/applications/api/{jr}/status', 'Join\JoinStatusController@show'); - Route::get('/hub/applications/{status}', 'Join\JoinController@index'); +Route::get('/hub/applications/{status}', 'Join\JoinController@index'); - Route::resource('/hub/applications', 'Join\JoinController'); -}); +Route::resource('/hub/applications', 'Join\JoinController'); Route::group(['middleware' => 'can:manage-applications'], function () { Route::resource('/hub/applications/api/emails', 'Join\EmailTemplateController'); From 262db173bef9250f99c6877529967fe352b3960a Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sat, 12 Jun 2021 21:50:18 +0100 Subject: [PATCH 03/36] Permission comments --- routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/web.php b/routes/web.php index c1d5cd2e..dab2f9e4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,6 +47,7 @@ Route::get('/hub/applications/{status}', 'Join\JoinController@index'); Route::resource('/hub/applications', 'Join\JoinController'); +//}); Route::group(['middleware' => 'can:manage-applications'], function () { Route::resource('/hub/applications/api/emails', 'Join\EmailTemplateController'); From 646f76f0eb9819e7c9b443394c5d69fefbb8946e Mon Sep 17 00:00:00 2001 From: TomBurch Date: Mon, 14 Jun 2021 22:32:25 +0100 Subject: [PATCH 04/36] More permissions --- app/Models/Missions/Mission.php | 237 +++++++++++++++++++++++++------- 1 file changed, 184 insertions(+), 53 deletions(-) diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index b363366d..da484e14 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -50,14 +50,22 @@ class Mission extends Model implements HasMedia 'last_played' ]; + /** + * Attribute casts. + * + * @var array + */ + protected $casts = [ + 'loadout_addons' => 'array' + ]; + /** * The addons that should be warned from using. * * @var array */ public $addonWarnings = [ - 'rhs', - 'cfp' + 'rhs' ]; /** @@ -100,7 +108,7 @@ class Mission extends Model implements HasMedia protected $gamemodes = [ 'coop' => 'Cooperative', 'adversarial' => 'Adversarial', - 'arcade' => 'Arcade' + 'preop' => 'Pre-Operation' ]; /** @@ -165,9 +173,9 @@ public function getLoadoutAddonsAttribute($value) */ public static function allPast() { - return Mission::with('user')->with('map') - ->where('last_played', '!=', null) + return static::where('last_played', '!=', null) ->where('last_played', '<', Carbon::now()->toDateTimeString()) + // ->where('verified', true) ->orderBy('last_played', 'desc') ->get(); } @@ -179,8 +187,8 @@ public static function allPast() */ public static function allNew() { - return Mission::with('user')->with('map') - ->where('last_played', null) + return static::where('last_played', null) + // ->where('verified', true) ->orderBy('created_at', 'desc') ->get(); } @@ -190,9 +198,9 @@ public static function allNew() * * @return boolean */ - public function hasBeenPlayed() + public function isNew() { - return !is_null($this->last_played); + return is_null($this->last_played); } /** @@ -283,13 +291,17 @@ public function revisions() */ public function banner() { + if (config('app.env') === 'local') { + return ''; + } + $media = $this->photos(); if (count($media) > 0) { return $media[0]->getUrl(); + } else { + return ''; } - - return ''; } /** @@ -333,7 +345,12 @@ public function thumbnail() return $media[0]->getUrl('thumb'); } - return url('/images/arcomm-placeholder.jpg'); + if (!is_null($this->map->image_2d)) { + return url($this->map->image_2d); + } + + // return url('/images/arcomm-placeholder.jpg'); + return ''; } /** @@ -351,13 +368,18 @@ public function fulltextGamemode() * * @return string */ - public function exportedName() + public function exportedName($format = 'pbo') { $revisions = $this->revisions()->count(); - $filename = pathinfo($this->original["file_name"], PATHINFO_FILENAME); - [$filenameNoMap, $map] = explode('.', $filename, 2); - return "{$filenameNoMap}_{$revisions}.{$map}.pbo"; + $download = 'ARC_' . + strtoupper($this->mode == 'adversarial' ? 'tvt' : $this->mode) . '_' . + Str::studly($this->display_name) . '_' . + trim(substr($this->user->name, 0, 4)) . '_' . + $revisions . '.' . + $this->map->class_name . '.' . $format; + + return $download; } /** @@ -424,18 +446,93 @@ public function existsInOperation() } } + /** + * Gets the full path of the armake exe. + * + * @return string + */ + public static function armake() + { + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + return resource_path('utils/armake.exe'); + } else { + return 'armake'; + } + } + /** * Creates the downloadable file and returns its full URL. * * @return string */ - public function download() + public function download($format = 'pbo') + { + $path_to_file = ($format == 'pbo') ? $this->cloud_pbo : $this->cloud_zip; + + if (strlen($path_to_file) == 0) { + $path_to_file = "missions/{$this->user_id}/{$this->id}/{$this->exportedName($format)}"; + } + + $command = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? + 'gsutil ' : + '/usr/bin/python /usr/lib/google-cloud-sdk/bin/bootstrapping/gsutil.py '; + + $signed_url = shell_exec( + $command . + 'signurl -d 10m ' . + base_path('gcs.json') . + ' gs://archub/' . $path_to_file . + ' 2>&1' // Needed to get output + ); + + return trim(preg_replace('/([\s\S]+)https:\/\/storage/', 'https://storage', $signed_url)); + } + + /** + * Unpacks the mission PBO and returns the absolute path of the folder. + * + * @return string + */ + public function unpack($dirname = '', $pbo_path = '') { - return Storage::cloud() - ->getAdapter() - ->getBucket() - ->object($this->cloud_pbo) - ->signedUrl(new \DateTime('10 min')); + $pbo_path = ($pbo_path == '') ? storage_path("app/{$this->pbo_path}") : $pbo_path; + $unpacked = ($dirname == '') ? + storage_path("app/missions/{$this->user_id}/{$this->id}/unpacked") : + storage_path("app/missions/{$this->user_id}/{$dirname}"); + + // It should always be the most up-to-date + // as we delete unpacked after using them + if (file_exists($unpacked)) { + return $unpacked; + } + + // Unpack the PBO + shell_exec(static::armake() . ' unpack -f ' . $pbo_path . ' ' . $unpacked); + + $workingDir = getcwd(); + chdir($unpacked); + + // Debinarize mission.sqm + // If it's not binned, armake exits gracefully + shell_exec(static::armake() . ' derapify -f mission.sqm mission.sqm'); + + chdir($workingDir); + + return $unpacked; + } + + /** + * Deletes the unpacked mission directory. + * + * @return void + */ + public function deleteUnpacked($dirname = '') + { + $unpacked = ($dirname == '') ? + storage_path("missions/{$this->user_id}/{$this->id}/unpacked") : + storage_path("missions/{$this->user_id}/{$dirname}"); + + Storage::deleteDirectory($unpacked); } /** @@ -485,17 +582,17 @@ public function hasAddon($key) * * @return void */ - public function storeConfigs($path) + public function storeConfigs($pbo_path) { //parse mission.sqm - $mission = new PBOMission(storage_path("app/{$path}")); + $mission = new PBOMission($pbo_path); $contents = $mission->export(); if ($mission->error) { return new ArmaConfigError($mission->errorReason); } - $validationError = $this->validateMissionContents($contents); + $validationError = $this->ValidateMissionContents($contents); if (!is_null($validationError)) { return new ArmaConfigError($validationError); } @@ -523,27 +620,34 @@ public function storeConfigs($path) $this->weather = json_encode($contents['mission']['weather']); $this->save(); - $this->deployCloudFiles($path); + + // Move to cloud storage + //$this->deployCloudFiles(); return $this; } - private function validateMissionContents($contents) + private function ValidateMissionContents($contents) { - $errorText = ""; $files = $contents['pbo']['files']; - - $definedBriefings = $contents['mission']['briefings']; - - foreach ($definedBriefings as $briefing) { - $briefingPath = $briefing[2]; - - if (!array_key_exists($briefingPath, $files)) { - $errorText .= sprintf("%s is defined in TMF but has no file\n", $briefing[0]); - } + $expectedFiles = ["mission.sqm", "description.ext"]; + $expectedFolderCount = ["briefing\\" => ["count" => 0, "ignore" => ["briefing\\briefing_example.sqf"]]]; + + switch ($this->mode) { + case "preop": + $expectedFolderCount["briefing\\"]["count"] = 0; + break; + case "coop": + $expectedFolderCount["briefing\\"]["count"] = 2; + break; + case "adversarial": + $expectedFolderCount["briefing\\"]["count"] = 3; + break; + default: + return "Unknown mission mode when validating mission contents"; } - $expectedFiles = ["mission.sqm", "description.ext"]; + $errorText = ""; foreach ($expectedFiles as $file) { if (!array_key_exists($file, $files)) { @@ -551,29 +655,50 @@ private function validateMissionContents($contents) } } + foreach ($expectedFolderCount as $folder => $expectations) { + $fileCount = $this->countFilesInFolder($files, $folder, $expectations["ignore"]); + + if ($fileCount < $expectations["count"]) { + $errorText .= sprintf("%s has %d files, should have %d\n", $folder, $fileCount, $expectations["count"]); + } + } + if (strlen($errorText) > 0) { return $errorText; } return null; } + private function countFilesInFolder($files, $folder, $ignore) { + $count = 0; + foreach ($files as $file) { + if ((!in_array($file["path"], $ignore)) && (substr($file["path"], 0, strlen($folder)) === $folder)) { + $count++; + } + } + + return $count; + } + /** * Deploys the mission files to cloud storage. * - PBO Download + * - ZIP Download * * @return any */ - public function deployCloudFiles($path) + public function deployCloudFiles() { $qualified_pbo = "missions/{$this->user_id}/{$this->id}/{$this->exportedName()}"; // Mission PBO Storage::cloud()->put( $qualified_pbo, - file_get_contents(storage_path("app/{$path}")) + file_get_contents(storage_path("app/{$this->pbo_path}")) ); $this->cloud_pbo = $qualified_pbo; + $this->pbo_path = $qualified_pbo; $this->save(); } @@ -720,18 +845,23 @@ public function time() public function briefingFactions() { $filledFactions = []; + $factionLocks = [ + 0 => $this->locked_0_briefing, + 1 => $this->locked_1_briefing, + 2 => $this->locked_2_briefing, + 3 => $this->locked_3_briefing + ]; + $briefings = $this->GetBriefings(); - if ($briefings != null) { - foreach ($briefings as $briefing) { + if($briefings != null) { + foreach($briefings as $briefing) { $factionId = $this->parseFactionId($briefing[1][0]); - $locked = $this->{'locked_'.strtolower($this->factions[$factionId]).'_briefing'}; - - if ($locked == 0 || (!auth()->guest() && ($this->isMine() || auth()->user()->can('test-missions')))) { + if(!$factionLocks[$factionId] || auth()->user()->can('test-missions') || $this->isMine()) { $nav = new stdClass(); $nav->name = $briefing[0]; $nav->faction = $factionId; - $nav->locked = $locked; + $nav->locked = $factionLocks[$factionId]; array_push($filledFactions, $nav); } @@ -837,7 +967,7 @@ public static function getDetailsFromName($name) } if (strpos($name, '_') === false) { - abort(400, 'Mission name must be in the format ARC_COOP/TVT/ADE_Name_Author.Map'); + abort(400, 'Mission name must be in the format ARC_COOP/TVT/PREOP_Name_Author.Map'); return; } @@ -854,23 +984,24 @@ public static function getDetailsFromName($name) } if (sizeof($parts) < 3) { - abort(400, 'Mission name must be in the format ARC_COOP/TVT/ADE_Name_Author.Map'); + abort(400, 'Mission name must be in the format ARC_COOP/TVT/PREOP_Name_Author.Map'); return; } $group = $parts[0]; $mode = strtolower($parts[1]); - $validModes = ['coop', 'tvt', 'ade']; + $validModes = ['coop', 'co', 'tvt', 'pvp', 'adv', 'preop']; if (in_array($mode, $validModes)) { - if ($mode == 'ade') { - $mode = 'arcade'; + if ($mode == 'co') { + $mode = 'coop'; } - else if ($mode == 'tvt') { + + if (in_array($mode, ['tvt', 'pvp', 'adv'])) { $mode = 'adversarial'; } } else { - abort(400, 'Mission game mode is invalid. Must be one of COOP, TVT or ADE'); + abort(400, 'Mission game mode is invalid. Must be one of COOP, TVT or PREOP'); return; } From 89bcc8ab74cb0c36253302c97ddb0f4884ae4f0b Mon Sep 17 00:00:00 2001 From: TomBurch Date: Wed, 16 Jun 2021 20:51:38 +0100 Subject: [PATCH 05/36] name -> username --- app/Http/Controllers/Users/SettingsController.php | 2 +- app/Models/Missions/Mission.php | 2 +- resources/views/join/admin/email-submissions.blade.php | 2 +- resources/views/missions/comments/item.blade.php | 2 +- resources/views/missions/item.blade.php | 2 +- resources/views/missions/notes/item.blade.php | 2 +- resources/views/missions/show.blade.php | 2 +- resources/views/missions/show/verification.blade.php | 2 +- resources/views/nav/user.blade.php | 2 +- resources/views/share/mission.blade.php | 2 +- resources/views/user/settings/account.blade.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Users/SettingsController.php b/app/Http/Controllers/Users/SettingsController.php index e30ccd05..192b36e7 100644 --- a/app/Http/Controllers/Users/SettingsController.php +++ b/app/Http/Controllers/Users/SettingsController.php @@ -43,7 +43,7 @@ public function store(Request $request) { // Update user's username if (strlen($request->username) != 0) { - auth()->user()->name = $request->username; + auth()->user()->username = $request->username; auth()->user()->save(); } } diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index da484e14..3193b36f 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -375,7 +375,7 @@ public function exportedName($format = 'pbo') $download = 'ARC_' . strtoupper($this->mode == 'adversarial' ? 'tvt' : $this->mode) . '_' . Str::studly($this->display_name) . '_' . - trim(substr($this->user->name, 0, 4)) . '_' . + trim(substr($this->user->username, 0, 4)) . '_' . $revisions . '.' . $this->map->class_name . '.' . $format; diff --git a/resources/views/join/admin/email-submissions.blade.php b/resources/views/join/admin/email-submissions.blade.php index 210c41a2..46cd6f14 100644 --- a/resources/views/join/admin/email-submissions.blade.php +++ b/resources/views/join/admin/email-submissions.blade.php @@ -7,7 +7,7 @@
    - Sent by {{ $sent->user->name }} {{ $sent->created_at->diffForHumans() }} + Sent by {{ $sent->user->username }} {{ $sent->created_at->diffForHumans() }}
    • @endforeach diff --git a/resources/views/missions/comments/item.blade.php b/resources/views/missions/comments/item.blade.php index f12ae5dd..aea6695e 100644 --- a/resources/views/missions/comments/item.blade.php +++ b/resources/views/missions/comments/item.blade.php @@ -6,7 +6,7 @@ class="mission-comment-item-avatar" - {{ $comment->user->name }} + {{ $comment->user->username }} diff --git a/resources/views/missions/item.blade.php b/resources/views/missions/item.blade.php index 9d5592ea..9870c721 100644 --- a/resources/views/missions/item.blade.php +++ b/resources/views/missions/item.blade.php @@ -14,7 +14,7 @@ class="mission-item ripple {{ (isset($classes)) ? $classes : '' }}"
    - By {{ $mission->user->name }} on {{ $mission->map->display_name }} + By {{ $mission->user->username }} on {{ $mission->map->display_name }}

    diff --git a/resources/views/missions/notes/item.blade.php b/resources/views/missions/notes/item.blade.php index 55ad31ba..97276282 100644 --- a/resources/views/missions/notes/item.blade.php +++ b/resources/views/missions/notes/item.blade.php @@ -5,7 +5,7 @@ class="mission-comment-item-avatar" - {{ $note->user->name }} + {{ $note->user->username }} diff --git a/resources/views/missions/show.blade.php b/resources/views/missions/show.blade.php index 3f40f2ff..f037d709 100644 --- a/resources/views/missions/show.blade.php +++ b/resources/views/missions/show.blade.php @@ -71,7 +71,7 @@

    - By {{ $mission->user->name }} + By {{ $mission->user->username }}

    diff --git a/resources/views/missions/show/verification.blade.php b/resources/views/missions/show/verification.blade.php index a0b1f8f0..df0c4884 100644 --- a/resources/views/missions/show/verification.blade.php +++ b/resources/views/missions/show/verification.blade.php @@ -36,7 +36,7 @@ class="nav-link {{ ($mission->verified) ? 'mission-verified' : 'mission-unverifi @if ($mission->verifiedByUser()) - Verified by {{ $mission->verifiedByUser()->name }} + Verified by {{ $mission->verifiedByUser()->username }} @endif diff --git a/resources/views/nav/user.blade.php b/resources/views/nav/user.blade.php index 1a19b153..b729d5a4 100644 --- a/resources/views/nav/user.blade.php +++ b/resources/views/nav/user.blade.php @@ -5,7 +5,7 @@
  • diff --git a/resources/views/share/mission.blade.php b/resources/views/share/mission.blade.php index 12e7086e..92bca33c 100644 --- a/resources/views/share/mission.blade.php +++ b/resources/views/share/mission.blade.php @@ -54,7 +54,7 @@

    - By {{ $mission->user->name }} + By {{ $mission->user->username }}

    diff --git a/resources/views/user/settings/account.blade.php b/resources/views/user/settings/account.blade.php index b07b2ce6..ef7ceffe 100644 --- a/resources/views/user/settings/account.blade.php +++ b/resources/views/user/settings/account.blade.php @@ -41,7 +41,7 @@
    - +
    From d2dce51e3ddfd9eedfa5fcd151e05f8df9530b6f Mon Sep 17 00:00:00 2001 From: TomBurch Date: Wed, 16 Jun 2021 20:57:29 +0100 Subject: [PATCH 06/36] Missed instances --- resources/views/user/admin/item.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/user/admin/item.blade.php b/resources/views/user/admin/item.blade.php index d9d25d83..d5625a55 100644 --- a/resources/views/user/admin/item.blade.php +++ b/resources/views/user/admin/item.blade.php @@ -3,5 +3,5 @@ class="list-group-item list-group-item-action" data-id="{{ $user->id }}"> - {{ $user->name }} + {{ $user->username }} From 195167146c49101ce392ec22a580ee9bc2dd0ddf Mon Sep 17 00:00:00 2001 From: TomBurch Date: Thu, 17 Jun 2021 23:36:13 +0100 Subject: [PATCH 07/36] Update Mission.php --- app/Models/Missions/Mission.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index 3193b36f..3d9ebefd 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -622,7 +622,7 @@ public function storeConfigs($pbo_path) $this->save(); // Move to cloud storage - //$this->deployCloudFiles(); + $this->deployCloudFiles(); return $this; } From e84cac2b9fa8528a989723cf155d801de7b82963 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sun, 21 Feb 2021 18:59:54 +0000 Subject: [PATCH 08/36] Implement ValidateMissionContents --- app/Models/Missions/Mission.php | 335 +++++++++++++++----------------- 1 file changed, 154 insertions(+), 181 deletions(-) diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index 3d9ebefd..a67cad8e 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -8,22 +8,30 @@ use Carbon\Carbon; use App\Helpers\ArmaConfig; use App\Helpers\ArmaScript; -use App\Helpers\ArmaConfigError; -use App\Helpers\PBOMission\PBOMission; -use App\Helpers\PBOMission\PBOFile\PBOFile; use App\Models\Portal\User; -use App\Models\Operations\OperationMission; -use Illuminate\Support\Str; +use Spatie\MediaLibrary\Media; +use App\Helpers\ArmaConfigError; +use App\Notifications\MissionUpdated; +use App\Notifications\MissionVerified; use Illuminate\Database\Eloquent\Model; +use App\Notifications\MissionPublished; +use App\Notifications\MissionNoteAdded; use Illuminate\Notifications\Notifiable; -use Spatie\MediaLibrary\HasMedia; -use Spatie\MediaLibrary\InteractsWithMedia; -use Spatie\MediaLibrary\MediaCollections\Models\Media; +use App\Notifications\MentionedInComment; +use Kingsley\Mentions\Traits\HasMentions; +use Kingsley\References\Models\Reference; +use App\Notifications\MissionCommentAdded; +use App\Models\Operations\OperationMission; +use Spatie\MediaLibrary\HasMedia\HasMediaTrait; +use Spatie\MediaLibrary\HasMedia\Interfaces\HasMediaConversions; +use App\Helpers\PBOMission\PBOMission; +use App\Helpers\PBOMission\PBOFile\PBOFile; -class Mission extends Model implements HasMedia +class Mission extends Model implements HasMediaConversions { - use Notifiable; - use InteractsWithMedia; + use Notifiable, + HasMediaTrait, + HasMentions; public $factions = [ 0 => "Opfor", @@ -112,19 +120,12 @@ class Mission extends Model implements HasMedia ]; /** - * Side represented as an integer as used by TMF_OrbatSettings - * From: https://community.bistudio.com/wiki/BIS_fnc_sideID - * + * Appended attributes. + * * @var array */ - public static $sideMap = [ - "opfor" => 0, - "east" => 0, - "blufor" => 1, - "west" => 1, - "independent" => 2, - "resistance" => 2, - "civilian" => 3 + protected $appends = [ + 'ref' ]; /** @@ -135,6 +136,68 @@ class Mission extends Model implements HasMedia public function __construct(array $attributes = []) { parent::__construct($attributes); + + static::created(function (Model $model) { + $model->reference()->save( + new Reference([ + 'hash' => $model->makeReferenceHash() + ]) + ); + }); + } + + /** + * Gets the reference for the model. + * + * @return Illuminate\Database\Eloquent\Relations\MorphOne + */ + public function reference() + { + return $this->morphOne(Reference::class, 'model'); + } + + /** + * Makes a new reference hash. + * + * @return string + */ + public function makeReferenceHash() + { + if (property_exists($this, 'referencePrefix')) { + if (is_null($this->referencePrefix)) { + return str_random(12); + } else { + return $this->referencePrefix . '_' . str_random(12); + } + } + + if (config('references.prefix')) { + $prefix = substr(strtolower(class_basename(get_class($this))), 0, 3); + + return $prefix . '_' . str_random(12); + } + + return str_random(12); + } + + /** + * Gets the ref attribute. + * + * @return string + */ + public function getRefAttribute() + { + return optional($this->reference)->hash; + } + + /** + * Discord notification channel. + * + * @return any + */ + public function routeNotificationForDiscord() + { + return config('services.discord.channel_id'); } /** @@ -142,7 +205,7 @@ public function __construct(array $attributes = []) * * @return void */ - public function registerMediaConversions(Media $media = null): void + public function registerMediaConversions(Media $media = null) { $this->addMediaConversion('thumb') ->width(384) @@ -166,6 +229,24 @@ public function getLoadoutAddonsAttribute($value) return json_decode(json_decode($value)); } + /** + * Gets the unread comments on the mission. + * + * @return Collection App\Models\Missions\MissionComment + */ + public function unreadComments() + { + $mission = $this; + + $filtered = auth()->user()->unreadNotifications->filter(function ($item) use ($mission) { + return + $item->type == MissionCommentAdded::class && + $item->data['comment']['mission_id'] == $mission->id; + }); + + return $filtered; + } + /** * Gets all past missions (last played is in past and not null). * @@ -374,7 +455,7 @@ public function exportedName($format = 'pbo') $download = 'ARC_' . strtoupper($this->mode == 'adversarial' ? 'tvt' : $this->mode) . '_' . - Str::studly($this->display_name) . '_' . + studly_case($this->display_name) . '_' . trim(substr($this->user->username, 0, 4)) . '_' . $revisions . '.' . $this->map->class_name . '.' . $format; @@ -568,7 +649,7 @@ public function GetBriefings() public function hasAddon($key) { foreach ($this->addons() as $addonName) { - if (Str::startsWith(strtolower($addonName), strtolower($key))) { + if (starts_with(strtolower($addonName), strtolower($key))) { return true; } } @@ -589,7 +670,7 @@ public function storeConfigs($pbo_path) $contents = $mission->export(); if ($mission->error) { - return new ArmaConfigError($mission->errorReason); + return new ArmaConfigError($mission->error); } $validationError = $this->ValidateMissionContents($contents); @@ -605,12 +686,6 @@ public function storeConfigs($pbo_path) $briefingsArray = $this->parseBriefings($contents['mission']['briefings']); $this->briefings = json_encode($briefingsArray); $this->dependencies = json_encode($contents['mission']['dependencies']); - try { - $this->orbatSettings = json_encode($this->orbatFromOrbatSettings($contents['mission']['orbatSettings'], $contents['mission']['groups'])); - } catch (Exception $e) { - $this->orbatSettings = json_encode(array("Error extracting ORBAT:" => array($e->getMessage()))); - } - if(array_key_exists('date', $contents['mission'])) { $this->date = $contents['mission']['date']; } @@ -857,7 +932,7 @@ public function briefingFactions() if($briefings != null) { foreach($briefings as $briefing) { $factionId = $this->parseFactionId($briefing[1][0]); - if(!$factionLocks[$factionId] || auth()->user()->can('test-missions') || $this->isMine()) { + if(!$factionLocks[$factionId] || auth()->user()->hasPermission('mission:view_locked_briefings') || $this->isMine()) { $nav = new stdClass(); $nav->name = $briefing[0]; $nav->faction = $factionId; @@ -1013,172 +1088,70 @@ public static function getDetailsFromName($name) } /** - * Returns the mission's orbat + * Gets the mission note notifications. * - * @return array + * @return Collection */ - public function getOrbat() - { - return (array)json_decode($this->orbatSettings); - } - - public function orbat($faction) - { - $orbat = $this->getOrbat(); - if (isset($orbat[$faction])) { - return (array)$orbat[$faction]; - } - - return (array)array(); - } - - public function orbatFactions() + public function noteNotifications() { - $orbat = $this->getOrbat(); - if (is_null($orbat)) { - return array(); - } + $filtered = auth()->user()->unreadNotifications->filter(function ($item) { + return + $item->type == MissionNoteAdded::class && + $item->data['note']['mission_id'] == $this->id; + }); - return array_keys($orbat); + return $filtered; } /** - * Returns a minimal version of orbatSettings for displaying on the website + * Gets the mission comments notifications. * - * @return array + * @return Collection */ - private function orbatFromOrbatSettings(array $orbats, array &$groups) + public function commentNotifications() { - foreach ($orbats as &$faction) { - $this->minimiseLevel($faction[1]); - $faction = $faction[1]; - } - - $orbatGroups = array(); - foreach ($groups as &$group) { - if (isset($group['orbatParent'])) { - $faction = self::$sideMap[$group['side']]; - $orbatParent = $group['orbatParent']; - $minimalGroup = array(isset($group['name']) ? $group['name'] : "NOT NAMED", array()); - - foreach ($group['units'] as $unit) { - $desc = explode("@", $unit['description'])[0]; - array_push($minimalGroup[1], array($desc)); - } - - if (!isset($orbatGroups[$faction])) { - $orbatGroups[$faction] = array(); - } - - if (!isset($orbatGroups[$faction][$orbatParent])) { - $orbatGroups[$faction][$orbatParent] = array($minimalGroup); - } else { - array_push($orbatGroups[$faction][$orbatParent], $minimalGroup); - } - } - } - - foreach ($orbats as $faction => &$orbat) { - if (!is_array($orbat)) { - unset($orbats[$faction]); - continue; - } - - $orbatModified = false; - $this->replaceIntWithUnits($orbat[1], $faction, $orbatGroups, $orbatModified); - - if (!$orbatModified) { - unset($orbats[$faction]); - } - } - - $this->removeAllIntsAndEmptyArrays($orbats); - // Reindex array after everything has been unset - $orbats = array_map('array_values', $orbats); - - $namedOrbats = array(); - foreach($orbats as $faction => &$orbat) { - $factionName = array_search($faction, self::$sideMap); - $namedOrbats[$factionName] = &$orbat; - } - - return $namedOrbats; + $filtered = auth()->user()->unreadNotifications->filter(function ($item) { + return + ($item->type == MissionCommentAdded::class && + $item->data['comment']['mission_id'] == $this->id) || + ($item->type == MentionedInComment::class && + $item->data['mission_id'] == $this->id); + }); + + return $filtered; } /** - * Recursive function used by $this->orbatFromOrbatSettings() + * Gets the mission verification notifications. + * + * @return Collection */ - private function minimiseLevel(array &$level) + public function verifiedNotifications() { - $name = strlen($level[0][1]) > 0 ? $level[0][1] : $level[0][4]; //If an abbrievation is defined then use it, otherwise full name - $uniqueId = $level[0][0]; - $level[0] = $name; - - if (count($level[1]) === 0) { - $level[1] = array($uniqueId); - } else { - foreach ($level[1] as $i => &$subLevel) { - $this->minimiseLevel($subLevel); - } - array_unshift($level[1], $uniqueId); - } - } + $filtered = auth()->user()->unreadNotifications->filter(function ($item) { + return + $item->type == MissionVerified::class && + $item->data['mission']['id'] == $this->id; + }); - private function replaceIntWithUnits(array &$item, int &$faction, array &$orbatGroups, bool &$orbatModified) - { - if (is_int($item[0])) { - if (isset($orbatGroups[$faction][$item[0]])) { - $units = &$orbatGroups[$faction][$item[0]]; - unset($item[0]); - - $units = array_reverse($units); - - foreach ($units as $unit) { - array_unshift($item, $unit); - } - $orbatModified = true; - } - else { - unset($item[0]); - } - } - - foreach($item as &$subitem) { - if (is_array($subitem)) { - $this->replaceIntWithUnits($subitem, $faction, $orbatGroups, $orbatModified); - } - } + return $filtered; } - private function removeAllIntsAndEmptyArrays(array &$item) + /** + * Gets the mission updated/published notifications. + * + * @return Collection + */ + public function stateNotifications() { - // Only have name + empty array - remove entire item - if (isset($item[1]) && is_array($item[1]) && empty($item[1])) { - $item = NULL; - return; - } - - // Recursively find every int and empty array and replace them will NULL - foreach ($item as &$subitem) { - if (is_int($subitem)) { - $subitem = NULL; - } elseif (is_array($subitem)) { - if (empty($subitem)) { - $subitem = NULL; - } else { - $this->removeAllIntsAndEmptyArrays($subitem); - } - } - } - - // Double check if array is empty now that all the children have been unset - if (isset($item[1]) && is_array($item[1]) && empty($item[1])) { - $item = NULL; - return; - } - - // unset() used on a &reference will unset the reference but not the original value - // instead we set everything to NULL and use array_filter, which will unset the original value - $item = array_filter($item); + $filtered = auth()->user()->unreadNotifications->filter(function ($item) { + return + ($item->type == MissionPublished::class && + $item->data['mission']['id'] == $this->id) || + ($item->type == MissionUpdated::class && + $item->data['mission_id'] == $this->id); + }); + + return $filtered; } } From 14b65d7dcd1e60be7c40e9f06353e09c787496a1 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sun, 21 Feb 2021 19:12:55 +0000 Subject: [PATCH 09/36] Fix + translate PBOMission errors --- app/Models/Missions/Mission.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index a67cad8e..5314fa04 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -670,7 +670,7 @@ public function storeConfigs($pbo_path) $contents = $mission->export(); if ($mission->error) { - return new ArmaConfigError($mission->error); + return new ArmaConfigError($mission->errorReason); } $validationError = $this->ValidateMissionContents($contents); From b075a8b582c61659f43a754e1da99bb4504cf862 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sun, 21 Feb 2021 19:26:39 +0000 Subject: [PATCH 10/36] Remove PBOMission changes from master --- app/Helpers/PBOMission/PBOMission.php | 6 +++--- app/Models/Missions/Mission.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Helpers/PBOMission/PBOMission.php b/app/Helpers/PBOMission/PBOMission.php index 9d08aa93..99d4266b 100644 --- a/app/Helpers/PBOMission/PBOMission.php +++ b/app/Helpers/PBOMission/PBOMission.php @@ -19,9 +19,9 @@ class PBOMission { public $errorReason; private static $errorReasons = array( - 'EMPTY_MISSION' => 'Error reading mission file (mission.sqm) or lacking it ', - 'INVALID_MAP' => 'Wrong map name. Check file\'s name.', - 'XML_ERROR' => 'Error parsing xml (stringtable.xml). Reason: %s' + 'EMPTY_MISSION' => 'Błąd odczytu pliku misji (mission.sqm) lub jego brak.', + 'INVALID_MAP' => 'Niepoprawna nazwa mapy. Sprawdź nazwę pliku.', + 'XML_ERROR' => 'Błąd parsowania xml (stringtable.xml). Powód: %s' ); function __construct(string $filepath, ?string $filename = null) { diff --git a/app/Models/Missions/Mission.php b/app/Models/Missions/Mission.php index 5314fa04..a67cad8e 100644 --- a/app/Models/Missions/Mission.php +++ b/app/Models/Missions/Mission.php @@ -670,7 +670,7 @@ public function storeConfigs($pbo_path) $contents = $mission->export(); if ($mission->error) { - return new ArmaConfigError($mission->errorReason); + return new ArmaConfigError($mission->error); } $validationError = $this->ValidateMissionContents($contents); From 49c2923c9a5a82a7896c22f0c8e108f32bc49b74 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sun, 20 Jun 2021 19:17:38 +0100 Subject: [PATCH 11/36] Upgrade laravel/framework to v8 (latest) --- composer.json | 11 +++-------- database/seeders/DatabaseSeeder.php | 9 ++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index cdcc4407..0656802f 100644 --- a/composer.json +++ b/composer.json @@ -9,24 +9,19 @@ "type": "project", "require": { "php": "^7.4", - "doctrine/dbal": "^3.1", "fideloper/proxy": "4.4.*", - "graham-campbell/markdown": "13.1", "guzzlehttp/guzzle": "^7.3.0", + "invisnik/laravel-steam-auth": "^4.3", "laravel/framework": "8.47.*", "laravel/legacy-factories": "^1.1", - "laravel/sanctum": "^2.11", - "laravel/socialite": "^5.2", - "laravel/telescope": "^4.5", "laravel/tinker": "^2.6", "nesbot/carbon": "^2.48", - "socialiteproviders/discord": "^4.1", "spatie/laravel-medialibrary": "8.*", "superbalist/flysystem-google-storage": "7.2.*", - "superbalist/laravel-google-cloud-storage": "2.2.*" + "superbalist/laravel-google-cloud-storage": "2.2.*", + "syntax/steam-api": "^2.3.0" }, "require-dev": { - "barryvdh/laravel-debugbar": "^3.6", "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", "mockery/mockery": "~1.0", diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 2c98daf9..2a739ee2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -13,11 +13,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call([ - JoinStatusSeeder::class, - JoinSourcesSeeder::class, - GalleriesSeeder::class, - EmailTemplatesSeeder::class, - ]); + factory(App\Models\JoinRequests\JoinRequest::class, 300)->create(); } -} \ No newline at end of file +} From e2b0f05a15ff252f6408b698419b3f5edc5e68b6 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sun, 20 Jun 2021 22:25:29 +0100 Subject: [PATCH 12/36] Use HTTP facade --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 0656802f..3a72b639 100644 --- a/composer.json +++ b/composer.json @@ -11,15 +11,15 @@ "php": "^7.4", "fideloper/proxy": "4.4.*", "guzzlehttp/guzzle": "^7.3.0", - "invisnik/laravel-steam-auth": "^4.3", "laravel/framework": "8.47.*", "laravel/legacy-factories": "^1.1", + "laravel/socialite": "^5.2", "laravel/tinker": "^2.6", "nesbot/carbon": "^2.48", + "socialiteproviders/discord": "^4.1", "spatie/laravel-medialibrary": "8.*", "superbalist/flysystem-google-storage": "7.2.*", - "superbalist/laravel-google-cloud-storage": "2.2.*", - "syntax/steam-api": "^2.3.0" + "superbalist/laravel-google-cloud-storage": "2.2.*" }, "require-dev": { "filp/whoops": "~2.0", From 43c5b2ca1c22138986e2ce22a327bb41a32f45dc Mon Sep 17 00:00:00 2001 From: TomBurch Date: Mon, 21 Jun 2021 01:07:13 +0100 Subject: [PATCH 13/36] Add method for migration --- .../Controllers/Auth/DiscordController.php | 11 +++- app/Http/Controllers/Auth/SteamController.php | 54 +++++++++++++++++++ app/Providers/EventServiceProvider.php | 1 + composer.json | 2 + ...0_225552_add_discord_id_to_users_table.php | 33 ++++++++++++ routes/web.php | 2 + 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/Auth/SteamController.php create mode 100644 database/migrations/2021_06_20_225552_add_discord_id_to_users_table.php diff --git a/app/Http/Controllers/Auth/DiscordController.php b/app/Http/Controllers/Auth/DiscordController.php index 42c719b8..86671911 100644 --- a/app/Http/Controllers/Auth/DiscordController.php +++ b/app/Http/Controllers/Auth/DiscordController.php @@ -33,7 +33,15 @@ public function callback(Request $request) { $user = Socialite::driver('discord')->user(); - if (Discord::hasARole($user->id, RoleEnum::Member, RoleEnum::Recruit)) { + if (!auth()->guest()) { + if (is_null(auth()->user()->discord_id)) { + auth()->user()->discord_id = $user->id; + auth()->user()->save(); + return redirect('/hub'); + } + } + + if (Discord::isMember($user->id)) { return $this->create($user); } @@ -55,6 +63,7 @@ public function create($data) $user = User::create([ 'discord_id' => $data->id, 'username' => $data->name, + 'email' => $data->email, 'avatar' => $data->avatar, ]); } diff --git a/app/Http/Controllers/Auth/SteamController.php b/app/Http/Controllers/Auth/SteamController.php new file mode 100644 index 00000000..11eede1a --- /dev/null +++ b/app/Http/Controllers/Auth/SteamController.php @@ -0,0 +1,54 @@ +redirect(); + } + + /** + * Handles the response from Discord. + * + * @return \Illuminate\Http\Response + */ + public function callback(Request $request) + { + $user = Socialite::driver('steam')->user(); + + return $this->login($user); + } + + public function login($data) + { + $user = User::where('steam_id', $data->id)->first(); + + if (is_null($user)) { + return [ + 'error' => 'Account not found.' + ]; + } + + auth()->login($user, true); + + if (is_null($user->discord_id)) { + return redirect('/auth/redirect'); + } + return redirect('/hub'); + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 2e0f3e40..3357d8fc 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -18,6 +18,7 @@ class EventServiceProvider extends ServiceProvider ], \SocialiteProviders\Manager\SocialiteWasCalled::class => [ 'SocialiteProviders\\Discord\\DiscordExtendSocialite@handle', + 'SocialiteProviders\\Steam\\SteamExtendSocialite@handle', ], ]; diff --git a/composer.json b/composer.json index 3a72b639..8ec60d02 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "type": "project", "require": { "php": "^7.4", + "doctrine/dbal": "^3.1", "fideloper/proxy": "4.4.*", "guzzlehttp/guzzle": "^7.3.0", "laravel/framework": "8.47.*", @@ -17,6 +18,7 @@ "laravel/tinker": "^2.6", "nesbot/carbon": "^2.48", "socialiteproviders/discord": "^4.1", + "socialiteproviders/steam": "^4.1", "spatie/laravel-medialibrary": "8.*", "superbalist/flysystem-google-storage": "7.2.*", "superbalist/laravel-google-cloud-storage": "2.2.*" diff --git a/database/migrations/2021_06_20_225552_add_discord_id_to_users_table.php b/database/migrations/2021_06_20_225552_add_discord_id_to_users_table.php new file mode 100644 index 00000000..1e5e5e2c --- /dev/null +++ b/database/migrations/2021_06_20_225552_add_discord_id_to_users_table.php @@ -0,0 +1,33 @@ +string('steam_id')->nullable()->change(); + $table->string('discord_id')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('discord_id'); + }); + } +} diff --git a/routes/web.php b/routes/web.php index dab2f9e4..3aa87bf5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,6 +17,8 @@ //--- Authentication Route::get('/auth/redirect', 'Auth\DiscordController@redirect'); Route::get('/auth/callback', 'Auth\DiscordController@callback'); +Route::get('/auth/steam', 'Auth\SteamController@redirect'); +Route::get('/auth/steamcallback', 'Auth\SteamController@callback'); //--- Public Applications Route::get('/join/acknowledged', 'PublicJoinController@acknowledged'); From 04fe3354e7f235f7f76702f798fec0de4fb4576b Mon Sep 17 00:00:00 2001 From: TomBurch Date: Mon, 21 Jun 2021 01:15:57 +0100 Subject: [PATCH 14/36] Restore migration files --- .../2016_09_10_222958_create_users.php | 39 +++++++++++++++++ ...03_29_184625_create_permissions_tables.php | 43 +++++++++++++++++++ ...4_03_013412_create_notifications_table.php | 35 +++++++++++++++ ..._04_23_205251_create_attendances_table.php | 36 ++++++++++++++++ ...14_depreciate_mission_comment_mentions.php | 28 ++++++++++++ ...017_07_20_211414_create_absences_table.php | 36 ++++++++++++++++ ...8_01_25_134904_create_references_table.php | 35 +++++++++++++++ ..._23_182940_create_new_attendance_table.php | 40 +++++++++++++++++ ...25_224551_add_mission_id_to_attendance.php | 31 +++++++++++++ 9 files changed, 323 insertions(+) create mode 100644 database/migrations/2016_09_10_222958_create_users.php create mode 100644 database/migrations/2017_03_29_184625_create_permissions_tables.php create mode 100644 database/migrations/2017_04_03_013412_create_notifications_table.php create mode 100644 database/migrations/2017_04_23_205251_create_attendances_table.php create mode 100644 database/migrations/2017_04_26_181314_depreciate_mission_comment_mentions.php create mode 100644 database/migrations/2017_07_20_211414_create_absences_table.php create mode 100644 database/migrations/2018_01_25_134904_create_references_table.php create mode 100644 database/migrations/2018_05_23_182940_create_new_attendance_table.php create mode 100644 database/migrations/2018_05_25_224551_add_mission_id_to_attendance.php diff --git a/database/migrations/2016_09_10_222958_create_users.php b/database/migrations/2016_09_10_222958_create_users.php new file mode 100644 index 00000000..5c635aec --- /dev/null +++ b/database/migrations/2016_09_10_222958_create_users.php @@ -0,0 +1,39 @@ +increments('id'); + $table->timestamp('created_at')->useCurrent(); + $table->timestamp('updated_at')->useCurrent(); + $table->string('steam_id'); + $table->string('username'); + $table->string('email')->nullable(); + $table->string('avatar'); + $table->integer('access_level')->default(1); + $table->rememberToken(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('users'); + } +} diff --git a/database/migrations/2017_03_29_184625_create_permissions_tables.php b/database/migrations/2017_03_29_184625_create_permissions_tables.php new file mode 100644 index 00000000..b6b7f0e2 --- /dev/null +++ b/database/migrations/2017_03_29_184625_create_permissions_tables.php @@ -0,0 +1,43 @@ +increments('id'); + $table->string('name'); + }); + + Schema::create('permission_users', function($table) { + $table->increments('id'); + $table->integer('permission_id')->unsigned(); + $table->integer('user_id')->unsigned(); + }); + + Schema::table('permission_users', function($table) { + $table->foreign('permission_id')->references('id')->on('permissions')->onDelete('cascade'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('permission_users'); + Schema::dropIfExists('permissions'); + } +} diff --git a/database/migrations/2017_04_03_013412_create_notifications_table.php b/database/migrations/2017_04_03_013412_create_notifications_table.php new file mode 100644 index 00000000..cdc63899 --- /dev/null +++ b/database/migrations/2017_04_03_013412_create_notifications_table.php @@ -0,0 +1,35 @@ +uuid('id')->primary(); + $table->string('type'); + $table->morphs('notifiable'); + $table->text('data'); + $table->timestamp('read_at')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('notifications'); + } +} diff --git a/database/migrations/2017_04_23_205251_create_attendances_table.php b/database/migrations/2017_04_23_205251_create_attendances_table.php new file mode 100644 index 00000000..6925877f --- /dev/null +++ b/database/migrations/2017_04_23_205251_create_attendances_table.php @@ -0,0 +1,36 @@ +increments('id'); + $table->integer('user_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->integer('mission_id')->unsigned(); + $table->foreign('mission_id')->references('id')->on('missions')->onDelete('cascade'); + $table->boolean('inbound')->default(false); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('attendances'); + } +} diff --git a/database/migrations/2017_04_26_181314_depreciate_mission_comment_mentions.php b/database/migrations/2017_04_26_181314_depreciate_mission_comment_mentions.php new file mode 100644 index 00000000..eb6efdb6 --- /dev/null +++ b/database/migrations/2017_04_26_181314_depreciate_mission_comment_mentions.php @@ -0,0 +1,28 @@ +increments('id'); + $table->integer('user_id')->unsigned(); + $table->integer('operation_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->foreign('operation_id')->references('id')->on('operations')->onDelete('cascade'); + $table->longText('reason')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('absences'); + } +} diff --git a/database/migrations/2018_01_25_134904_create_references_table.php b/database/migrations/2018_01_25_134904_create_references_table.php new file mode 100644 index 00000000..c1e79fb2 --- /dev/null +++ b/database/migrations/2018_01_25_134904_create_references_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->string('hash')->index(); + $table->morphs('model'); + $table->timestamps(); + + $table->unique(['hash', 'model_id', 'model_type']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists(config('references.table_name')); + } +} diff --git a/database/migrations/2018_05_23_182940_create_new_attendance_table.php b/database/migrations/2018_05_23_182940_create_new_attendance_table.php new file mode 100644 index 00000000..0479fd80 --- /dev/null +++ b/database/migrations/2018_05_23_182940_create_new_attendance_table.php @@ -0,0 +1,40 @@ +@ -1,39 +0,0 @@ +increments('id'); + $table->unsignedInteger('user_id'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->unsignedInteger('operation_id'); + $table->foreign('operation_id')->references('id')->on('operations')->onDelete('cascade'); + $table->boolean('present')->default(true); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('attendances'); + } +} diff --git a/database/migrations/2018_05_25_224551_add_mission_id_to_attendance.php b/database/migrations/2018_05_25_224551_add_mission_id_to_attendance.php new file mode 100644 index 00000000..bc6def8a --- /dev/null +++ b/database/migrations/2018_05_25_224551_add_mission_id_to_attendance.php @@ -0,0 +1,31 @@ +unsignedInteger('mission_id')->nullable(); + $table->foreign('mission_id')->references('id')->on('missions')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} From 42444907ce932ea453b5fa29219fb54d3d8ce8c6 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Mon, 21 Jun 2021 01:16:52 +0100 Subject: [PATCH 15/36] Remove line --- .../migrations/2018_05_23_182940_create_new_attendance_table.php | 1 - 1 file changed, 1 deletion(-) diff --git a/database/migrations/2018_05_23_182940_create_new_attendance_table.php b/database/migrations/2018_05_23_182940_create_new_attendance_table.php index 0479fd80..a077c8fa 100644 --- a/database/migrations/2018_05_23_182940_create_new_attendance_table.php +++ b/database/migrations/2018_05_23_182940_create_new_attendance_table.php @@ -1,4 +1,3 @@ -@ -1,39 +0,0 @@ Date: Mon, 21 Jun 2021 01:56:46 +0100 Subject: [PATCH 16/36] Redirect on failed getRoles --- app/Exceptions/Handler.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7adfa359..9751e1e7 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -48,6 +48,9 @@ public function report(Throwable $exception) */ public function render($request, Throwable $exception) { + if ($exception instanceof \Illuminate\Auth\Access\AuthorizationException && !auth()->guest() && is_null(auth()->user()->discord_id)) { + return redirect('/auth/redirect'); + } return parent::render($request, $exception); } From a140d3101943c636490984dcfa82547b28324c06 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Thu, 24 Jun 2021 21:56:57 +0100 Subject: [PATCH 17/36] Rework operations --- .../Controllers/API/OperationController.php | 144 ------------------ .../API/OperationMissionController.php | 115 -------------- app/Http/Controllers/MediaController.php | 59 ------- .../Controllers/Missions/MediaController.php | 6 + .../OperationController.php | 39 +---- .../Operations/OperationMissionController.php | 44 ++++++ resources/views/missions/operations.blade.php | 15 +- routes/web.php | 46 +++--- 8 files changed, 79 insertions(+), 389 deletions(-) delete mode 100644 app/Http/Controllers/API/OperationController.php delete mode 100644 app/Http/Controllers/API/OperationMissionController.php delete mode 100644 app/Http/Controllers/MediaController.php rename app/Http/Controllers/{Missions => Operations}/OperationController.php (63%) create mode 100644 app/Http/Controllers/Operations/OperationMissionController.php diff --git a/app/Http/Controllers/API/OperationController.php b/app/Http/Controllers/API/OperationController.php deleted file mode 100644 index 815bff5e..00000000 --- a/app/Http/Controllers/API/OperationController.php +++ /dev/null @@ -1,144 +0,0 @@ -operation = $operation; - $this->operation_mission = $operation_mission; - - return $this; - } - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $list = $this->operation->all()->map(function($item) { - $item->items = $item->missions->map(function($item) { - $item->mission = $item->mission; - return $item; - }); - - return $item; - }); - - return response()->json($list); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - // Get latest operation date - $latest = $this->operation->orderBy('starts_at', 'desc')->first(); - - if ($latest) { - $op = $this->operation->create(['starts_at' => $latest->starts_at->addWeek()]); - $op->items = []; - return response()->json($op); - } else { - $op = $this->operation->create([ - 'starts_at' => Carbon::now() - ->endOfWeek() - ->subDay() - ->hour(config('operation.hour')) - ->minute(config('operation.minute')) - ->second(0) - ]); - - $op->items = []; - - return response()->json($op); - } - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - // - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - $this->operation->destroy($id); - } -} diff --git a/app/Http/Controllers/API/OperationMissionController.php b/app/Http/Controllers/API/OperationMissionController.php deleted file mode 100644 index b1719a06..00000000 --- a/app/Http/Controllers/API/OperationMissionController.php +++ /dev/null @@ -1,115 +0,0 @@ -operation = $operation; - $this->operation_mission = $operation_mission; - - return $this; - } - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - // - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - // - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - // - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - $this->operation_mission->destroy($id); - } -} diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php deleted file mode 100644 index bf8664b4..00000000 --- a/app/Http/Controllers/MediaController.php +++ /dev/null @@ -1,59 +0,0 @@ -user()->can('manage-public-media')) { - $gallery = Gallery::find(1); - $gallery->addMedia($request->file('file'))->toMediaCollection('images'); - } - } - - /** - * Remove the specified resource from storage. - * - * @return \Illuminate\Http\Response - */ - public function destroy($gallery_id, $media_id) - { - Gallery::find($gallery_id)->deleteMedia($media_id); - } - - /** - * Deletes the given gallery media item by form input. - * - * @return void - */ - public function deletePhoto(Request $request) - { - self::destroy($request->gallery_id, $request->media_id); - } -} diff --git a/app/Http/Controllers/Missions/MediaController.php b/app/Http/Controllers/Missions/MediaController.php index 5e431626..b5c7d6d6 100644 --- a/app/Http/Controllers/Missions/MediaController.php +++ b/app/Http/Controllers/Missions/MediaController.php @@ -11,6 +11,12 @@ class MediaController extends Controller { + public function index(Request $request) + { + $missions = Mission::all(); + return view('media.index', compact('missions')); + } + /** * Uploads the given media to the given mission. * diff --git a/app/Http/Controllers/Missions/OperationController.php b/app/Http/Controllers/Operations/OperationController.php similarity index 63% rename from app/Http/Controllers/Missions/OperationController.php rename to app/Http/Controllers/Operations/OperationController.php index e76c0a12..e85a8ea2 100644 --- a/app/Http/Controllers/Missions/OperationController.php +++ b/app/Http/Controllers/Operations/OperationController.php @@ -1,6 +1,6 @@ id == -1) return; - OperationMission::destroy($request->id); - } - - /** - * Creates an operation item for the given mission and operation. - * - * @return integer - */ - public function addMission(Request $request) - { - $operation = Operation::findOrFail($request->operation_id); - - $exists = OperationMission::where('operation_id', $operation->id) - ->where('play_order', $request->play_order) - ->first(); - - if ($exists) return; - - $item = OperationMission::create([ - 'operation_id' => $operation->id, - 'mission_id' => $request->mission_id, - 'play_order' => $request->play_order - ]); - - return $item->id; - } - /** * Creates an operation header. * Returns the operation item view. @@ -97,6 +62,6 @@ public function create(Request $request, Operation $operation) */ public function destroy(Request $request, Operation $operation) { - $operation->destroy($request->operation_id); + Operation::destroy($operation->id); } } diff --git a/app/Http/Controllers/Operations/OperationMissionController.php b/app/Http/Controllers/Operations/OperationMissionController.php new file mode 100644 index 00000000..80ceeb6d --- /dev/null +++ b/app/Http/Controllers/Operations/OperationMissionController.php @@ -0,0 +1,44 @@ +id) + ->where('play_order', $request->play_order) + ->first(); + + if ($exists) return; + + $item = OperationMission::create([ + 'operation_id' => $operation->id, + 'mission_id' => $request->mission_id, + 'play_order' => $request->play_order + ]); + + return $item->id; + } + + /** + * Deletes the given operation item. + * + * @return void + */ + public function destroy(Request $request) + { + if ($request->id == -1) return; + OperationMission::destroy($request->id); + } +} diff --git a/resources/views/missions/operations.blade.php b/resources/views/missions/operations.blade.php index ba567a9e..fe78f3f8 100644 --- a/resources/views/missions/operations.blade.php +++ b/resources/views/missions/operations.blade.php @@ -19,8 +19,8 @@ if (isAssigned) { $.ajax({ - type: 'POST', - url: '{{ url('/hub/missions/operations/remove-mission') }}', + type: 'DELETE', + url: "{{ url('/hub/operations/1/missions') }}", data: {'id': caller.data('item') || -1}, success: function(data) { caller.html('Assign Mission'); @@ -53,10 +53,9 @@ if (slot != null) { $.ajax({ type: 'POST', - url: '{{ url('/hub/missions/operations/add-mission') }}', + url: "{{ url('/hub/operations') }}/" + operation_id + '/missions', data: { 'mission_id': mission_id, - 'operation_id': operation_id, 'play_order': order }, success: function(data) { @@ -74,7 +73,7 @@ $('#create-operation-form').submit(function(event) { $.ajax({ type: 'POST', - url: '{{ url('/hub/missions/operations/create-operation') }}', + url: "{{ url('/hub/operations') }}", data: $('#create-operation-form').serialize(), success: function(data) { $('.operation-rows').prepend(data); @@ -88,9 +87,9 @@ var caller = $(this); $.ajax({ - type: 'POST', - url: '{{ url('/hub/missions/operations/delete-operation') }}', - data: {operation_id: caller.data('id')}, + type: 'DELETE', + url: "{{ url('/hub/operations') }}/" + caller.data('id'), + success: function(data) { caller.parents('.operation-item').remove(); } diff --git a/routes/web.php b/routes/web.php index 3aa87bf5..b86ca1bb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -5,20 +5,24 @@ //--- Home Route::get('/', 'PageController@index'); +Route::get('/media', 'Missions\MediaController@index'); +Route::get('/roster', 'PageController@roster'); Route::get('/arma3sync', function () { return redirect('https://docs.google.com/document/d/1i-LzCJE0l_7PtOj8WU717mmmzX1U2KaaNGEnj0KzkIw/view'); }); -//--- Shared Missions -Route::get('/share/{mission}', 'ShareController@show'); -Route::get('/share/{mission}/{panel}', 'SharePanelController@show'); -Route::get('/share/{mission}/briefing/{faction}', 'ShareBriefingController@show'); +Route::prefix('share')->group(function () { + Route::get('/{mission}', 'ShareController@show'); + Route::get('/{mission}/{panel}', 'SharePanelController@show'); + Route::get('/{mission}/briefing/{faction}', 'ShareBriefingController@show'); +}); -//--- Authentication -Route::get('/auth/redirect', 'Auth\DiscordController@redirect'); -Route::get('/auth/callback', 'Auth\DiscordController@callback'); -Route::get('/auth/steam', 'Auth\SteamController@redirect'); -Route::get('/auth/steamcallback', 'Auth\SteamController@callback'); +Route::prefix('auth')->group(function () { + Route::get('/redirect', 'Auth\DiscordController@redirect'); + Route::get('/callback', 'Auth\DiscordController@callback'); + Route::get('/steam', 'Auth\SteamController@redirect'); + Route::get('/steamcallback', 'Auth\SteamController@callback'); +}); //--- Public Applications Route::get('/join/acknowledged', 'PublicJoinController@acknowledged'); @@ -26,13 +30,6 @@ 'only' => ['index', 'store', 'create'] ]); -//--- Media -Route::resource('media', 'MediaController'); -Route::post('/media/delete', 'MediaController@deletePhoto'); - -//--- Roster -Route::get('/roster', 'PageController@roster'); - Route::group(['middleware' => 'can:view-applications'], function () { // Route::get('/hub/applications/transfer', 'JoinController@transferOldRecords'); Route::get('/hub/applications/api/items', 'Join\JoinController@items'); @@ -55,10 +52,13 @@ Route::resource('/hub/applications/api/emails', 'Join\EmailTemplateController'); }); -Route::group(['middleware' => 'can:manage-operations'], function () { - Route::get('/hub/operations', 'Missions\OperationController@index'); - Route::resource('/api/operations', 'API\OperationController'); - Route::resource('/api/operations/missions', 'API\OperationMissionController'); +Route::prefix('hub/operations')->middleware('can:manage-operations')->group(function () { + Route::get('/', 'Operations\OperationController@index'); + Route::post('/', 'Operations\OperationController@create'); + Route::delete('/{operation}', 'Operations\OperationController@destroy'); + + Route::post('/{operation}/missions', 'Operations\OperationMissionController@store'); + Route::delete('/{operation}/missions', 'Operations\OperationMissionController@destroy'); }); //--- Missions @@ -69,12 +69,6 @@ Route::post('/hub/missions/media/add-video', 'Missions\MediaController@addVideo'); Route::post('/hub/missions/media/delete-video', 'Missions\MediaController@removeVideo'); - // Mission Operations - Route::post('/hub/missions/operations/remove-mission', 'Missions\OperationController@removeMission'); - Route::post('/hub/missions/operations/add-mission', 'Missions\OperationController@addMission'); - Route::post('/hub/missions/operations/create-operation', 'Missions\OperationController@create'); - Route::post('/hub/missions/operations/delete-operation', 'Missions\OperationController@destroy'); - // Mission Comments Route::resource('/hub/missions/comments', 'Missions\CommentController', [ 'except' => ['create', 'show', 'update'] From f8acfd4678b9f3d5fd1330669424167b81a8ea7e Mon Sep 17 00:00:00 2001 From: TomBurch Date: Thu, 24 Jun 2021 22:03:09 +0100 Subject: [PATCH 18/36] Move operations into hub middleware, rename create to store --- .../Operations/OperationController.php | 2 +- routes/web.php | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Operations/OperationController.php b/app/Http/Controllers/Operations/OperationController.php index e85a8ea2..07d9c450 100644 --- a/app/Http/Controllers/Operations/OperationController.php +++ b/app/Http/Controllers/Operations/OperationController.php @@ -26,7 +26,7 @@ public function index() * * @return any */ - public function create(Request $request, Operation $operation) + public function store(Request $request, Operation $operation) { // Get latest operation date $latest = $operation->orderBy('starts_at', 'desc')->first(); diff --git a/routes/web.php b/routes/web.php index b86ca1bb..ddbba5e7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -52,17 +52,17 @@ Route::resource('/hub/applications/api/emails', 'Join\EmailTemplateController'); }); -Route::prefix('hub/operations')->middleware('can:manage-operations')->group(function () { - Route::get('/', 'Operations\OperationController@index'); - Route::post('/', 'Operations\OperationController@create'); - Route::delete('/{operation}', 'Operations\OperationController@destroy'); - - Route::post('/{operation}/missions', 'Operations\OperationMissionController@store'); - Route::delete('/{operation}/missions', 'Operations\OperationMissionController@destroy'); -}); - //--- Missions Route::group(['middleware' => 'can:access-hub'], function () { + Route::prefix('hub/operations')->middleware('can:manage-operations')->group(function () { + Route::get('/', 'Operations\OperationController@index'); + Route::post('/', 'Operations\OperationController@store'); + Route::delete('/{operation}', 'Operations\OperationController@destroy'); + + Route::post('/{operation}/missions', 'Operations\OperationMissionController@store'); + Route::delete('/{operation}/missions', 'Operations\OperationMissionController@destroy'); + }); + // Mission Media Route::post('/hub/missions/media/add-photo', 'Missions\MediaController@uploadPhoto'); Route::post('/hub/missions/media/delete-photo', 'Missions\MediaController@deletePhoto'); From f80d3d35d906f92e28dd309964fdf8aa3f61f3ea Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sat, 26 Jun 2021 00:24:03 +0100 Subject: [PATCH 19/36] Rework settings --- .../Controllers/Users/SettingsController.php | 59 ------------------- resources/views/guides/index.blade.php | 43 -------------- resources/views/user/settings/index.blade.php | 21 ------- routes/web.php | 9 ++- 4 files changed, 4 insertions(+), 128 deletions(-) delete mode 100644 resources/views/guides/index.blade.php diff --git a/app/Http/Controllers/Users/SettingsController.php b/app/Http/Controllers/Users/SettingsController.php index 192b36e7..b180005e 100644 --- a/app/Http/Controllers/Users/SettingsController.php +++ b/app/Http/Controllers/Users/SettingsController.php @@ -16,23 +16,9 @@ class SettingsController extends Controller */ public function index(Request $request) { - if ($request->exists('panel')) { - return view('user.settings.' . $request->panel); - } - return view('user.settings.index'); } - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - // - } - /** * Store a newly created resource in storage. * @@ -48,51 +34,6 @@ public function store(Request $request) } } - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - // - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - // - } - public function avatarSync() { $user = auth()->user(); diff --git a/resources/views/guides/index.blade.php b/resources/views/guides/index.blade.php deleted file mode 100644 index 6b3d11fb..00000000 --- a/resources/views/guides/index.blade.php +++ /dev/null @@ -1,43 +0,0 @@ -@extends('layout') - -@section('title') - Guides -@endsection - -@section('head') - -@endsection - -@section('subnav') - Account -@endsection - -@section('controls') -@endsection - -@section('content') -
    - -
    -@endsection diff --git a/resources/views/user/settings/index.blade.php b/resources/views/user/settings/index.blade.php index 69dd5e0d..85689ff1 100644 --- a/resources/views/user/settings/index.blade.php +++ b/resources/views/user/settings/index.blade.php @@ -8,27 +8,6 @@ primary @endsection -@section('head') - -@endsection - @section('content')
    @include('user.settings.account') diff --git a/routes/web.php b/routes/web.php index ddbba5e7..74002540 100644 --- a/routes/web.php +++ b/routes/web.php @@ -99,11 +99,10 @@ 'except' => ['create', 'edit'] ]); - Route::get('/hub/settings/avatar-sync', 'Users\SettingsController@avatarSync'); - Route::resource('/hub/settings', 'Users\SettingsController'); - - Route::get('/hub/guides', function () { - return view('guides.index'); + Route::prefix('hub/settings')->group(function() { + Route::get('/', 'Users\SettingsController@index'); + Route::post('/', 'Users\SettingsController@store'); + Route::get('/avatar-sync', 'Users\SettingsController@avatarSync'); }); // Hub Index From d540fd2c79d5b93e0e8e0c072e0b635e693d7751 Mon Sep 17 00:00:00 2001 From: TomBurch Date: Sat, 26 Jun 2021 17:53:20 +0100 Subject: [PATCH 20/36] Rework comments --- app/Http/Controllers/HubController.php | 18 -------- .../Missions/CommentController.php | 22 +++------ resources/views/missions/show/aar.blade.php | 38 +++++++++++++--- routes/web.php | 45 ++++++++----------- 4 files changed, 57 insertions(+), 66 deletions(-) delete mode 100644 app/Http/Controllers/HubController.php diff --git a/app/Http/Controllers/HubController.php b/app/Http/Controllers/HubController.php deleted file mode 100644 index 050531ba..00000000 --- a/app/Http/Controllers/HubController.php +++ /dev/null @@ -1,18 +0,0 @@ -exists('mission_id')) { - abort(403, 'You must pass the mission ID in the URL arguments'); - return; - } - - $comments = Mission::find($request->mission_id)->comments; - + $comments = $mission->comments; return view('missions.comments.list', compact('comments')); } @@ -33,7 +27,7 @@ public function index(Request $request) * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store(Request $request, Mission $mission) { if (strlen(trim($request->text)) == 0) { abort(403, 'No comment text provided'); @@ -43,14 +37,13 @@ public function store(Request $request) if ($request->id == -1) { // Create a new comment $comment = new MissionComment(); - $comment->mission_id = $request->mission_id; + $comment->mission_id = $mission->id; $comment->user_id = auth()->user()->id; $comment->text = $request->text; $comment->published = $request->published; $comment->save(); if ($comment->published) { - $mission = Mission::findOrFail($request->mission_id); static::discordNotify($comment); $comment->update([ @@ -69,7 +62,6 @@ public function store(Request $request) $comment->save(); if ($shouldNotify) { - $mission = Mission::findOrFail($request->mission_id); static::discordNotify($comment); $comment->update([ @@ -92,7 +84,7 @@ public function store(Request $request) * @param int $id * @return \Illuminate\Http\Response */ - public function edit(MissionComment $comment) + public function edit(Mission $mission, MissionComment $comment) { return json_encode([ 'text' => $comment->text @@ -105,12 +97,12 @@ public function edit(MissionComment $comment) * @param int $id * @return \Illuminate\Http\Response */ - public function destroy(MissionComment $comment) + public function destroy(Mission $mission, MissionComment $comment) { $comment->delete(); } - public static function discordNotify(MissionComment $comment) + private static function discordNotify(MissionComment $comment) { $url = "{$comment->mission->url()}/aar#comment-{$comment->id}"; $message = "**{$comment->user->username}** commented on **{$comment->mission->display_name}**"; diff --git a/resources/views/missions/show/aar.blade.php b/resources/views/missions/show/aar.blade.php index 7c7a0f45..0ed24bbb 100644 --- a/resources/views/missions/show/aar.blade.php +++ b/resources/views/missions/show/aar.blade.php @@ -9,13 +9,26 @@