Merge branch 'develop'

1 files changed, 8 insertions, 10 deletions

diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts
index 099fa14b37..2c05cb7f3f 100644
--- a/src/services/blocking/delete.ts
+++ b/src/services/blocking/delete.ts
@@ -1,17 +1,17 @@
-import { isLocalUser, isRemoteUser, IUser } from '../../models/user';
-import Blocking from '../../models/blocking';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import renderBlock from '../../remote/activitypub/renderer/block';
 import renderUndo from '../../remote/activitypub/renderer/undo';
 import { deliver } from '../../queue';
 import Logger from '../logger';
+import { User } from '../../models/entities/user';
+import { Blockings, Users } from '../../models';
 
 const logger = new Logger('blocking/delete');
 
-export default async function(blocker: IUser, blockee: IUser) {
-	const blocking = await Blocking.findOne({
-		blockerId: blocker._id,
-		blockeeId: blockee._id
+export default async function(blocker: User, blockee: User) {
+	const blocking = await Blockings.findOne({
+		blockerId: blocker.id,
+		blockeeId: blockee.id
 	});
 
 	if (blocking == null) {
@@ -19,12 +19,10 @@ export default async function(blocker: IUser, blockee: IUser) {
 		return;
 	}
 
-	Blocking.remove({
-		_id: blocking._id
-	});
+	Blockings.delete(blocking.id);
 
 	// deliver if remote bloking
-	if (isLocalUser(blocker) && isRemoteUser(blockee)) {
+	if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) {
 		const content = renderActivity(renderUndo(renderBlock(blocker, blockee), blocker));
 		deliver(blocker, content, blockee.inbox);
 	}