From d64dc458999afdc0bfd5f662a583bd1a0f6eebb3 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 29 Oct 2018 20:32:42 +0900
Subject: User blocking (Following part) (#3035)

* block wip

* UndoBlock

* UnBlock

* wip

* follow

* UI

* fix
---
 src/remote/activitypub/kernel/undo/block.ts | 34 +++++++++++++++++++++++++++++
 src/remote/activitypub/kernel/undo/index.ts |  6 ++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/remote/activitypub/kernel/undo/block.ts

(limited to 'src/remote/activitypub/kernel/undo')

diff --git a/src/remote/activitypub/kernel/undo/block.ts b/src/remote/activitypub/kernel/undo/block.ts
new file mode 100644
index 0000000000..b735f114d0
--- /dev/null
+++ b/src/remote/activitypub/kernel/undo/block.ts
@@ -0,0 +1,34 @@
+import * as mongo from 'mongodb';
+import User, { IRemoteUser } from '../../../../models/user';
+import config from '../../../../config';
+import * as debug from 'debug';
+import { IBlock } from '../../type';
+import unblock from '../../../../services/blocking/delete';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+
+	const uri = activity.id || activity;
+
+	log(`UnBlock: ${uri}`);
+
+	if (!id.startsWith(config.url + '/')) {
+		return null;
+	}
+
+	const blockee = await User.findOne({
+		_id: new mongo.ObjectID(id.split('/').pop())
+	});
+
+	if (blockee === null) {
+		throw new Error('blockee not found');
+	}
+
+	if (blockee.host != null) {
+		throw new Error('ブロック解除しようとしているユーザーはローカルユーザーではありません');
+	}
+
+	unblock(actor, blockee);
+};
diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts
index 5d9535403b..ba56dd6328 100644
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -1,8 +1,9 @@
 import * as debug from 'debug';
 
 import { IRemoteUser } from '../../../../models/user';
-import { IUndo, IFollow } from '../../type';
+import { IUndo, IFollow, IBlock } from '../../type';
 import unfollow from './follow';
+import unblock from './block';
 import Resolver from '../../resolver';
 
 const log = debug('misskey:activitypub');
@@ -31,6 +32,9 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 		case 'Follow':
 			unfollow(actor, object as IFollow);
 			break;
+		case 'Block':
+			unblock(actor, object as IBlock);
+			break;
 	}
 
 	return null;
-- 
cgit v1.2.3-freya