From 59fb2d92d79efdec042122ffba222ec5ba02b8ee Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Sat, 5 Mar 2022 10:01:17 +0200 Subject: [PATCH] Looking action redirect don't throw if not LOOKING --- app/routes/play/looking.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/routes/play/looking.tsx b/app/routes/play/looking.tsx index 15580d84a..4f07dc363 100644 --- a/app/routes/play/looking.tsx +++ b/app/routes/play/looking.tsx @@ -89,8 +89,14 @@ export const action: ActionFunction = async ({ request, context }) => { const user = requireUser(context); const ownGroup = await LFGGroup.findActiveByMember(user); - validate(ownGroup, "No active group"); - validate(ownGroup.status === "LOOKING", "Group is not looking"); + + if (!ownGroup) return redirect("/play"); + const redirectRes = resolveRedirect({ + currentStatus: ownGroup.status, + currentPage: "LOOKING", + matchId: ownGroup.matchId, + }); + if (redirectRes) return redirectRes; const validateIsGroupAdmin = () => validate(isGroupAdmin({ group: ownGroup, user }), "Not group admin");