summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models/note.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-23 08:01:29 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-23 08:01:29 +0900
commit7e803ff9a9400e835d3db1369b7ced73e42fcab9 (patch)
tree4e8c9ddfad0db6cf89396fa204351d045491d26a /src/remote/activitypub/models/note.ts
parentImprove user operations (diff)
parentUpdate koa requirement from 2.6.1 to 2.6.2 (#3386) (diff)
downloadsharkey-7e803ff9a9400e835d3db1369b7ced73e42fcab9.tar.gz
sharkey-7e803ff9a9400e835d3db1369b7ced73e42fcab9.tar.bz2
sharkey-7e803ff9a9400e835d3db1369b7ced73e42fcab9.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/remote/activitypub/models/note.ts')
-rw-r--r--src/remote/activitypub/models/note.ts9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index 82d6d267c2..0f0f0bc2bf 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -96,6 +96,13 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
// リプライ
const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null;
+ // 引用
+ let quote: INote;
+
+ if (note._misskey_quote && typeof note._misskey_quote == 'string') {
+ quote = await resolveNote(note._misskey_quote).catch(() => null);
+ }
+
// テキストのパース
const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content);
@@ -112,7 +119,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
createdAt: new Date(note.published),
files: files,
reply,
- renote: undefined,
+ renote: quote,
cw: note.summary,
text: text,
viaMobile: false,