Fix can rejoin SQ via vote in off-season

Closes #3079
2026-09-08 04:05:54 -05:00 · 2026-05-19 22:04:35 +03:00
parent 32c0a872b2
commit beaf7bb2e4
20 changed files with 38 additions and 3 deletions
--- a/app/features/sendouq-match/actions/q.match.$id.server.ts
+++ b/app/features/sendouq-match/actions/q.match.$id.server.ts
@@ -162,6 +162,8 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 				break;
 			}
 			case "CAST_CONTINUE_VOTE": {
+				errorToastIfFalsy(Seasons.current(), "Season is not active");
+
 				const viewerSide = SendouQMatch.resolveGroupMemberOf({
 					groupAlpha: match.groupAlpha,
 					groupBravo: match.groupBravo,
--- a/app/features/sendouq-match/components/RejoinSections.tsx
+++ b/app/features/sendouq-match/components/RejoinSections.tsx
@@ -106,3 +106,12 @@ function DeclinedSection() {
 		</div>
 	);
 }
+
+export function OffSeasonRejoinSection() {
+	const { t } = useTranslation(["q"]);
+	return (
+		<p className="text-lighter text-sm text-center">
+			{t("q:match.rematch.offSeason")}
+		</p>
+	);
+}
--- a/app/features/sendouq-match/components/SendouQMatchActionTab.tsx
+++ b/app/features/sendouq-match/components/SendouQMatchActionTab.tsx
@@ -19,7 +19,11 @@ import {
 } from "../core/match-timeline";
 import * as SendouQMatch from "../core/SendouQMatch";
 import type { SendouQMatchLoaderData } from "../loaders/q.match.$id.server";
-import { MatchmadeRejoinSection, TrustedRejoinSection } from "./RejoinSections";
+import {
+	MatchmadeRejoinSection,
+	OffSeasonRejoinSection,
+	TrustedRejoinSection,
+} from "./RejoinSections";
 import styles from "./SendouQMatchActionTab.module.css";

 export function SendouQMatchActionTab({
@@ -222,7 +226,8 @@ function RequeueTab({
 				</div>
 			) : (
 				<div className={styles.rematchContent}>
-					{viewerGroup.matchmade ? (
+					{data.isOffSeason ? <OffSeasonRejoinSection /> : null}
+					{!data.isOffSeason && viewerGroup.matchmade ? (
 						<MatchmadeRejoinSection
 							data={data}
 							viewerGroup={viewerGroup}
@@ -231,7 +236,8 @@ function RequeueTab({
 							isOnReporterTeam={isOnReporterTeam}
 						/>
 					) : null}
-					{!viewerGroup.matchmade &&
+					{!data.isOffSeason &&
+					!viewerGroup.matchmade &&
 					(!awaitingConfirmation || isOnReporterTeam) ? (
 						<TrustedRejoinSection
 							viewerGroup={viewerGroup}
--- a/app/features/sendouq-match/loaders/q.match.$id.server.ts
+++ b/app/features/sendouq-match/loaders/q.match.$id.server.ts
@@ -2,6 +2,7 @@ import type { LoaderFunctionArgs } from "react-router";
 import { getUser } from "~/features/auth/core/user.server";
 import { chatAccessible } from "~/features/chat/chat-utils";
 import * as RoomLinkRepository from "~/features/chat/RoomLinkRepository.server";
+import * as Seasons from "~/features/mmr/core/Seasons";
 import { SendouQ } from "~/features/sendouq/core/SendouQ.server";
 import * as PrivateUserNoteRepository from "~/features/sendouq/PrivateUserNoteRepository.server";
 import * as ReportedWeaponRepository from "~/features/sendouq-match/ReportedWeaponRepository.server";
@@ -45,6 +46,7 @@ export const loader = async ({ params }: LoaderFunctionArgs) => {
 		roomLinks,
 		anyUserPrefersNoSplatnet,
 		reportedWeapons,
+		isOffSeason: Seasons.current() === null,
 		chatCode: (() => {
 			const isStaff = user?.roles.includes("STAFF") ?? false;
 			const isParticipant = user && matchUsers.includes(user.id);
--- a/locales/da/q.json
+++ b/locales/da/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/de/q.json
+++ b/locales/de/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/en/q.json
+++ b/locales/en/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "Waiting for the captain to choose whether to re-queue",
 	"match.rematch.rejoinQueue": "Rejoin queue",
 	"match.rematch.backToQueue": "Back to queue",
+	"match.rematch.offSeason": "Season has ended. The queue will reopen when the next season starts.",
 	"match.banner.final": "Final",
 	"match.banner.bestOf": "Best of {{count}}",
 	"match.banner.playAll": "Play all {{count}}",
--- a/locales/es-ES/q.json
+++ b/locales/es-ES/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/es-US/q.json
+++ b/locales/es-US/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/fr-CA/q.json
+++ b/locales/fr-CA/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/fr-EU/q.json
+++ b/locales/fr-EU/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/he/q.json
+++ b/locales/he/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/it/q.json
+++ b/locales/it/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/ja/q.json
+++ b/locales/ja/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/ko/q.json
+++ b/locales/ko/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/nl/q.json
+++ b/locales/nl/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/pl/q.json
+++ b/locales/pl/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/pt-BR/q.json
+++ b/locales/pt-BR/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/ru/q.json
+++ b/locales/ru/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",
--- a/locales/zh/q.json
+++ b/locales/zh/q.json
@@ -219,6 +219,7 @@
 	"match.rematch.waitingCaptain": "",
 	"match.rematch.rejoinQueue": "",
 	"match.rematch.backToQueue": "",
+	"match.rematch.offSeason": "",
 	"match.banner.final": "",
 	"match.banner.bestOf": "",
 	"match.banner.playAll": "",