misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use id in uri instead of username

Browse source
This commit is contained in:
syuilo 2018-04-08 15:15:22 +09:00
parent 1fced8a59b
commit e63f884bc6
14 changed files with 52 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/remote/activitypub/act/follow.ts
View file

@ -1,25 +1,23 @@
import parseAcct from '../../../acct/parse';
import User, { IRemoteUser } from '../../../models/user';
import config from '../../../config';
import follow from '../../../services/following/create';
import { IFollow } from '../type';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const prefix = config.url + '/@';
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
if (!id.startsWith(prefix)) {
if (!id.startsWith(config.url + '/')) {
return null;
}
const { username, host } = parseAcct(id.slice(prefix.length));
if (host !== null) {
throw new Error();
const followee = await User.findOne({ _id: id.split('/').pop() });
if (followee === null) {
throw new Error('followee not found');
}
const followee = await User.findOne({ username, host });
if (followee === null) {
throw new Error();
if (followee.host != null) {
throw new Error('フォローしようとしているユーザーはローカルユーザーではありません');
}
await follow(actor, followee, activity);