feat: complete restrict command

packages/core/src/actions/IModAction.ts

@@ -1,22 +1,6 @@
 import type { Selectable } from 'kysely';
 import type { Case, RestrictCaseData, WarnCaseData } from '../db';
 
-/**
- * Represents additional data related to the duration of a case.
- *
- * This is optional, either both properties or neither must be passed in, and is meant to be "mixed-in" to other
- * case data interfaces that support timed actions.
- */
-export type OptionalCaseCreateDurationData =
-	| {
-			duration: null;
-			expiresAt: null;
-	  }
-	| {
-			duration: number;
-			expiresAt: Date;
-	  };
-
 /**
  * Base data required to create a case.
  */
@@ -31,11 +15,11 @@ export interface BaseCaseCreateData {
  * Data required for restrict cases.
  */
 // We use a type intersection here since `OptionalCaseCreateDurationData` is a union.
-export type RestrictCaseCreateData = BaseCaseCreateData &
-	OptionalCaseCreateDurationData & {
-		clean: boolean;
-		roleId: string;
-	};
+export interface RestrictCaseCreateData extends BaseCaseCreateData {
+	clean: boolean;
+	expiresAt: Date | null;
+	roleId: string;
+}
 
 /**
  * Structure responsible for preparation, execution, and notification of a mod action.

packages/core/src/actions/RestrictModAction.ts

@@ -47,13 +47,12 @@ export class RestrictModAction implements IRestrictModAction {
 					id: cs!.id,
 					roleId: data.roleId,
 					clean: data.clean,
-					duration: data.duration,
 					expiresAt: data.expiresAt,
 				})
 				.returningAll()
 				.executeTakeFirst();
 
-			if (data.duration) {
+			if (data.expiresAt) {
 				await transaction
 					.insertInto('Task')
 					.values({

packages/core/src/db.ts

@@ -30,7 +30,6 @@ export type TaskType = (typeof TaskType)[keyof typeof TaskType];
 export type BanCaseData = {
 	id: number;
 	deleteMessageDays: number | null;
-	duration: number | null;
 	expiresAt: Timestamp | null;
 };
 export type Case = {
@@ -64,7 +63,6 @@ export type RestrictCaseData = {
 	id: number;
 	roleId: string;
 	clean: Generated<boolean>;
-	duration: number | null;
 	expiresAt: Timestamp | null;
 };
 export type Task = {

packages/core/src/index.ts

@@ -28,6 +28,7 @@ export * from './userActionValidators/UserActionValidatorFactory.js';
 
 export * from './util/encode.js';
 export * from './util/factoryFrom.js';
+export * from './util/parseRelativeTime.js';
 export * from './util/PermissionsBitField.js';
 export * from './util/promiseAllObject.js';
 export * from './util/sqlJson.js';

prisma/schema.prisma

@@ -87,7 +87,6 @@ model RestrictCaseData {
   roleId    String
   clean     Boolean    @default(false)
   undoRoles UndoRestrictRole[]
-  duration  Int?
   expiresAt DateTime?  @db.Timestamptz(6)
 }
 
@@ -101,7 +100,6 @@ model BanCaseData {
   id                Int       @id
   case              Case      @relation(fields: [id], references: [id], onDelete: Cascade)
   deleteMessageDays Int?
-  duration          Int?
   expiresAt         DateTime? @db.Timestamptz(6)
 }
 

services/interactions/src/handlers/punishments.ts

@@ -1,10 +1,17 @@
 import {
 	INJECTION_TOKENS,
 	UserActionValidatorFactory,
+	parseRelativeTime,
 	type IRestrictModAction,
 	type RestrictCaseCreateData,
 } from '@automoderator/core';
-import { API, MessageFlags } from '@discordjs/core';
+import {
+	API,
+	ApplicationCommandOptionType,
+	ApplicationCommandType,
+	MessageFlags,
+	PermissionFlagsBits,
+} from '@discordjs/core';
 import { inject, injectable } from 'inversify';
 import { InteractionsService, type CommandHandler, type Handler } from '../interactions.js';
 
@@ -19,7 +26,48 @@ export default class Punishments implements Handler {
 
 	public register() {
 		this.interactions.register({
-			// TODO: Args
+			interactions: [
+				{
+					name: 'restrict',
+					description: 'Restrict a user (assign a special, manually configured role to them)',
+					type: ApplicationCommandType.ChatInput,
+					dm_permission: false,
+					default_member_permissions: String(PermissionFlagsBits.ModerateMembers),
+					options: [
+						{
+							name: 'target',
+							description: 'The user to restrict',
+							type: ApplicationCommandOptionType.User,
+							required: true,
+						},
+						{
+							name: 'role',
+							description: 'The role to assign to the user',
+							type: ApplicationCommandOptionType.Role,
+							required: true,
+						},
+						{
+							name: 'reason',
+							description: 'The reason for restricting the user',
+							type: ApplicationCommandOptionType.String,
+							required: false,
+						},
+						{
+							name: 'clean',
+							description: "Whether or not to remove the other user's roles for the duration of this action",
+							type: ApplicationCommandOptionType.Boolean,
+							required: false,
+						},
+						{
+							name: 'duration',
+							description: 'How long this action should last for',
+							type: ApplicationCommandOptionType.String,
+							required: false,
+							autocomplete: true,
+						},
+					],
+				},
+			],
 			commands: [['restrict:none:none', this.handleRestrict]],
 		});
 	}
@@ -41,16 +89,28 @@ export default class Punishments implements Handler {
 			});
 		}
 
+		let duration = null;
+		const durationStr = options.getString('duration');
+		if (durationStr) {
+			const parsed = parseRelativeTime(durationStr);
+			if (!parsed.ok) {
+				return this.api.interactions.reply(interaction.id, interaction.token, {
+					content: `Failed to parse provided duration: ${parsed.error}`,
+					flags: MessageFlags.Ephemeral,
+				});
+			}
+
+			duration = parsed.value;
+		}
+
 		const data: RestrictCaseCreateData = {
 			guildId: interaction.guild_id!,
 			modId: interaction.member!.user.id,
 			reason: options.getString('reason'),
 			targetId: target.id,
 			clean: options.getBoolean('clean', true),
-			roleId: options.getRole('role')!.id,
-			// TODO: Support duration
-			duration: null,
-			expiresAt: null,
+			roleId: options.getRole('role', true).id,
+			expiresAt: duration ? new Date(Date.now() + duration) : null,
 		};
 
 		const cs = await this.action.execute(data);

services/interactions/src/interactions.ts

@@ -31,7 +31,7 @@ export type CommandHandler = (
 
 export type ComponentHandler = (interaction: APIMessageComponentInteraction, args: string[]) => Promise<void>;
 
-// [command]:autocompleteName
+// [command]:argName
 export type AutocompleteIdentifier = `${CommandIdentifier}:${string}`;
 
 export type AutocompleteHandler = (
@@ -48,7 +48,7 @@ export interface RegisterOptions {
 	autocomplete?: [AutocompleteIdentifier, AutocompleteHandler][];
 	commands?: [CommandIdentifier, CommandHandler][];
 	components?: [string, ComponentHandler][];
-	interaction?: RESTPostAPIApplicationCommandsJSONBody;
+	interactions?: RESTPostAPIApplicationCommandsJSONBody[];
 	modals?: [string, ModalHandler][];
 }
 
@@ -170,8 +170,8 @@ export class InteractionsService {
 	}
 
 	public register(options: RegisterOptions): void {
-		if (options.interaction) {
-			this.interactions.push(options.interaction);
+		if (options.interactions) {
+			this.interactions.push(...options.interactions);
 		}
 
 		if (options.commands?.length) {