From b256ac32d0c3ec3a3bd61589f1d70ee0dd6afa1f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 28 Jan 2025 13:08:56 -0500 Subject: [PATCH] don't duplicate mandatory CWs --- packages/backend/src/core/NoteCreateService.ts | 6 +++--- packages/backend/src/core/NoteEditService.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index ecf711e011..10706f366d 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -371,10 +371,10 @@ export class NoteCreateService implements OnApplicationShutdown { // Apply mandatory CW, if applicable if (user.mandatoryCW) { - if (data.cw) { - data.cw += `, ${user.mandatoryCW}`; - } else { + if (!data.cw) { data.cw = user.mandatoryCW; + } else if (!data.cw.includes(user.mandatoryCW)) { + data.cw += `, ${user.mandatoryCW}`; } } diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 1f947aaffb..91d81c2965 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -399,10 +399,10 @@ export class NoteEditService implements OnApplicationShutdown { // Apply mandatory CW, if applicable if (user.mandatoryCW) { - if (data.cw) { - data.cw += `, ${user.mandatoryCW}`; - } else { + if (!data.cw) { data.cw = user.mandatoryCW; + } else if (!data.cw.includes(user.mandatoryCW)) { + data.cw += `, ${user.mandatoryCW}`; } }