diff --git a/.gitea/workflows/build-image.yaml b/.gitea/workflows/build-image.yaml index 93ff775..31bf74e 100644 --- a/.gitea/workflows/build-image.yaml +++ b/.gitea/workflows/build-image.yaml @@ -7,7 +7,7 @@ jobs: env: IMAGE_NAME: tladle REGISTRY_NAME: gitea.sc0tt.org - GIT_TAG: 0.1 + GIT_TAG: 1.0 runs-on: ubuntu-latest steps: - name: Checkout diff --git a/app/Http/Controllers/TlaController.php b/app/Http/Controllers/TlaController.php index 71b86fc..40226be 100644 --- a/app/Http/Controllers/TlaController.php +++ b/app/Http/Controllers/TlaController.php @@ -28,17 +28,27 @@ class TlaController extends Controller return redirect()->route('admin')->with('success', 'Record deleted'); } + public function session_flush(Request $request, string $language) + { + if ($request->session()->get('date', NULL) != date('Y-m-d')) + { + $request->session()->forget('guesses-'.$language); + $request->session()->put('date', date('Y-m-d')); + } + } + public function fetch_tla(Request $request, ?string $language = 'en') { $allowedLanguages = array('hu', 'en'); - if ( !in_array($language, $allowedLanguages) ) $language = 'en'; $tla = Tla::GetCurrentTla($language); + $this->session_flush($request, $language); return response()->json([ 'hint' => $tla->hint, - 'guesses' => $request->session()->get('guesses-'.$language, NULL) + 'guesses' => $request->session()->get('guesses-'.$language, []), + 'date' => $request->session()->get('date'), ]); } @@ -47,6 +57,7 @@ class TlaController extends Controller $request->validate([ 'guess' => 'required|array|size:3', ]); + $this->session_flush($request, $language); $tla = explode(' ', Tla::GetCurrentTla($language)->abbreviation); @@ -81,7 +92,8 @@ class TlaController extends Controller $guesses = $request->session()->get('guesses-'.$language, NULL); return response()->json([ - 'guesses' => $request->session()->get('guesses-'.$language, NULL), + 'guesses' => $request->session()->get('guesses-'.$language, []), + 'date' => $request->session()->get('date'), 'real' => $tla ]); } diff --git a/resources/js/App.vue b/resources/js/App.vue index 47481e8..bed11cb 100644 --- a/resources/js/App.vue +++ b/resources/js/App.vue @@ -25,7 +25,6 @@ TLAdle -