Don't allow no changes in edit command

Author: TheKodeToad

backend/src/common/general.ts

@@ -18,3 +18,6 @@ export function todo(): never {
 
 export type ValuesOf<T> = T[keyof T];
 export type Awaitable<T> = T | PromiseLike<T>;
+export type Nullable<T> = {
+	[TKey in keyof T]: T[TKey] | null;
+};

backend/src/plugin/logging/config/tags.ts

@@ -60,7 +60,8 @@ export const TagEditEvent = eventConfig(
 					name: "{{actor.tag}}",
 					iconURL: "{{actor.avatar}}",
 				},
-				description: "{{#nameChanged}}{{oldTag.name}} → {{/nameChanged}}{{newTag.name}}",
+				description:
+					"{{#nameChanged}}{{oldTag.name}} → {{/nameChanged}}{{newTag.name}}",
 				fields: [
 					{
 						name: "Old Content",

backend/src/plugin/logging/logger/tags.ts

@@ -1,3 +1,4 @@
+import type { Nullable } from "#common/general.ts";
 import { makeGuildView } from "#common/template/guild.ts";
 import { makeMemberUserView } from "#common/template/user.ts";
 import type { SquirrelDiscordContext } from "#discord/index.ts";
@@ -40,15 +41,8 @@ async function handleEdit(
 	guild: Guild,
 	actor: Member,
 	oldTag: Tag,
-	newTag: Tag,
+	changes: Nullable<Tag>,
 ): Promise<void> {
-	const nameChanged = oldTag.name !== newTag.name;
-	const contentChanged = oldTag.content !== newTag.content;
-
-	if (!(nameChanged || contentChanged)) {
-		return;
-	}
-
 	await logEvent(ctx, {
 		guild,
 		key: "tagEdit",
@@ -57,9 +51,12 @@ async function handleEdit(
 				guild: makeGuildView(guild),
 				actor: makeMemberUserView(actor),
 				oldTag: oldTag,
-				newTag: newTag,
-				nameChanged: nameChanged,
-				contentChanged: contentChanged,
+				newTag: {
+					name: changes.name ?? oldTag.name,
+					content: changes.content ?? oldTag.content,
+				},
+				nameChanged: changes.name !== null,
+				contentChanged: changes.content !== null,
 			};
 		},
 	});

backend/src/plugin/tags/command/tagEdit.ts

@@ -1,4 +1,5 @@
 import { escapeMarkdown } from "#common/discord/markdown.ts";
+import type { Nullable } from "#common/general.ts";
 import { moduleLogger } from "#common/logger/index.ts";
 import { OptionType } from "#plugin/core/public/command.ts";
 import { defineCommand } from "#plugin/core/public/extensionPoints.ts";
@@ -11,6 +12,7 @@ import {
 import { autocompleteTags } from "#plugin/tags/helper/autocompletion.ts";
 import { tagsConfigStore } from "#plugin/tags/index.ts";
 import { onTagEdited } from "#plugin/tags/public/extensionPoints.ts";
+import type { Tag } from "#plugin/tags/public/tag.ts";
 import { updateTag } from "#plugin/tags/storage/tags.ts";
 
 const logger = moduleLogger();
@@ -52,14 +54,16 @@ export default defineCommand({
 			(permissions) => permissions.tagEdit,
 		),
 	async run(ctx, args) {
+		const changes = {
+			name: args.newName,
+			content: args.content,
+		};
+
 		const oldTag = await updateTag(
 			ctx.squirrelCtx.db,
 			ctx.guild.id,
 			args.name,
-			{
-				name: args.newName ?? undefined,
-				content: args.content ?? undefined,
-			},
+			changes,
 		);
 
 		if (oldTag === null) {
@@ -69,13 +73,14 @@ export default defineCommand({
 			return;
 		}
 
-		const newTag = {
-			name: args.newName ?? oldTag.name,
-			content: args.content ?? oldTag.content,
-		};
+		// check after we know the tag exists
+		if (args.newName === null && args.content === null) {
+			await ctx.respond(`${icons.error} No changes specified!`);
+			return;
+		}
 
 		onTagEdited
-			.fire(ctx.squirrelCtx, ctx.guild, ctx.member, oldTag, newTag)
+			.fire(ctx.squirrelCtx, ctx.guild, ctx.member, oldTag, changes)
 			.catch((error) => logger.error?.("Error in onTagDeleted", error));
 
 		await ctx.respond(

backend/src/plugin/tags/public/extensionPoints.ts

@@ -1,3 +1,4 @@
+import type { Nullable } from "#common/general.ts";
 import type { SquirrelDiscordContext } from "#discord/index.ts";
 import { makeEventExtensionPoint } from "#extensionPoint.ts";
 import type { Tag } from "#plugin/tags/public/tag.ts";
@@ -14,7 +15,7 @@ type BinaryEvent = [
 	guild: Guild,
 	actor: Member,
 	oldTag: Tag,
-	newTag: Tag,
+	changes: Nullable<Tag>,
 ];
 
 export const onTagCreated = makeEventExtensionPoint<UnaryEvent>();

backend/src/plugin/tags/storage/tags.ts

@@ -1,3 +1,4 @@
+import type { Nullable } from "#common/general.ts";
 import type { Tag } from "#plugin/tags/public/tag.ts";
 import { dbParse } from "#storage/index.ts";
 import type { Pool } from "pg";
@@ -77,7 +78,7 @@ export async function updateTag(
 	db: Pool,
 	guildID: string,
 	name: string,
-	tag: Partial<Tag>,
+	tag: Nullable<Tag>,
 ): Promise<Tag | null> {
 	const result = await db.query(
 		`