From 908271c995f7c21a5353039bbdc0569ed007b764 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 3 Mar 2025 01:24:40 -0500 Subject: ignore empty CW with creating / editing notes --- packages/backend/src/server/api/endpoints/notes/edit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/backend/src/server/api/endpoints/notes/edit.ts') diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts index cc2293c5d6..62dcb52806 100644 --- a/packages/backend/src/server/api/endpoints/notes/edit.ts +++ b/packages/backend/src/server/api/endpoints/notes/edit.ts @@ -209,7 +209,7 @@ export const paramDef = { format: 'misskey:id', }, }, - cw: { type: 'string', nullable: true, minLength: 1 }, + cw: { type: 'string', nullable: true }, localOnly: { type: 'boolean', default: false }, reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null }, noExtractMentions: { type: 'boolean', default: false }, -- cgit v1.2.3-freya From 1483f96c3fe66e30366b16480cdf7838a073de5b Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 3 Mar 2025 08:39:39 -0500 Subject: collapse empty `cw` to null --- packages/backend/src/server/api/endpoints/notes/create.ts | 2 +- packages/backend/src/server/api/endpoints/notes/edit.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/notes/edit.ts') diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index c404c30845..3dd90c3dca 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -400,7 +400,7 @@ export default class extends Endpoint { // eslint- text: ps.text ?? undefined, reply, renote, - cw: ps.cw, + cw: ps.cw || null, localOnly: ps.localOnly, reactionAcceptance: ps.reactionAcceptance, visibility: ps.visibility, diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts index 62dcb52806..7b13d3a4f4 100644 --- a/packages/backend/src/server/api/endpoints/notes/edit.ts +++ b/packages/backend/src/server/api/endpoints/notes/edit.ts @@ -454,7 +454,7 @@ export default class extends Endpoint { // eslint- text: ps.text ?? undefined, reply, renote, - cw: ps.cw, + cw: ps.cw || null, localOnly: ps.localOnly, reactionAcceptance: ps.reactionAcceptance, visibility: ps.visibility, -- cgit v1.2.3-freya From fffa6c97fedc38a22fd5d7af4ddba8c9fc0c4a80 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 1 Apr 2025 10:55:56 -0400 Subject: copy changes to notes/edit.ts --- packages/backend/src/core/NoteEditService.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/edit.ts | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/notes/edit.ts') diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 7722beefc9..e70ecf396d 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -240,11 +240,11 @@ export class NoteEditService implements OnApplicationShutdown { }); if (oldnote == null) { - throw new UnrecoverableError('edit failed: missing oldnote'); + throw new UnrecoverableError(`edit failed for ${editid}: missing oldnote`); } if (oldnote.userId !== user.id) { - throw new UnrecoverableError(`edit failed for ${oldnote.id}: user is not the note author`); + throw new UnrecoverableError(`edit failed for ${editid}: user is not the note author`); } // we never want to change the replyId, so fetch the original "parent" diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts index 7b13d3a4f4..2c01b26584 100644 --- a/packages/backend/src/server/api/endpoints/notes/edit.ts +++ b/packages/backend/src/server/api/endpoints/notes/edit.ts @@ -31,13 +31,11 @@ export const meta = { res: { type: 'object', - optional: false, - nullable: false, + optional: false, nullable: false, properties: { createdNote: { type: 'object', - optional: false, - nullable: false, + optional: false, nullable: false, ref: 'Note', }, }, -- cgit v1.2.3-freya