diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-01-28 13:08:56 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-16 19:20:41 -0500 |
| commit | b256ac32d0c3ec3a3bd61589f1d70ee0dd6afa1f (patch) | |
| tree | 52c12d708227b4e4b2f996ddc4b9ef0a27262453 | |
| parent | record ModLog entry when setting a user's content warning (diff) | |
| download | sharkey-b256ac32d0c3ec3a3bd61589f1d70ee0dd6afa1f.tar.gz sharkey-b256ac32d0c3ec3a3bd61589f1d70ee0dd6afa1f.tar.bz2 sharkey-b256ac32d0c3ec3a3bd61589f1d70ee0dd6afa1f.zip | |
don't duplicate mandatory CWs
| -rw-r--r-- | packages/backend/src/core/NoteCreateService.ts | 6 | ||||
| -rw-r--r-- | 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}`; } } |