Fix team rejoining

server/db/sql_queries.sql

@@ -4,8 +4,8 @@ INSERT INTO teams (team_name, invite_code) VALUES (?, ?) RETURNING *;
 -- name: JoinTeam :one
 INSERT INTO team_members (team_name, user_name, is_leader) VALUES (?, ?, ?) RETURNING *;
 
--- name: LeaveTeam :one
-DELETE FROM team_members WHERE team_name = ? AND user_name = ? RETURNING *;
+-- name: LeaveTeam :exec
+DELETE FROM team_members WHERE team_name = ? AND user_name = ?;
 
 -- name: IsLeader :one
 SELECT is_leader FROM team_members WHERE team_name = ? AND user_name = ?;

server/frontend/pages/join.html

@@ -48,9 +48,6 @@ <h2>Team Creation</h2>
         title="Your name should be of length [2, 32] consisting of letters and spaces only!"
         value="{{ .FillingUsername }}"
         autocomplete="off"
-        {{ if .TeamName }}
-          disabled
-        {{ end }}
       />
 
       <div class="team-grid">

server/r_join.go

@@ -115,9 +115,10 @@ func (s *Server) join(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := s.database.Tx(func(q *db.Queries) error {
+	err := s.database.Tx(func(q *db.Queries) (err error) {
+		var isLeader bool
 		if isAuthenticated {
-			isLeader, err := q.IsLeader(ctx, db.IsLeaderParams{
+			isLeader, err = q.IsLeader(ctx, db.IsLeaderParams{
 				TeamName: u.TeamName,
 				Username: u.Username,
 			})
@@ -128,7 +129,7 @@ func (s *Server) join(w http.ResponseWriter, r *http.Request) {
 				return fmt.Errorf("you cannot leave your own team")
 			}
 
-			_, err = q.LeaveTeam(ctx, db.LeaveTeamParams{
+			err = q.LeaveTeam(ctx, db.LeaveTeamParams{
 				TeamName: u.TeamName,
 				Username: u.Username,
 			})
@@ -137,7 +138,6 @@ func (s *Server) join(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 
-		var isLeader bool
 		if data.TeamCode != "" {
 			t, err := q.FindTeamWithInviteCode(ctx, data.TeamCode)
 			if err != nil {
@@ -155,7 +155,7 @@ func (s *Server) join(w http.ResponseWriter, r *http.Request) {
 			isLeader = true
 		}
 
-		_, err := q.JoinTeam(ctx, db.JoinTeamParams{
+		_, err = q.JoinTeam(ctx, db.JoinTeamParams{
 			TeamName: data.TeamName,
 			Username: data.Username,
 			IsLeader: isLeader,