X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FHttp%2FControllers%2FAosSeedController.php;h=19f6f4b6b0c6094a6b9a0e5dbe6d07d9107a926a;hb=19a773da8abaffaa9806a2f9733a6c8af04b9c42;hp=9d35bc09fd0fcc44324a94178665f0158c974a9f;hpb=9fba7a05c1aba4b8d3be892c8b29c604ba4ae484;p=alttp.git

diff --git a/app/Http/Controllers/AosSeedController.php b/app/Http/Controllers/AosSeedController.php
index 9d35bc0..19f6f4b 100644
--- a/app/Http/Controllers/AosSeedController.php
+++ b/app/Http/Controllers/AosSeedController.php
@@ -2,9 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\GenerateAosSeed;
+use App\DiscordAppCommands\AosrPresetCommand;
 use App\Models\AosSeed;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 
 class AosSeedController extends Controller
 {
@@ -22,16 +23,46 @@ class AosSeedController extends Controller
 		return $seed->toJson();
 	}
 
+	public function generate(Request $request) {
+		$validatedData = $request->validate([
+			'preset' => 'string|required',
+			'race' => 'boolean',
+		]);
+		$presetName = $validatedData['preset'];
+		$race = $validatedData['race'] ?? false;
+
+		$preset = AosrPresetCommand::presetByName($presetName);
+		if (!$preset) {
+			abort(404);
+		}
+		$seed = AosSeed::generateSurge($presetName, $preset['settings'], $race);
+		Artisan::call('aos:generate '.intval($seed->id));
+
+		$seed = $this->censor($seed->fresh());
+		return $seed->toJson();
+	}
+
 	public function retry($hash) {
 		$seed = AosSeed::where('hash', '=', $hash)->firstOrFail();
 
 		if ($seed->status == 'error') {
 			$seed->status = 'pending';
 			$seed->save();
-			GenerateAosSeed::dispatch($seed)->onConnection('database');
+			Artisan::call('aos:generate '.intval($seed->id));
 		}
 
+		$seed = $this->censor($seed->fresh());
 		return $seed->toJson();
 	}
 
+	private function censor(AosSeed $seed) {
+		if ($seed->race) {
+			$seed->makeHidden('seed');
+		}
+		if ($seed->mystery) {
+			$seed->makeHidden('settings');
+		}
+		return $seed;
+	}
+
 }