graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-13 06:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

AP CW (#3448)

Browse source
This commit is contained in:
MeiMei 2018-12-01 07:15:10 +09:00 committed by syuilo
parent 3db414add4
commit f2b1cf92e1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/remote/activitypub/models/note.ts
View file

@ -103,6 +103,8 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
quote = await resolveNote(note._misskey_quote).catch(() => null); quote = await resolveNote(note._misskey_quote).catch(() => null);
} }
const cw = note.summary === '' ? null : note.summary;
// テキストのパース // テキストのパース
const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content); const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content);
@ -120,7 +122,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
files: files, files: files,
reply, reply,
renote: quote, renote: quote,
cw: note.summary, cw: cw,
text: text, text: text,
viaMobile: false, viaMobile: false,
localOnly: false, localOnly: false,

4
src/remote/activitypub/renderer/note.ts
View file

@ -106,6 +106,8 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
text += `\n\nRE: ${url}`; text += `\n\nRE: ${url}`;
} }
const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;
const content = toHtml(Object.assign({}, note, { text })); const content = toHtml(Object.assign({}, note, { text }));
const emojis = await getEmojis(note.emojis); const emojis = await getEmojis(note.emojis);
@ -121,7 +123,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
id: `${config.url}/notes/${note._id}`, id: `${config.url}/notes/${note._id}`,
type: 'Note', type: 'Note',
attributedTo, attributedTo,
summary: note.cw, summary,
content, content,
_misskey_content: text, _misskey_content: text,
_misskey_quote: quote, _misskey_quote: quote,