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

Fix bug

Browse source
This commit is contained in:
syuilo 2018-04-18 14:09:55 +09:00
parent 3519cb208e
commit 233e1eeeb2
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/remote/activitypub/kernel/follow.ts
View file

@ -1,3 +1,4 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../models/user'; import User, { IRemoteUser } from '../../../models/user';
import config from '../../../config'; import config from '../../../config';
import follow from '../../../services/following/create'; import follow from '../../../services/following/create';
@ -10,7 +11,9 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null; return null;
} }
const followee = await User.findOne({ _id: id.split('/').pop() }); const followee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
if (followee === null) { if (followee === null) {
throw new Error('followee not found'); throw new Error('followee not found');

3
src/remote/activitypub/kernel/like.ts
View file

@ -1,3 +1,4 @@
import * as mongo from 'mongodb';
import Note from '../../../models/note'; import Note from '../../../models/note';
import { IRemoteUser } from '../../../models/user'; import { IRemoteUser } from '../../../models/user';
import { ILike } from '../type'; import { ILike } from '../type';
@ -9,7 +10,7 @@ export default async (actor: IRemoteUser, activity: ILike) => {
// Transform: // Transform:
// https://misskey.ex/notes/xxxx to // https://misskey.ex/notes/xxxx to
// xxxx // xxxx
const noteId = id.split('/').pop(); const noteId = new mongo.ObjectID(id.split('/').pop());
const note = await Note.findOne({ _id: noteId }); const note = await Note.findOne({ _id: noteId });
if (note === null) { if (note === null) {

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

@ -1,3 +1,4 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user'; import User, { IRemoteUser } from '../../../../models/user';
import config from '../../../../config'; import config from '../../../../config';
import unfollow from '../../../../services/following/delete'; import unfollow from '../../../../services/following/delete';
@ -10,7 +11,9 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null; return null;
} }
const followee = await User.findOne({ _id: id.split('/').pop() }); const followee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
if (followee === null) { if (followee === null) {
throw new Error('followee not found'); throw new Error('followee not found');