From 516f58975bdea35790688983da8fda28bc297c95 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Wed, 18 Mar 2026 20:18:50 +0200 Subject: [PATCH] /to/:id/looking tweaks and fixes --- .../TournamentLFGRepository.server.ts | 6 +-- .../tournament-lfg/routes/to.$id.looking.tsx | 40 +++++-------------- .../queries/joinLeaveTeam.server.ts | 1 - .../tournament/routes/to.$id.register.tsx | 1 - locales/da/q.json | 1 + locales/de/q.json | 1 + locales/en/forms.json | 2 +- locales/en/q.json | 1 + locales/es-ES/q.json | 1 + locales/es-US/q.json | 1 + locales/fr-CA/q.json | 1 + locales/fr-EU/q.json | 1 + locales/he/q.json | 1 + locales/it/q.json | 1 + locales/ja/q.json | 1 + locales/ko/q.json | 1 + locales/nl/q.json | 1 + locales/pl/q.json | 1 + locales/pt-BR/q.json | 1 + locales/ru/q.json | 1 + locales/zh/q.json | 1 + 21 files changed, 29 insertions(+), 37 deletions(-) diff --git a/app/features/tournament-lfg/TournamentLFGRepository.server.ts b/app/features/tournament-lfg/TournamentLFGRepository.server.ts index 3a37960f7..85bf54deb 100644 --- a/app/features/tournament-lfg/TournamentLFGRepository.server.ts +++ b/app/features/tournament-lfg/TournamentLFGRepository.server.ts @@ -8,8 +8,6 @@ import { concatUserSubmittedImagePrefix } from "~/utils/kysely.server"; import { errorIsSqliteForeignKeyConstraintFailure } from "~/utils/sql"; import { randomTeamName } from "~/utils/team-name"; -// xxx: handle visibility like scrim post - export function startLooking(teamId: number) { return db .updateTable("TournamentTeam") @@ -152,12 +150,9 @@ export async function findSubGroups(tournamentId: number) { .$castTo() .as("members"), ]) - // xxx: is this correct? .where("TournamentTeam.tournamentId", "=", tournamentId) .where("TournamentTeam.isPlaceholder", "=", 1) .where("TournamentTeamMember.isStayAsSub", "=", 1) - .groupBy("TournamentTeam.id") - .having(({ fn }) => fn.countAll(), "=", 1) .execute(); return rows; @@ -364,6 +359,7 @@ export function leaveLfg({ .set({ isStayAsSub: 0 }) .where("tournamentTeamId", "=", userTeam.tournamentTeamId) .execute(); + await deleteLikesByTeamId(userTeam.tournamentTeamId, trx); return; } diff --git a/app/features/tournament-lfg/routes/to.$id.looking.tsx b/app/features/tournament-lfg/routes/to.$id.looking.tsx index c1b0bc625..2a6b35304 100644 --- a/app/features/tournament-lfg/routes/to.$id.looking.tsx +++ b/app/features/tournament-lfg/routes/to.$id.looking.tsx @@ -119,9 +119,7 @@ function GroupsView({ const ownGroupElement = data.ownGroup ? (
- + {!isMobile ? invitedGroupsDesktop : null}
) : null; @@ -449,34 +447,18 @@ function TeamQueueSection() { ); } -function LFGGroupLeaver({ type }: { type: "LEAVE_GROUP" | "LEAVE_Q" }) { +function LFGGroupLeaver() { const { t } = useTranslation(["q"]); - const fetcher = useFetcher(); - - if (type === "LEAVE_GROUP") { - return ( - - - {t("q:looking.groups.actions.stopLooking")} - - - ); - } return ( - - - {t("q:looking.groups.actions.leaveQ")} - - + + + {t("q:looking.groups.actions.stopLooking")} + + ); } diff --git a/app/features/tournament/queries/joinLeaveTeam.server.ts b/app/features/tournament/queries/joinLeaveTeam.server.ts index 89d01603f..8c81e01f2 100644 --- a/app/features/tournament/queries/joinLeaveTeam.server.ts +++ b/app/features/tournament/queries/joinLeaveTeam.server.ts @@ -25,7 +25,6 @@ const deleteMemberStm = sql.prepare(/*sql*/ ` and "userId" = @userId `); -// xxx: migrate to kysely. note: deleteSub was deleted from here export const joinTeam = sql.transaction( ({ previousTeamId, diff --git a/app/features/tournament/routes/to.$id.register.tsx b/app/features/tournament/routes/to.$id.register.tsx index 20423eac0..8f3a9ea72 100644 --- a/app/features/tournament/routes/to.$id.register.tsx +++ b/app/features/tournament/routes/to.$id.register.tsx @@ -73,7 +73,6 @@ import { import { useTournament } from "./to.$id"; export { loader, action }; -// xxx: allow promoting members to managers export default function TournamentRegisterPage() { const isMounted = useIsMounted(); const tournament = useTournament(); diff --git a/locales/da/q.json b/locales/da/q.json index f534b6022..c52a417a6 100644 --- a/locales/da/q.json +++ b/locales/da/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/de/q.json b/locales/de/q.json index 312f2d43a..88f39bd8e 100644 --- a/locales/de/q.json +++ b/locales/de/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/en/forms.json b/locales/en/forms.json index 051ee3d8d..471a3237a 100644 --- a/locales/en/forms.json +++ b/locales/en/forms.json @@ -223,5 +223,5 @@ "labels.visibility": "Visibility", "labels.note": "Note", "labels.stayAsSub": "Stay as sub", - "bottomTexts.stayAsSub": "If you don't find a full team before registration ends, you will stay as a solo sub for the duration of the tournament" + "bottomTexts.stayAsSub": "If you don't find team members before registration ends, you will stay as a solo sub for the duration of the tournament" } diff --git a/locales/en/q.json b/locales/en/q.json index 0084567a4..b38ca8878 100644 --- a/locales/en/q.json +++ b/locales/en/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Kick", "looking.groups.actions.leaveGroup": "Leave group", "looking.groups.actions.stopLooking": "Stop looking", + "looking.groups.actions.stopLooking.confirm": "Do you want to stop looking (any invitations given/received deleted)?", "looking.groups.actions.leaveQ": "Leave queue", "looking.groups.actions.goBack": "Go back", "looking.groups.adder.quickAdd": "Quick add", diff --git a/locales/es-ES/q.json b/locales/es-ES/q.json index 17b4820fa..e3daaac86 100644 --- a/locales/es-ES/q.json +++ b/locales/es-ES/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Expulsar", "looking.groups.actions.leaveGroup": "Dejar grupo", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Dejar fila", "looking.groups.actions.goBack": "Regresar", "looking.groups.adder.quickAdd": "Añadir rapido", diff --git a/locales/es-US/q.json b/locales/es-US/q.json index a80c05c36..83eb8b78d 100644 --- a/locales/es-US/q.json +++ b/locales/es-US/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Expulsar", "looking.groups.actions.leaveGroup": "Dejar grupo", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Dejar fila", "looking.groups.actions.goBack": "Regresar", "looking.groups.adder.quickAdd": "Añadir rápido", diff --git a/locales/fr-CA/q.json b/locales/fr-CA/q.json index 0349bcc29..d76636324 100644 --- a/locales/fr-CA/q.json +++ b/locales/fr-CA/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/fr-EU/q.json b/locales/fr-EU/q.json index faf23442c..40a3d0334 100644 --- a/locales/fr-EU/q.json +++ b/locales/fr-EU/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Kick", "looking.groups.actions.leaveGroup": "Quitter le groupe", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Quitter la queue", "looking.groups.actions.goBack": "Retourner en arrière", "looking.groups.adder.quickAdd": "Ajouter rapidement", diff --git a/locales/he/q.json b/locales/he/q.json index 11a0c7a4c..dfc88b378 100644 --- a/locales/he/q.json +++ b/locales/he/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/it/q.json b/locales/it/q.json index 3dd1addaf..d8094cadc 100644 --- a/locales/it/q.json +++ b/locales/it/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Caccia", "looking.groups.actions.leaveGroup": "Lascia gruppo", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Lascia coda", "looking.groups.actions.goBack": "Indietro", "looking.groups.adder.quickAdd": "Aggiungi direttamente", diff --git a/locales/ja/q.json b/locales/ja/q.json index aa3a91111..4318c54a8 100644 --- a/locales/ja/q.json +++ b/locales/ja/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "キックする", "looking.groups.actions.leaveGroup": "グループを出る", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "列から出る", "looking.groups.actions.goBack": "戻る", "looking.groups.adder.quickAdd": "クイック追加", diff --git a/locales/ko/q.json b/locales/ko/q.json index 312f2d43a..88f39bd8e 100644 --- a/locales/ko/q.json +++ b/locales/ko/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/nl/q.json b/locales/nl/q.json index 312f2d43a..88f39bd8e 100644 --- a/locales/nl/q.json +++ b/locales/nl/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/pl/q.json b/locales/pl/q.json index 312f2d43a..88f39bd8e 100644 --- a/locales/pl/q.json +++ b/locales/pl/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "", "looking.groups.actions.leaveGroup": "", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "", "looking.groups.actions.goBack": "", "looking.groups.adder.quickAdd": "", diff --git a/locales/pt-BR/q.json b/locales/pt-BR/q.json index 3de761ade..9dd927d04 100644 --- a/locales/pt-BR/q.json +++ b/locales/pt-BR/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Chutar (kick)", "looking.groups.actions.leaveGroup": "Sair do grupo", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Sair da fila", "looking.groups.actions.goBack": "Voltar", "looking.groups.adder.quickAdd": "Adicionar rapidamente (quick add)", diff --git a/locales/ru/q.json b/locales/ru/q.json index 52114369a..0699ac4f0 100644 --- a/locales/ru/q.json +++ b/locales/ru/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "Выгнать", "looking.groups.actions.leaveGroup": "Покинуть группу", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "Покинуть очередь", "looking.groups.actions.goBack": "Вернуться назад", "looking.groups.adder.quickAdd": "Быстро добавить", diff --git a/locales/zh/q.json b/locales/zh/q.json index 8a9502d86..325ec4f4a 100644 --- a/locales/zh/q.json +++ b/locales/zh/q.json @@ -96,6 +96,7 @@ "looking.groups.actions.kick": "踢出", "looking.groups.actions.leaveGroup": "离开小队", "looking.groups.actions.stopLooking": "", + "looking.groups.actions.stopLooking.confirm": "", "looking.groups.actions.leaveQ": "停止匹配", "looking.groups.actions.goBack": "返回", "looking.groups.adder.quickAdd": "快速添加",