Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add separate limits for CW length

Browse source
This commit is contained in:
Hazelnoot 2024-10-26 10:04:23 -04:00
parent 10d3d9f382
commit 01e98c75ab
10 changed files with 91 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/config.ts
View file

@ -73,6 +73,8 @@ type Source = {
maxFileSize?: number;
maxNoteLength?: number;
maxCwLength?: number;
maxRemoteCwLength?: number;
maxRemoteNoteLength?: number;
maxAltTextLength?: number;
maxRemoteAltTextLength?: number;
@ -153,6 +155,8 @@ export type Config = {
maxFileSize: number;
maxNoteLength: number;
maxRemoteNoteLength: number;
maxCwLength: number;
maxRemoteCwLength: number;
maxAltTextLength: number;
maxRemoteAltTextLength: number;
clusterLimit: number | undefined;
@ -308,6 +312,8 @@ export function loadConfig(): Config {
maxFileSize: config.maxFileSize ?? 262144000,
maxNoteLength: config.maxNoteLength ?? 3000,
maxRemoteNoteLength: config.maxRemoteNoteLength ?? 100000,
maxCwLength: config.maxCwLength ?? 500,
maxRemoteCwLength: config.maxRemoteCwLength ?? 5000,
maxAltTextLength: config.maxAltTextLength ?? 20000,
maxRemoteAltTextLength: config.maxRemoteAltTextLength ?? 100000,
clusterLimit: config.clusterLimit,

8
packages/backend/src/core/NoteCreateService.ts
View file

@ -350,9 +350,13 @@ export class NoteCreateService implements OnApplicationShutdown {
data.text = null;
}
const maxCwLength = user.host == null
? this.config.maxCwLength
: this.config.maxRemoteCwLength;
if (data.cw) {
if (data.cw.length > maxTextLength) {
data.cw = data.cw.slice(0, maxTextLength);
if (data.cw.length > maxCwLength) {
data.cw = data.cw.slice(0, maxCwLength);
}
data.cw = data.cw.trim();
if (data.cw === '') {

8
packages/backend/src/core/NoteEditService.ts
View file

@ -380,9 +380,13 @@ export class NoteEditService implements OnApplicationShutdown {
data.text = null;
}
const maxCwLength = user.host == null
? this.config.maxCwLength
: this.config.maxRemoteCwLength;
if (data.cw) {
if (data.cw.length > maxTextLength) {
data.cw = data.cw.slice(0, maxTextLength);
if (data.cw.length > maxCwLength) {
data.cw = data.cw.slice(0, maxCwLength);
}
data.cw = data.cw.trim();
if (data.cw === '') {

12
packages/backend/src/server/api/endpoints/notes/create.ts
View file

@ -90,6 +90,12 @@ export const meta = {
id: '3ac74a84-8fd5-4bb0-870f-01804f82ce16',
},
maxCwLength: {
message: 'You tried posting a content warning which is too long.',
code: 'MAX_CW_LENGTH',
id: '7004c478-bda3-4b4f-acb2-4316398c9d52',
},
cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility: {
message: 'You cannot reply to a specified visibility note with extended visibility.',
code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
@ -250,10 +256,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private noteCreateService: NoteCreateService,
) {
super(meta, paramDef, async (ps, me) => {
const contentLength = (ps.text?.length ?? 0) + (ps.cw?.length ?? 0);
if (contentLength > this.config.maxNoteLength) {
if (ps.text && ps.text.length > this.config.maxNoteLength) {
throw new ApiError(meta.errors.maxLength);
}
if (ps.cw && ps.cw.length > this.config.maxCwLength) {
throw new ApiError(meta.errors.maxCwLength);
}
let visibleUsers: MiUser[] = [];
if (ps.visibleUserIds) {

14
packages/backend/src/server/api/endpoints/notes/edit.ts
View file

@ -86,6 +86,12 @@ export const meta = {
id: '3ac74a84-8fd5-4bb0-870f-01804f82ce16',
},
maxCwLength: {
message: 'You tried posting a content warning which is too long.',
code: 'MAX_CW_LENGTH',
id: '7004c478-bda3-4b4f-acb2-4316398c9d52',
},
cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility: {
message: 'You cannot reply to a specified visibility note with extended visibility.',
code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
@ -197,7 +203,7 @@ export const paramDef = {
format: 'misskey:id',
},
},
cw: { type: 'string', nullable: true, minLength: 1, maxLength: 500 },
cw: { type: 'string', nullable: true, minLength: 1 },
localOnly: { type: 'boolean', default: false },
reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
noExtractMentions: { type: 'boolean', default: false },
@ -297,10 +303,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private noteEditService: NoteEditService,
) {
super(meta, paramDef, async (ps, me) => {
const contentLength = (ps.text?.length ?? 0) + (ps.cw?.length ?? 0);
if (contentLength > this.config.maxNoteLength) {
if (ps.text && ps.text.length > this.config.maxNoteLength) {
throw new ApiError(meta.errors.maxLength);
}
if (ps.cw && ps.cw.length > this.config.maxCwLength) {
throw new ApiError(meta.errors.maxCwLength);
}
let visibleUsers: MiUser[] = [];
if (ps.visibleUserIds) {