diff --git a/components/InactivityNoticeCard.tsx b/components/InactivityNoticeCard.tsx index e88732d..5eb37a4 100644 --- a/components/InactivityNoticeCard.tsx +++ b/components/InactivityNoticeCard.tsx @@ -89,7 +89,9 @@ export default function ( {typeof props.hiatus === "boolean" ? ( Notice Type - {props.hiatus ? "Hiatus" : "Inactivity"} + + {props.hiatus ? "Hiatus/Inactivity" : "Activity Decrease"} + ) : null} {props.decisions ? ( diff --git a/components/NewInactivityNotice.tsx b/components/NewInactivityNotice.tsx index 7da1026..b7b9b67 100644 --- a/components/NewInactivityNotice.tsx +++ b/components/NewInactivityNotice.tsx @@ -69,7 +69,9 @@ export default function (props: { body: JSON.stringify({ departments, end, - hiatus: departments.includes("DM") ? isHiatus : undefined, + hiatus: ["DM", "WM"].find((d) => departments.includes(d)) + ? isHiatus + : undefined, reason, start, }), @@ -147,7 +149,7 @@ export default function (props: { ))} - {departments.includes("DM") ? ( + {["DM", "WM"].find((d) => departments.includes(d)) ? ( <>

@@ -156,8 +158,8 @@ export default function (props: { value={JSON.stringify(isHiatus)} > - Inactivity - Hiatus + Activity Decrease + Inactivity/Hiatus diff --git a/functions/api/inactivity/validate.ts b/functions/api/inactivity/validate.ts index 34ce74b..4c3a489 100644 --- a/functions/api/inactivity/validate.ts +++ b/functions/api/inactivity/validate.ts @@ -32,8 +32,8 @@ export default function ( if (typeof hiatus !== "undefined" && typeof hiatus !== "boolean") return jsonError("Invalid notice", 400); - if (!selectedDepartments.includes("DM") && hiatus) - return jsonError("Only discord mods can file hiatuses", 400); + if (!["DM", "WM"].find((d) => selectedDepartments.includes(d)) && hiatus) + return jsonError("Only discord and wall mods can file hiatuses", 400); if ( isNaN(endDate.getFullYear()) ||