+
{t("tournament:subs.prefersToPlay")}
-
+
{sub.weapons.map((wpn) => (
))}
-
+
) : null}
{sub.message ? (
{sub.message}
@@ -414,7 +403,7 @@ function JoinQueueForm() {
}
function TeamQueueSection() {
- const { t } = useTranslation(["q"]);
+ const { t } = useTranslation(["q", "tournament"]);
const data = useLoaderData
() as Extract<
LookingLoaderData,
{ mode: "looking" }
@@ -426,20 +415,36 @@ function TeamQueueSection() {
const isAtMaxMembers =
data.ownTeam.members.length >= tournament.maxMembersPerTeam;
+ const canJoinQueue =
+ data.ownTeam.usersRole === "OWNER" || data.ownTeam.usersRole === "MANAGER";
return (
{!isAtMaxMembers ? (
-
-
- {t("q:looking.joinQPromptMembers")}
-
-
+ canJoinQueue ? (
+
+
+ {t("q:looking.joinQPromptMembers")}
+
+
+ ) : (
+
+
+ {t("q:looking.joinQPromptMembers")}
+
+ }
+ >
+ {t("tournament:lfg.askCaptainToJoinQueue")}
+
+
+ )
) : null}
);
diff --git a/app/features/tournament/TournamentRepository.server.ts b/app/features/tournament/TournamentRepository.server.ts
index 17144c941..58d50a4df 100644
--- a/app/features/tournament/TournamentRepository.server.ts
+++ b/app/features/tournament/TournamentRepository.server.ts
@@ -8,7 +8,6 @@ import type {
PreparedMaps,
Tables,
TournamentSettings,
- TournamentSub,
} from "~/db/tables";
import * as Progression from "~/features/tournament-bracket/core/Progression";
import { Status } from "~/modules/brackets-model";
@@ -85,7 +84,6 @@ export async function findById(id: number) {
"TournamentOrganizationMember.userId",
"TournamentOrganizationMember.role",
...COMMON_USER_FIELDS,
-
"User.pronouns",
])
.whereRef(
@@ -114,29 +112,11 @@ export async function findById(id: number) {
.innerJoin("User", "TournamentStaff.userId", "User.id")
.select([
...COMMON_USER_FIELDS,
-
"User.pronouns",
"TournamentStaff.role",
])
.where("TournamentStaff.tournamentId", "=", id),
).as("staff"),
- jsonArrayFrom(
- eb
- .selectFrom("TournamentTeamMember")
- .innerJoin(
- "TournamentTeam",
- "TournamentTeam.id",
- "TournamentTeamMember.tournamentTeamId",
- )
- .select(({ fn }) => [
- sql`'ALL'`.as("visibility"),
- fn.countAll().as("count"),
- ])
- .where("TournamentTeam.tournamentId", "=", id)
- // xxx: this is not correct
- .where("TournamentTeam.isPlaceholder", "=", 1)
- .where("TournamentTeamMember.isStayAsSub", "=", 1),
- ).as("subCounts"),
jsonArrayFrom(
eb
.selectFrom("TournamentBracketProgressionOverride")
@@ -322,11 +302,6 @@ export async function findById(id: number) {
return {
...result,
- // TODO: types broke with dependency update somehow
- subCounts: result.subCounts as Array<{
- visibility: TournamentSub["visibility"];
- count: number;
- }>,
teams: result.teams.map((team) => ({
...team,
members: team.members.map(({ ordinal, ...member }) => member),
diff --git a/app/features/tournament/routes/to.$id.register.tsx b/app/features/tournament/routes/to.$id.register.tsx
index 6d193faa3..449c712ad 100644
--- a/app/features/tournament/routes/to.$id.register.tsx
+++ b/app/features/tournament/routes/to.$id.register.tsx
@@ -74,7 +74,6 @@ import {
import { useTournament } from "./to.$id";
export { loader, action };
-// xxx: handle placeholder team made
// xxx: allow promoting members to managers
export default function TournamentRegisterPage() {
const isMounted = useIsMounted();
diff --git a/app/features/tournament/routes/to.$id.tsx b/app/features/tournament/routes/to.$id.tsx
index 2eb1868dc..4a9d1d516 100644
--- a/app/features/tournament/routes/to.$id.tsx
+++ b/app/features/tournament/routes/to.$id.tsx
@@ -16,7 +16,6 @@ import { Tournament } from "~/features/tournament-bracket/core/Tournament";
import { useIsMounted } from "~/hooks/useIsMounted";
import type { SendouRouteHandle } from "~/utils/remix.server";
import { removeMarkdown } from "~/utils/strings";
-import { assertUnreachable } from "~/utils/types";
import {
tournamentDivisionsPage,
tournamentPage,
@@ -116,29 +115,6 @@ export function TournamentLayout() {
window.tourney = tournament;
}, [tournament]);
}
- const subsCount = () =>
- // biome-ignore lint/suspicious/useIterableCallbackReturn: Biome 2.3.1 upgrade
- tournament.ctx.subCounts.reduce((acc, cur) => {
- if (cur.visibility === "ALL") return acc + cur.count;
-
- const userPlusTier = user?.plusTier ?? 4;
-
- switch (cur.visibility) {
- case "+1": {
- return userPlusTier === 1 ? acc + cur.count : acc;
- }
- case "+2": {
- return userPlusTier <= 2 ? acc + cur.count : acc;
- }
- case "+3": {
- return userPlusTier <= 3 ? acc + cur.count : acc;
- }
- default: {
- assertUnreachable(cur.visibility);
- }
- }
- }, 0);
-
return (
@@ -185,7 +161,7 @@ export function TournamentLayout() {
{tournament.registrationOpen
? t("tournament:tabs.looking")
- : t("tournament:tabs.subs", { count: subsCount() })}
+ : t("tournament:tabs.subs")}
) : null}
{tournament.hasStarted && !tournament.everyBracketOver ? (
diff --git a/locales/da/tournament.json b/locales/da/tournament.json
index 614ac15e7..b9368a8d0 100644
--- a/locales/da/tournament.json
+++ b/locales/da/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seedninger",
"tabs.results": "",
"tabs.streams": "Streams ({{count}})",
- "tabs.subs": "Suppleanter ({{count}})",
+ "tabs.subs": "Suppleanter",
"tabs.looking": "",
"pre.steps.header": "Fuldfør disse trin for at spille",
"pre.steps.name": "Holdnavn",
@@ -150,5 +150,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/de/tournament.json b/locales/de/tournament.json
index 7d03dc284..e4f3cae9f 100644
--- a/locales/de/tournament.json
+++ b/locales/de/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seeds",
"tabs.results": "Ergebnisse",
"tabs.streams": "Streams ({{count}})",
- "tabs.subs": "Ersatzspieler ({{count}})",
+ "tabs.subs": "Ersatzspieler",
"tabs.looking": "",
"pre.steps.header": "Folge diesen Schritten, um zu spielen",
"pre.steps.name": "Teamname",
@@ -150,5 +150,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/en/tournament.json b/locales/en/tournament.json
index bc05bfbf2..7f056f285 100644
--- a/locales/en/tournament.json
+++ b/locales/en/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seeds",
"tabs.results": "Results",
"tabs.streams": "Streams ({{count}})",
- "tabs.subs": "Subs ({{count}})",
+ "tabs.subs": "Subs",
"tabs.looking": "LFG",
"pre.steps.header": "Complete these steps to play",
"pre.steps.name": "Team name",
@@ -150,5 +150,6 @@
"progression.error.NEGATIVE_PROGRESSION": "Negative progression only possible for double elimination",
"progression.error.NO_SE_SOURCE": "Single elimination is not a valid source bracket",
"progression.error.NO_DE_POSITIVE": "Double elimination is not valid for positive progression",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "Swiss bracket with early advance/elimination must lead to another bracket"
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "Swiss bracket with early advance/elimination must lead to another bracket",
+ "lfg.askCaptainToJoinQueue": "Ask your team's captain or a manager to join the queue"
}
diff --git a/locales/es-ES/tournament.json b/locales/es-ES/tournament.json
index 70e5dab56..d33287a90 100644
--- a/locales/es-ES/tournament.json
+++ b/locales/es-ES/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Listas de Equipos",
"tabs.results": "Resultados",
"tabs.streams": "Streams ({{count}})",
- "tabs.subs": "Subs ({{count}})",
+ "tabs.subs": "Subs",
"tabs.looking": "",
"pre.steps.header": "Completa estos pasos para jugar",
"pre.steps.name": "Nombre de equipo",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "La progresión negativa solo es posible en eliminación doble",
"progression.error.NO_SE_SOURCE": "La eliminación simple no es un cuadro de origen válido",
"progression.error.NO_DE_POSITIVE": "La eliminación doble no es válida para progresión positiva",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "El cuadro suizo con avance/eliminación anticipada debe llevar a otro cuadro"
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "El cuadro suizo con avance/eliminación anticipada debe llevar a otro cuadro",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/es-US/tournament.json b/locales/es-US/tournament.json
index da9a70b6b..b635e67fb 100644
--- a/locales/es-US/tournament.json
+++ b/locales/es-US/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Listas de Equipos",
"tabs.results": "",
"tabs.streams": "Streams ({{count}})",
- "tabs.subs": "Subs ({{count}})",
+ "tabs.subs": "Subs",
"tabs.looking": "",
"pre.steps.header": "Completa estos pasos para jugar",
"pre.steps.name": "Nombre de equipo",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/fr-CA/tournament.json b/locales/fr-CA/tournament.json
index 230634f42..8bddfb9b0 100644
--- a/locales/fr-CA/tournament.json
+++ b/locales/fr-CA/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seeds",
"tabs.results": "",
"tabs.streams": "Diffusions ({{count}})",
- "tabs.subs": "Remplaçants ({{count}})",
+ "tabs.subs": "Remplaçants",
"tabs.looking": "",
"pre.steps.header": "Complétez ces étapes pour jouer",
"pre.steps.name": "Nom de l'équipe",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/fr-EU/tournament.json b/locales/fr-EU/tournament.json
index 55f9dec34..508c7e09f 100644
--- a/locales/fr-EU/tournament.json
+++ b/locales/fr-EU/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seeds",
"tabs.results": "Resultats",
"tabs.streams": "Diffusions ({{count}})",
- "tabs.subs": "Remplaçants ({{count}})",
+ "tabs.subs": "Remplaçants",
"tabs.looking": "",
"pre.steps.header": "Complétez ces étapes pour jouer",
"pre.steps.name": "Nom de l'équipe",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "Negative progression only possible for double elimination",
"progression.error.NO_SE_SOURCE": "Single elimination is not a valid source bracket",
"progression.error.NO_DE_POSITIVE": "Double elimination is not valid for positive progression",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/he/tournament.json b/locales/he/tournament.json
index e648088e4..b02d130ae 100644
--- a/locales/he/tournament.json
+++ b/locales/he/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "דירוג",
"tabs.results": "",
"tabs.streams": "שידורים חיים ({{count}})",
- "tabs.subs": "מחליפים ({{count}})",
+ "tabs.subs": "מחליפים",
"tabs.looking": "",
"pre.steps.header": "השלימו את השלבים הבאים כדי לשחק",
"pre.steps.name": "שם קבוצה",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/it/tournament.json b/locales/it/tournament.json
index 1b7af13e9..a96e7f5cd 100644
--- a/locales/it/tournament.json
+++ b/locales/it/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Seed",
"tabs.results": "Resultati",
"tabs.streams": "Stream ({{count}})",
- "tabs.subs": "Sub ({{count}})",
+ "tabs.subs": "Sub",
"tabs.looking": "",
"pre.steps.header": "Completa questi passaggi per giocare",
"pre.steps.name": "Nome team",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "La progressione negativa è disponibile solo in doppia eliminazione",
"progression.error.NO_SE_SOURCE": "Eliminazione singola non è un bracket sorgente valido",
"progression.error.NO_DE_POSITIVE": "Doppia eliminazione non è valida per progressione positiva",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/ja/tournament.json b/locales/ja/tournament.json
index 3bdceb91d..fdee31ba3 100644
--- a/locales/ja/tournament.json
+++ b/locales/ja/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "シード",
"tabs.results": "結果",
"tabs.streams": "配信 ({{count}})",
- "tabs.subs": "サブ ({{count}})",
+ "tabs.subs": "サブ",
"tabs.looking": "",
"pre.steps.header": "トーナメント参加のために下記を入力してください",
"pre.steps.name": "チーム名",
@@ -146,5 +146,6 @@
"progression.error.NEGATIVE_PROGRESSION": "逆の進行はダブルエリ三ネーションの時のみ可能です",
"progression.error.NO_SE_SOURCE": "シングルエリ三ネーションは妥当なブラケットではないです",
"progression.error.NO_DE_POSITIVE": "ダブルエリミネーションは普通の進行(前向き)では妥当ではないです",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/ko/tournament.json b/locales/ko/tournament.json
index 9181f4f57..e515476e5 100644
--- a/locales/ko/tournament.json
+++ b/locales/ko/tournament.json
@@ -146,5 +146,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/nl/tournament.json b/locales/nl/tournament.json
index c8292a3fe..f4100dcc2 100644
--- a/locales/nl/tournament.json
+++ b/locales/nl/tournament.json
@@ -150,5 +150,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/pl/tournament.json b/locales/pl/tournament.json
index f76a2e68a..d51b15db7 100644
--- a/locales/pl/tournament.json
+++ b/locales/pl/tournament.json
@@ -154,5 +154,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/pt-BR/tournament.json b/locales/pt-BR/tournament.json
index 24502032f..7c7f2e65b 100644
--- a/locales/pt-BR/tournament.json
+++ b/locales/pt-BR/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Sementes",
"tabs.results": "",
"tabs.streams": "Transmissões ({{count}})",
- "tabs.subs": "Inscritos ({{count}})",
+ "tabs.subs": "Inscritos",
"tabs.looking": "",
"pre.steps.header": "Complete esses passos para jogar",
"pre.steps.name": "Nome do time",
@@ -152,5 +152,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/ru/tournament.json b/locales/ru/tournament.json
index 05dfb61d7..e748f4327 100644
--- a/locales/ru/tournament.json
+++ b/locales/ru/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "Семена",
"tabs.results": "Результаты",
"tabs.streams": "Трансляции: ({{count}})",
- "tabs.subs": "Запасные: ({{count}})",
+ "tabs.subs": "Запасные",
"tabs.looking": "",
"pre.steps.header": "Завершите следующие шаги, чтобы закончить регистрацию",
"pre.steps.name": "Имя команды",
@@ -154,5 +154,6 @@
"progression.error.NEGATIVE_PROGRESSION": "Отрицательная прогрессия возможна только в Double Elimination турнирах",
"progression.error.NO_SE_SOURCE": "Single elimination не валидная сетка-исток",
"progression.error.NO_DE_POSITIVE": "Double elimination не валидно для позитивной прогрессии",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}
diff --git a/locales/zh/tournament.json b/locales/zh/tournament.json
index 1d960ab4f..773f8682c 100644
--- a/locales/zh/tournament.json
+++ b/locales/zh/tournament.json
@@ -7,7 +7,7 @@
"tabs.seeds": "种子",
"tabs.results": "",
"tabs.streams": "直播 ({{count}})",
- "tabs.subs": "替补 ({{count}})",
+ "tabs.subs": "替补",
"tabs.looking": "",
"pre.steps.header": "参加比赛需完成以下步骤",
"pre.steps.name": "队伍名称",
@@ -146,5 +146,6 @@
"progression.error.NEGATIVE_PROGRESSION": "",
"progression.error.NO_SE_SOURCE": "",
"progression.error.NO_DE_POSITIVE": "",
- "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": ""
+ "progression.error.SWISS_EARLY_ADVANCE_NO_DESTINATION": "",
+ "lfg.askCaptainToJoinQueue": ""
}