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/requests | |
| 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/requests')
| -rw-r--r-- | src/services/following/requests/accept.ts | 4 | ||||
| -rw-r--r-- | src/services/following/requests/cancel.ts | 4 | ||||
| -rw-r--r-- | src/services/following/requests/create.ts | 4 | ||||
| -rw-r--r-- | src/services/following/requests/reject.ts | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index 32fc874f47..dce2838405 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -1,6 +1,6 @@ import User, { IUser, isRemoteUser, ILocalUser, pack as packUser, isLocalUser } from '../../../models/user'; import FollowRequest from '../../../models/follow-request'; -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 { deliver } from '../../../queue'; @@ -42,7 +42,7 @@ export default async function(followee: IUser, follower: IUser) { followerId: follower._id }); - const content = pack(renderAccept(renderFollow(follower, followee, request.requestId), followee as ILocalUser)); + const content = renderActivity(renderAccept(renderFollow(follower, followee, request.requestId), followee as ILocalUser)); deliver(followee as ILocalUser, content, follower.inbox); } diff --git a/src/services/following/requests/cancel.ts b/src/services/following/requests/cancel.ts index def02d59d9..731e25f9ca 100644 --- a/src/services/following/requests/cancel.ts +++ b/src/services/following/requests/cancel.ts @@ -1,6 +1,6 @@ import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from '../../../models/user'; import FollowRequest from '../../../models/follow-request'; -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 { deliver } from '../../../queue'; @@ -8,7 +8,7 @@ import { publishMainStream } from '../../../stream'; export default async function(followee: IUser, follower: IUser) { if (isRemoteUser(followee)) { - const content = pack(renderUndo(renderFollow(follower, followee), follower)); + const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower as ILocalUser, content, followee.inbox); } diff --git a/src/services/following/requests/create.ts b/src/services/following/requests/create.ts index eb57191531..6507cadb77 100644 --- a/src/services/following/requests/create.ts +++ b/src/services/following/requests/create.ts @@ -1,7 +1,7 @@ import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../../models/user'; 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 { deliver } from '../../../queue'; import FollowRequest from '../../../models/follow-request'; @@ -61,7 +61,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri } if (isLocalUser(follower) && isRemoteUser(followee)) { - const content = pack(renderFollow(follower, followee)); + const content = renderActivity(renderFollow(follower, followee)); deliver(follower, content, followee.inbox); } } diff --git a/src/services/following/requests/reject.ts b/src/services/following/requests/reject.ts index 694663f231..0f121a18f7 100644 --- a/src/services/following/requests/reject.ts +++ b/src/services/following/requests/reject.ts @@ -1,6 +1,6 @@ import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from '../../../models/user'; import FollowRequest from '../../../models/follow-request'; -import pack from '../../../remote/activitypub/renderer'; +import { renderActivity } from '../../../remote/activitypub/renderer'; import renderFollow from '../../../remote/activitypub/renderer/follow'; import renderReject from '../../../remote/activitypub/renderer/reject'; import { deliver } from '../../../queue'; @@ -13,7 +13,7 @@ export default async function(followee: IUser, follower: IUser) { followerId: follower._id }); - const content = pack(renderReject(renderFollow(follower, followee, request.requestId), followee as ILocalUser)); + const content = renderActivity(renderReject(renderFollow(follower, followee, request.requestId), followee as ILocalUser)); deliver(followee as ILocalUser, content, follower.inbox); } |