graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 08:43:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1871 from mei23/mei-apreq3

Browse source 
フォロー申請結果とフォロー申請解除の処理の修正
This commit is contained in:
syuilo 2018-07-08 19:30:56 +09:00 committed by GitHub
commit a7ff8678b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/remote/activitypub/kernel/accept/follow.ts
View file

@ -5,7 +5,7 @@ import accept from '../../../../services/following/requests/accept';
import { IFollow } from '../../type'; import { IFollow } from '../../type';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => { export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id; const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
if (!id.startsWith(config.url + '/')) { if (!id.startsWith(config.url + '/')) {
return null; return null;

2
src/remote/activitypub/kernel/reject/follow.ts
View file

@ -5,7 +5,7 @@ import reject from '../../../../services/following/requests/reject';
import { IFollow } from '../../type'; import { IFollow } from '../../type';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => { export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id; const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
if (!id.startsWith(config.url + '/')) { if (!id.startsWith(config.url + '/')) {
return null; return null;

2
src/remote/activitypub/kernel/undo/follow.ts
View file

@ -31,7 +31,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
}); });
if (req) { if (req) {
await cancelRequest(actor, followee); await cancelRequest(followee, actor);
} else { } else {
await unfollow(actor, followee); await unfollow(actor, followee);
} }