diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-01-31 02:29:36 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-01-31 02:29:35 +0900 |
| commit | b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a (patch) | |
| tree | f375d88039a6bfeb9a29f8a6422f0e45cb936c57 /src/services/following/create.ts | |
| parent | Re-fix path (diff) | |
| download | misskey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.gz misskey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.bz2 misskey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.zip | |
Do not import as pack from AP renderer (#4048)
* Do not import as pack from AP renderer
* rename
Diffstat (limited to 'src/services/following/create.ts')
| -rw-r--r-- | src/services/following/create.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/services/following/create.ts b/src/services/following/create.ts index fac53c40af..9c0984b6d7 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -3,7 +3,7 @@ import Following from '../../models/following'; import Blocking from '../../models/blocking'; import { publishMainStream } from '../../stream'; import notify from '../../notify'; -import pack from '../../remote/activitypub/renderer'; +import { renderActivity } from '../../remote/activitypub/renderer'; import renderFollow from '../../remote/activitypub/renderer/follow'; import renderAccept from '../../remote/activitypub/renderer/accept'; import renderReject from '../../remote/activitypub/renderer/reject'; @@ -26,7 +26,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri if (isRemoteUser(follower) && isLocalUser(followee) && blocked) { // リモートフォローを受けてブロックしていた場合は、エラーにするのではなくRejectを送り返しておしまい。 - const content = pack(renderReject(renderFollow(follower, followee, requestId), followee)); + const content = renderActivity(renderReject(renderFollow(follower, followee, requestId), followee)); deliver(followee , content, follower.inbox); return; } else if (isRemoteUser(follower) && isLocalUser(followee) && blocking) { @@ -115,7 +115,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri } if (isRemoteUser(follower) && isLocalUser(followee)) { - const content = pack(renderAccept(renderFollow(follower, followee, requestId), followee)); + const content = renderActivity(renderAccept(renderFollow(follower, followee, requestId), followee)); deliver(followee, content, follower.inbox); } } |