diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2024-10-07 23:20:14 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-10-07 23:20:14 +0000 |
| commit | a90b4d487a7dd7bbd689701cbd07ff77868a5c14 (patch) | |
| tree | 26a352f069257516b9c0421cd309071871e68488 /packages/backend/src/server/api/endpoints/notes | |
| parent | merge: Prevent deletion or suspension of system accounts (resolves #625) (!666) (diff) | |
| parent | remove numeric separators (diff) | |
| download | sharkey-a90b4d487a7dd7bbd689701cbd07ff77868a5c14.tar.gz sharkey-a90b4d487a7dd7bbd689701cbd07ff77868a5c14.tar.bz2 sharkey-a90b4d487a7dd7bbd689701cbd07ff77868a5c14.zip | |
merge: Increase character hard limits (resolves #686 and #696) (!647)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647
Closes #686 and #696
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/create.ts | 3 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/edit.ts | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 626f03b758..a4c2e28129 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -252,7 +252,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- private noteCreateService: NoteCreateService, ) { super(meta, paramDef, async (ps, me) => { - if (ps.text && (ps.text.length > this.config.maxNoteLength)) { + const contentLength = (ps.text?.length ?? 0) + (ps.cw?.length ?? 0); + if (contentLength > this.config.maxNoteLength) { throw new ApiError(meta.errors.maxLength); } diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts index 835cbc14fa..b9be145caf 100644 --- a/packages/backend/src/server/api/endpoints/notes/edit.ts +++ b/packages/backend/src/server/api/endpoints/notes/edit.ts @@ -297,9 +297,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- private noteEditService: NoteEditService, ) { super(meta, paramDef, async (ps, me) => { - if (ps.text && (ps.text.length > this.config.maxNoteLength)) { + const contentLength = (ps.text?.length ?? 0) + (ps.cw?.length ?? 0); + if (contentLength > this.config.maxNoteLength) { throw new ApiError(meta.errors.maxLength); } + let visibleUsers: MiUser[] = []; if (ps.visibleUserIds) { visibleUsers = await this.usersRepository.findBy({ |