From f5d1d84b81497274475c9c38311d5a16be20713a Mon Sep 17 00:00:00 2001
From: Stefan Schermann <stefan.schermann@gmail.com>
Date: Wed, 6 Sep 2023 12:47:48 +0200
Subject: [PATCH 1/2] fix rejoining unstarted private tournaments

withdrawing from an unstarted tournament removes the user, which requires entering the password again on rejoin
ctrl.tournament is overwritten in onReload, so an explicit reference is required for mithril to detect the removal of tournament.me
---
 src/lichess/tournament.ts                   |  2 +-
 src/ui/tournament/detail/tournamentView.tsx | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/lichess/tournament.ts b/src/lichess/tournament.ts
index 05551db931..18d0dea76b 100644
--- a/src/lichess/tournament.ts
+++ b/src/lichess/tournament.ts
@@ -5,5 +5,5 @@ export function isIn(data: Tournament): boolean {
 }
 
 export function previouslyJoined(data: Tournament): boolean {
-  return data.me != null
+  return !!data.me
 }
diff --git a/src/ui/tournament/detail/tournamentView.tsx b/src/ui/tournament/detail/tournamentView.tsx
index 8f0dc3559c..c0f74cc20b 100644
--- a/src/ui/tournament/detail/tournamentView.tsx
+++ b/src/ui/tournament/detail/tournamentView.tsx
@@ -75,7 +75,7 @@ export function renderFooter(ctrl: TournamentCtrl): Mithril.Child {
           }
         </button> : h.fragment({key: 'noChat'}, [])
       }
-      { ctrl.hasJoined ? withdrawButton(ctrl, t) : joinButton(ctrl, t) }
+      { ctrl.hasJoined ? withdrawButton(ctrl) : joinButton(ctrl) }
     </div>
   )
 }
@@ -181,7 +181,8 @@ function tournamentSpotlightInfo(spotlight: Spotlight) {
   )
 }
 
-function joinButton(ctrl: TournamentCtrl, t: Tournament) {
+function joinButton(ctrl: TournamentCtrl) {
+  const t = ctrl.tournament
   if (!session.isConnected() ||
     t.isFinished ||
     settings.game.supportedVariants.indexOf(t.variant) < 0 ||
@@ -189,9 +190,9 @@ function joinButton(ctrl: TournamentCtrl, t: Tournament) {
     (t.teamBattle && t.teamBattle.joinWith.length === 0)) {
     return h.fragment({key: 'noJoinButton'}, [])
   }
-  const action = ((t.private || t.teamBattle) && !previouslyJoined(t)) ?
-    () => joinForm.open(ctrl) :
-    () => ctrl.join()
+  const action = () => ((ctrl.tournament.private || ctrl.tournament.teamBattle) && !previouslyJoined(ctrl.tournament)) ?
+    joinForm.open(ctrl) :
+    ctrl.join()
 
   return (
     <button key="joinButton" className="action_bar_button fa fa-play" oncreate={helper.ontap(
@@ -202,7 +203,8 @@ function joinButton(ctrl: TournamentCtrl, t: Tournament) {
   )
 }
 
-function withdrawButton(ctrl: TournamentCtrl, t: Tournament) {
+function withdrawButton(ctrl: TournamentCtrl) {
+  const t = ctrl.tournament
   if (t.isFinished || settings.game.supportedVariants.indexOf(t.variant) < 0) {
     return h.fragment({key: 'noWithdrawButton'}, [])
   }

From e7fcd669102bc2f52a986b3724d4de821f5a2068 Mon Sep 17 00:00:00 2001
From: Stefan Schermann <stefan.schermann@gmail.com>
Date: Wed, 6 Sep 2023 12:50:43 +0200
Subject: [PATCH 2/2] tweak password form

---
 src/ui/tournament/detail/joinForm.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ui/tournament/detail/joinForm.tsx b/src/ui/tournament/detail/joinForm.tsx
index 1c7d113ce5..61252a8569 100644
--- a/src/ui/tournament/detail/joinForm.tsx
+++ b/src/ui/tournament/detail/joinForm.tsx
@@ -5,6 +5,7 @@ import router from '../../../router'
 import TournamentCtrl from './TournamentCtrl'
 import formWidgets from '../../shared/form'
 import settings from '../../../settings'
+import * as helper from '../../helper'
 
 let isOpen = false
 let tournamentCtrl: TournamentCtrl
@@ -52,7 +53,7 @@ function renderForm() {
         <div className={'select_input no_arrow_after' + (t.private ? '' : ' notVisible')}>
           <div className="text_input_container">
             <label>Password: </label>
-            <input type="text" id="tournamentPassword" className="passwordField" />
+            <input type="text" id="tournamentPassword" className="passwordField" autocapitalize="off" autocomplete="off" oncreate={helper.autofocus} />
           </div>
         </div>
         <div className={'select_input no_arrow_after' + (t.teamBattle ? '' : ' notVisible')}>