Allow me to post even when someone in the thread has blocked me

6 files changed, 0 insertions, 52 deletions

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index b6acf4c5fb..278cfb78a3 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -286,19 +286,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 				throw new IdentifiableError('bde24c37-121f-4e7d-980d-cec52f599f02', 'Cannot renote pure renote');
 			}
 
-			// Check blocking
-			if (renote.userId !== user.id) {
-				const blockExist = await this.blockingsRepository.exists({
-					where: {
-						blockerId: renote.userId,
-						blockeeId: user.id,
-					},
-				});
-				if (blockExist) {
-					throw new IdentifiableError('2b4fe776-4414-4a2d-ae39-f3418b8fd4d3', 'You have been blocked by the user');
-				}
-			}
-
 			if (renote.visibility === 'followers' && renote.userId !== user.id) {
 				// 他人のfollowers noteはreject
 				throw new IdentifiableError('90b9d6f0-893a-4fef-b0f1-e9a33989f71a', 'Renote target visibility');
diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts
index 6c96ab16cf..b7403e71ef 100644
--- a/packages/backend/src/core/PollService.ts
+++ b/packages/backend/src/core/PollService.ts
@@ -50,14 +50,6 @@ export class PollService {
 		// Check whether is valid choice
 		if (poll.choices[choice] == null) throw new Error('invalid choice param');
 
-		// Check blocking
-		if (note.userId !== user.id) {
-			const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
-			if (blocked) {
-				throw new Error('blocked');
-			}
-		}
-
 		// if already voted
 		const exist = await this.pollVotesRepository.findBy({
 			noteId: note.id,
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 6f9fe53937..ab6c1a5e11 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -104,14 +104,6 @@ export class ReactionService {
 
 	@bindThis
 	public async create(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot'] }, note: MiNote, _reaction?: string | null) {
-		// Check blocking
-		if (note.userId !== user.id) {
-			const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
-			if (blocked) {
-				throw new IdentifiableError('e70412a4-7197-4726-8e74-f3e0deb92aa7');
-			}
-		}
-
 		// check visibility
 		if (!await this.noteEntityService.isVisibleForMe(note, user.id)) {
 			throw new IdentifiableError('68e9d2d1-48bf-42c2-b90a-b20e09fd3d48', 'Note not accessible for you.');
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index e48aa69d0f..cba481922a 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -277,8 +277,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
 					} else if (err.id === 'ced780a1-2012-4caf-bc7e-a95a291294cb') {
 						throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
-					} else if (err.id === 'b0df6025-f2e8-44b4-a26a-17ad99104612') {
-						throw new ApiError(meta.errors.youHaveBeenBlocked);
 					} else if (err.id === '0c11c11e-0c8d-48e7-822c-76ccef660068') {
 						throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
 					} else if (err.id === 'bfa3905b-25f5-4894-b430-da331a490e4b') {
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
index f33f49075b..4ee63a1329 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
@@ -109,14 +109,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.noPoll);
 			}
 
-			// Check blocking
-			if (note.userId !== me.id) {
-				const blocked = await this.userBlockingService.checkBlocked(note.userId, me.id);
-				if (blocked) {
-					throw new ApiError(meta.errors.youHaveBeenBlocked);
-				}
-			}
-
 			const poll = await this.pollsRepository.findOneByOrFail({ noteId: note.id });
 
 			if (poll.expiresAt && poll.expiresAt < createdAt) {
diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts
index c717b3959c..ffdccfbbd6 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/push.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts
@@ -102,19 +102,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw err;
 			});
 
-			// Check blocking
-			if (user.id !== me.id) {
-				const blockExist = await this.blockingsRepository.exists({
-					where: {
-						blockerId: user.id,
-						blockeeId: me.id,
-					},
-				});
-				if (blockExist) {
-					throw new ApiError(meta.errors.youHaveBeenBlocked);
-				}
-			}
-
 			const exist = await this.userListMembershipsRepository.exists({
 				where: {
 					userListId: userList.id,