sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix following from Preroma does not complete (#2905)

Browse Source 
* In Follow Accept/Reject, send previous received id

* In Follow Accept/Reject, send Activity.actor
This commit is contained in:
MeiMei
2018-10-15 16:51:23 +09:00
committed by syuilo
parent 2ad2779096
commit 49dbd7f9d2
9 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/remote/activitypub/renderer/follow.ts
View File

@@ -1,8 +1,14 @@
import config from '../../../config';
import { IUser, isLocalUser } from '../../../models/user';
export default (follower: IUser, followee: IUser) => ({
type: 'Follow',
actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
});
export default (follower: IUser, followee: IUser, requestId?: string) => {
const follow = {
type: 'Follow',
actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
} as any;
if (requestId) follow.id = requestId;
return follow;
};