1.3 from staging #5

Merged
Belupeti merged 6 commits from dev into master 2026-08-22 10:16:40 +02:00
2 changed files with 6 additions and 6 deletions
Showing only changes of commit fb5f59027e - Show all commits
+1 -1
View File
@@ -7,7 +7,7 @@ jobs:
env: env:
IMAGE_NAME: tladle IMAGE_NAME: tladle
REGISTRY_NAME: gitea.sc0tt.org REGISTRY_NAME: gitea.sc0tt.org
GIT_TAG: 1.2 GIT_TAG: 1.2.1
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
+5 -5
View File
@@ -33,7 +33,7 @@ class TlaController extends Controller
$session = $request->session(); $session = $request->session();
if ($session->get('date-'.$language, NULL) != date('Y-m-d')) if ($session->get('date-'.$language, NULL) != date('Y-m-d'))
{ {
$session->forget('guesses--'.$language); $session->forget('guesses-'.$language);
$session->forget('tla-'.$language); $session->forget('tla-'.$language);
$session->forget('correct-'.$language); $session->forget('correct-'.$language);
$session->forget('review-'.$language); $session->forget('review-'.$language);
@@ -53,8 +53,8 @@ class TlaController extends Controller
return response()->json([ return response()->json([
'hint' => $tla->hint, 'hint' => $tla->hint,
'guesses' => $session->get('guesses--'.$language, []), 'guesses' => $session->get('guesses-'.$language, []),
'date' => $session->get('date--'.$language), 'date' => $session->get('date-'.$language),
'tla' => $session->get('tla-'.$language) == $tla->acronym ? $tla->acronym : NULL, 'tla' => $session->get('tla-'.$language) == $tla->acronym ? $tla->acronym : NULL,
'context' => $session->get('tla-'.$language) == $tla->acronym ? $tla->context : NULL, 'context' => $session->get('tla-'.$language) == $tla->acronym ? $tla->context : NULL,
'correct' => $session->get('correct-'.$language), 'correct' => $session->get('correct-'.$language),
@@ -107,8 +107,8 @@ class TlaController extends Controller
$score += $guess_array[$i + 3]; $score += $guess_array[$i + 3];
} }
$session->push('guesses--'.$language, $guess_array); $session->push('guesses-'.$language, $guess_array);
$guesses = $session->get('guesses--'.$language, NULL); $guesses = $session->get('guesses-'.$language, NULL);
if ($score == 12 || count($guesses) == env('MAX_GUESSES', 10)) { if ($score == 12 || count($guesses) == env('MAX_GUESSES', 10)) {
$session->put('tla-'.$language, $tla_object->acronym); $session->put('tla-'.$language, $tla_object->acronym);