diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-13 14:39:08 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-13 14:39:08 +0900 |
| commit | 17f4dd69a38097d92d60829e37cacdbb27b61f94 (patch) | |
| tree | 56c590091310f4e8d65cfad05114cebee8096cdf /src/services/note | |
| parent | Merge pull request #1460 from syuilo/koa (diff) | |
| download | misskey-17f4dd69a38097d92d60829e37cacdbb27b61f94.tar.gz misskey-17f4dd69a38097d92d60829e37cacdbb27b61f94.tar.bz2 misskey-17f4dd69a38097d92d60829e37cacdbb27b61f94.zip | |
Refactor
Diffstat (limited to 'src/services/note')
| -rw-r--r-- | src/services/note/create.ts | 5 | ||||
| -rw-r--r-- | src/services/note/reaction/create.ts | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 8f0b84bccd..b238cd5607 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -6,7 +6,7 @@ import { deliver } from '../../queue'; import renderNote from '../../remote/activitypub/renderer/note'; import renderCreate from '../../remote/activitypub/renderer/create'; import renderAnnounce from '../../remote/activitypub/renderer/announce'; -import context from '../../remote/activitypub/renderer/context'; +import packAp from '../../remote/activitypub/renderer'; import { IDriveFile } from '../../models/drive-file'; import notify from '../../publishers/notify'; import NoteWatching from '../../models/note-watching'; @@ -132,8 +132,7 @@ export default async (user: IUser, data: { const content = data.renote && data.text == null ? renderAnnounce(data.renote.uri ? data.renote.uri : await renderNote(data.renote)) : renderCreate(await renderNote(note)); - content['@context'] = context; - return content; + return packAp(content); }; // 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送 diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 88158034f3..69a14248da 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -8,7 +8,7 @@ import NoteWatching from '../../../models/note-watching'; import watch from '../watch'; import renderLike from '../../../remote/activitypub/renderer/like'; import { deliver } from '../../../queue'; -import context from '../../../remote/activitypub/renderer/context'; +import pack from '../../../remote/activitypub/renderer'; export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => { // Myself @@ -85,9 +85,7 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise //#region 配信 // リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送 if (isLocalUser(user) && isRemoteUser(note._user)) { - const content = renderLike(user, note); - content['@context'] = context; - + const content = pack(renderLike(user, note)); deliver(user, content, note._user.inbox).save(); } //#endregion |