Merge branch 'develop'

1 files changed, 0 insertions, 29 deletions

diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts
deleted file mode 100644
index de7efb1558..0000000000
--- a/src/services/blocking/delete.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { renderActivity } from '@/remote/activitypub/renderer/index';
-import renderBlock from '@/remote/activitypub/renderer/block';
-import renderUndo from '@/remote/activitypub/renderer/undo';
-import { deliver } from '@/queue/index';
-import Logger from '../logger';
-import { User } from '@/models/entities/user';
-import { Blockings, Users } from '@/models/index';
-
-const logger = new Logger('blocking/delete');
-
-export default async function(blocker: User, blockee: User) {
-	const blocking = await Blockings.findOne({
-		blockerId: blocker.id,
-		blockeeId: blockee.id
-	});
-
-	if (blocking == null) {
-		logger.warn('ブロック解除がリクエストされましたがブロックしていませんでした');
-		return;
-	}
-
-	Blockings.delete(blocking.id);
-
-	// deliver if remote bloking
-	if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) {
-		const content = renderActivity(renderUndo(renderBlock(blocker, blockee), blocker));
-		deliver(blocker, content, blockee.inbox);
-	}
-}