mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 12:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Fix word mute character calculation (resolves #861) (!1018)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1018

Closes #861

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-05-12 10:36:17 +00:00
commit f8b2e272f1
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/RoleService.ts
View file

@ -93,7 +93,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
canUpdateBioMedia: true, canUpdateBioMedia: true,
pinLimit: 5, pinLimit: 5,
antennaLimit: 5, antennaLimit: 5,
wordMuteLimit: 200, wordMuteLimit: 1000,
webhookLimit: 3, webhookLimit: 3,
clipLimit: 10, clipLimit: 10,
noteEachClipsLimit: 200, noteEachClipsLimit: 200,

9
packages/backend/src/server/api/endpoints/i/update.ts
View file

@ -330,8 +330,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.chatScope !== undefined) updates.chatScope = ps.chatScope; if (ps.chatScope !== undefined) updates.chatScope = ps.chatScope;
function checkMuteWordCount(mutedWords: (string[] | string)[], limit: number) { function checkMuteWordCount(mutedWords: (string[] | string)[], limit: number) {
// TODO: ちゃんと数える const length = mutedWords.reduce((sum, word) => {
const length = JSON.stringify(mutedWords).length; const wordLength = Array.isArray(word)
? word.reduce((l, w) => l + w.length, 0)
: word.length;
return sum + wordLength;
}, 0);
if (length > limit) { if (length > limit) {
throw new ApiError(meta.errors.tooManyMutedWords); throw new ApiError(meta.errors.tooManyMutedWords);
} }