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/blocking | |
| parent | Re-fix path (diff) | |
| download | sharkey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.gz sharkey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.bz2 sharkey-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/blocking')
| -rw-r--r-- | src/services/blocking/create.ts | 10 | ||||
| -rw-r--r-- | src/services/blocking/delete.ts | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index 2998cdd78c..f82eeae2b4 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -2,7 +2,7 @@ import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../ import Following from '../../models/following'; import FollowRequest from '../../models/follow-request'; import { publishMainStream } from '../../stream'; -import pack from '../../remote/activitypub/renderer'; +import { renderActivity } from '../../remote/activitypub/renderer'; import renderFollow from '../../remote/activitypub/renderer/follow'; import renderUndo from '../../remote/activitypub/renderer/undo'; import renderBlock from '../../remote/activitypub/renderer/block'; @@ -27,7 +27,7 @@ export default async function(blocker: IUser, blockee: IUser) { }); if (isLocalUser(blocker) && isRemoteUser(blockee)) { - const content = pack(renderBlock(blocker, blockee)); + const content = renderActivity(renderBlock(blocker, blockee)); deliver(blocker, content, blockee.inbox); } } @@ -67,13 +67,13 @@ async function cancelRequest(follower: IUser, followee: IUser) { // リモートにフォローリクエストをしていたらUndoFollow送信 if (isLocalUser(follower) && isRemoteUser(followee)) { - const content = pack(renderUndo(renderFollow(follower, followee), follower)); + const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower, content, followee.inbox); } // リモートからフォローリクエストを受けていたらReject送信 if (isRemoteUser(follower) && isLocalUser(followee)) { - const content = pack(renderReject(renderFollow(follower, followee, request.requestId), followee)); + const content = renderActivity(renderReject(renderFollow(follower, followee, request.requestId), followee)); deliver(followee, content, follower.inbox); } } @@ -119,7 +119,7 @@ async function unFollow(follower: IUser, followee: IUser) { // リモートにフォローをしていたらUndoFollow送信 if (isLocalUser(follower) && isRemoteUser(followee)) { - const content = pack(renderUndo(renderFollow(follower, followee), follower)); + const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower, content, followee.inbox); } } diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts index bc331d491a..113b4ae458 100644 --- a/src/services/blocking/delete.ts +++ b/src/services/blocking/delete.ts @@ -1,6 +1,6 @@ import { isLocalUser, isRemoteUser, IUser } from '../../models/user'; import Blocking from '../../models/blocking'; -import pack from '../../remote/activitypub/renderer'; +import { renderActivity } from '../../remote/activitypub/renderer'; import renderBlock from '../../remote/activitypub/renderer/block'; import renderUndo from '../../remote/activitypub/renderer/undo'; import { deliver } from '../../queue'; @@ -22,7 +22,7 @@ export default async function(blocker: IUser, blockee: IUser) { // deliver if remote bloking if (isLocalUser(blocker) && isRemoteUser(blockee)) { - const content = pack(renderUndo(renderBlock(blocker, blockee), blocker)); + const content = renderActivity(renderUndo(renderBlock(blocker, blockee), blocker)); deliver(blocker, content, blockee.inbox); } } |