misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

update get-note-summary (both copies) to use same wording as SkMutedNote

Browse source
This commit is contained in:
Hazelnoot 2025-09-12 14:16:16 -04:00
parent 84ffc6361b
commit 97371bd893
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/misc/get-note-summary.ts
View file

@ -3,7 +3,6 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { appendContentWarning } from './append-content-warning.js';
import type { Packed } from './json-schema.js';
/**
@ -24,13 +23,16 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
// Append mandatory CW, if applicable
let cw = note.cw;
if (note.mandatoryCW) {
cw = appendContentWarning(cw, note.mandatoryCW);
cw = `Note is flagged: "${note.mandatoryCW}", ${cw}`;
}
if (note.user.mandatoryCW) {
cw = appendContentWarning(cw, note.user.mandatoryCW);
const username = note.user.host
? `@${note.user.username}@${note.user.host}`
: `@${note.user.username}`;
cw = `${username} is flagged: "${note.user.mandatoryCW}", ${cw}`;
}
if (note.user.instance?.mandatoryCW) {
cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
cw = `${note.user.host} is flagged: "${note.user.instance.mandatoryCW}", ${cw}`;
}
// 本文

12
packages/frontend/src/utility/get-note-summary.ts
View file

@ -4,7 +4,7 @@
*/
import * as Misskey from 'misskey-js';
import { appendContentWarning } from '@@/js/append-content-warning.js';
import { host } from '@@/js/config.js';
import { i18n } from '@/i18n.js';
/**
@ -31,13 +31,17 @@ export const getNoteSummary = (note: Misskey.entities.Note | null | undefined, w
let cw = note.cw;
if (withMandatoryCw) {
if (note.mandatoryCW) {
cw = appendContentWarning(cw, note.mandatoryCW);
cw = i18n.tsx.noteIsFlaggedAs({ cw: note.mandatoryCW }) + ', ' + cw;
}
if (note.user.mandatoryCW) {
cw = appendContentWarning(cw, note.user.mandatoryCW);
const username = note.user.host
? `@${note.user.username}@${note.user.host}`
: `@${note.user.username}`;
cw = i18n.tsx.userIsFlaggedAs({ name: username, cw: note.user.mandatoryCW }) + ', ' + cw;
}
if (note.user.instance?.mandatoryCW) {
cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
const instanceName = note.user.host ?? host;
cw = i18n.tsx.instanceIsFlaggedAs({ name: instanceName, cw: note.user.instance.mandatoryCW }) + ', ' + cw;
}
}