Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

6
src/remote/activitypub/renderer/accept.ts
View file

@ -1,4 +1,8 @@
export default (object: any) => ({
import config from '../../../config';
import { ILocalUser } from '../../../models/user';
export default (object: any, user: ILocalUser) => ({
type: 'Accept',
actor: `${config.url}/users/${user._id}`,
object
});

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;
};

6
src/remote/activitypub/renderer/reject.ts
View file

@ -1,4 +1,8 @@
export default (object: any) => ({
import config from '../../../config';
import { ILocalUser } from '../../../models/user';
export default (object: any, user: ILocalUser) => ({
type: 'Reject',
actor: `${config.url}/users/${user._id}`,
object
});