enhance(server): Improve user block (#7640)

* enhance(server): Improve user block

* Update CHANGELOG.md

* ユーザーリスト対応

* 相手から見れなくなるように

* Update 1629004542760-chart-reindex.ts

2365761ba5 (commitcomment-54919821)

* update test

* add test

* add todos

* Update 1629004542760-chart-reindex.ts

src/server/api/endpoints/antennas/notes.ts

@@ -6,6 +6,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { ApiError } from '../../error';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['antennas', 'account', 'notes'],
@@ -77,6 +78,7 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);
+	generateBlockedUserQuery(query, user);
 
 	const notes = await query
 		.take(ps.limit!)

src/server/api/endpoints/clips/notes.ts

@@ -6,6 +6,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { ApiError } from '../../error';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['account', 'notes', 'clips'],
@@ -81,6 +82,7 @@ export default define(meta, async (ps, user) => {
 	if (user) {
 		generateVisibilityQuery(query, user);
 		generateMutedUserQuery(query, user);
+		generateBlockedUserQuery(query, user);
 	}
 
 	const notes = await query

src/server/api/endpoints/messaging/messages/create.ts

@@ -3,7 +3,7 @@ import { ID } from '@/misc/cafy-id';
 import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';
-import { MessagingMessages, DriveFiles, UserGroups, UserGroupJoinings } from '../../../../../models';
+import { MessagingMessages, DriveFiles, UserGroups, UserGroupJoinings, Blockings } from '../../../../../models';
 import { User } from '../../../../../models/entities/user';
 import { UserGroup } from '../../../../../models/entities/user-group';
 import { createMessage } from '../../../../../services/messages/create';
@@ -74,7 +74,13 @@ export const meta = {
 			message: 'Content required. You need to set text or fileId.',
 			code: 'CONTENT_REQUIRED',
 			id: '25587321-b0e6-449c-9239-f8925092942c'
-		}
+		},
+
+		youHaveBeenBlocked: {
+			message: 'You cannot send a message because you have been blocked by this user.',
+			code: 'YOU_HAVE_BEEN_BLOCKED',
+			id: 'c15a5199-7422-4968-941a-2a462c478f7d'
+		},
 	}
 };
 
@@ -93,6 +99,15 @@ export default define(meta, async (ps, user) => {
 			if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
 			throw e;
 		});
+
+		// Check blocking
+		const block = await Blockings.findOne({
+			blockerId: recipientUser.id,
+			blockeeId: user.id,
+		});
+		if (block) {
+			throw new ApiError(meta.errors.youHaveBeenBlocked);
+		}
 	} else if (ps.groupId != null) {
 		// Fetch recipient (group)
 		recipientGroup = await UserGroups.findOne(ps.groupId);

src/server/api/endpoints/notes/children.ts

@@ -6,6 +6,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { Brackets } from 'typeorm';
 import { Notes } from '../../../../models';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -63,6 +64,7 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMutedUserQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	const notes = await query.take(ps.limit!).getMany();
 

src/server/api/endpoints/notes/create.ts

@@ -7,7 +7,7 @@ import { fetchMeta } from '@/misc/fetch-meta';
 import { ApiError } from '../../error';
 import { ID } from '@/misc/cafy-id';
 import { User } from '../../../../models/entities/user';
-import { Users, DriveFiles, Notes, Channels } from '../../../../models';
+import { Users, DriveFiles, Notes, Channels, Blockings } from '../../../../models';
 import { DriveFile } from '../../../../models/entities/drive-file';
 import { Note } from '../../../../models/entities/note';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits';
@@ -171,6 +171,12 @@ export const meta = {
 			code: 'NO_SUCH_CHANNEL',
 			id: 'b1653923-5453-4edc-b786-7c4f39bb0bbb'
 		},
+
+		youHaveBeenBlocked: {
+			message: 'You have been blocked by this user.',
+			code: 'YOU_HAVE_BEEN_BLOCKED',
+			id: 'b390d7e1-8a5e-46ed-b625-06271cafd3d3'
+		},
 	}
 };
 
@@ -202,6 +208,17 @@ export default define(meta, async (ps, user) => {
 		} else if (renote.renoteId && !renote.text && !renote.fileIds) {
 			throw new ApiError(meta.errors.cannotReRenote);
 		}
+
+		// Check blocking
+		if (renote.userId !== user.id) {
+			const block = await Blockings.findOne({
+				blockerId: renote.userId,
+				blockeeId: user.id,
+			});
+			if (block) {
+				throw new ApiError(meta.errors.youHaveBeenBlocked);
+			}
+		}
 	}
 
 	let reply: Note | undefined;
@@ -217,6 +234,17 @@ export default define(meta, async (ps, user) => {
 		if (reply.renoteId && !reply.text && !reply.fileIds) {
 			throw new ApiError(meta.errors.cannotReplyToPureRenote);
 		}
+
+		// Check blocking
+		if (reply.userId !== user.id) {
+			const block = await Blockings.findOne({
+				blockerId: reply.userId,
+				blockeeId: user.id,
+			});
+			if (block) {
+				throw new ApiError(meta.errors.youHaveBeenBlocked);
+			}
+		}
 	}
 
 	if (ps.poll) {

src/server/api/endpoints/notes/featured.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import define from '../../define';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { Notes } from '../../../../models';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -48,6 +49,7 @@ export default define(meta, async (ps, user) => {
 		.leftJoinAndSelect('renote.user', 'renoteUser');
 
 	if (user) generateMutedUserQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	let notes = await query
 		.orderBy('note.score', 'DESC')

src/server/api/endpoints/notes/global-timeline.ts

@@ -9,6 +9,7 @@ import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { activeUsersChart } from '../../../../services/chart';
 import { generateRepliesQuery } from '../../common/generate-replies-query';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -81,6 +82,7 @@ export default define(meta, async (ps, user) => {
 	generateRepliesQuery(query, user);
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateMutedNoteQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	if (ps.withFiles) {
 		query.andWhere('note.fileIds != \'{}\'');

src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -12,6 +12,7 @@ import { activeUsersChart } from '../../../../services/chart';
 import { generateRepliesQuery } from '../../common/generate-replies-query';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query';
 import { generateChannelQuery } from '../../common/generate-channel-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -108,6 +109,7 @@ export default define(meta, async (ps, user) => {
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);
 	generateMutedNoteQuery(query, user);
+	generateBlockedUserQuery(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(new Brackets(qb => {

src/server/api/endpoints/notes/local-timeline.ts

@@ -12,6 +12,7 @@ import { Brackets } from 'typeorm';
 import { generateRepliesQuery } from '../../common/generate-replies-query';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query';
 import { generateChannelQuery } from '../../common/generate-channel-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -94,6 +95,7 @@ export default define(meta, async (ps, user) => {
 	generateVisibilityQuery(query, user);
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateMutedNoteQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	if (ps.withFiles) {
 		query.andWhere('note.fileIds != \'{}\'');

src/server/api/endpoints/notes/mentions.ts

@@ -7,6 +7,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Brackets } from 'typeorm';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -66,6 +67,7 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);
+	generateBlockedUserQuery(query, user);
 
 	if (ps.visibility) {
 		query.andWhere('note.visibility = :visibility', { visibility: ps.visibility });

src/server/api/endpoints/notes/polls/vote.ts

@@ -9,7 +9,7 @@ import { deliver } from '../../../../../queue';
 import { renderActivity } from '../../../../../remote/activitypub/renderer';
 import renderVote from '../../../../../remote/activitypub/renderer/vote';
 import { deliverQuestionUpdate } from '../../../../../services/note/polls/update';
-import { PollVotes, NoteWatchings, Users, Polls } from '../../../../../models';
+import { PollVotes, NoteWatchings, Users, Polls, Blockings } from '../../../../../models';
 import { Not } from 'typeorm';
 import { IRemoteUser } from '../../../../../models/entities/user';
 import { genId } from '@/misc/gen-id';
@@ -61,6 +61,12 @@ export const meta = {
 			code: 'ALREADY_EXPIRED',
 			id: '1022a357-b085-4054-9083-8f8de358337e'
 		},
+
+		youHaveBeenBlocked: {
+			message: 'You cannot vote this poll because you have been blocked by this user.',
+			code: 'YOU_HAVE_BEEN_BLOCKED',
+			id: '85a5377e-b1e9-4617-b0b9-5bea73331e49'
+		},
 	}
 };
 
@@ -77,6 +83,17 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.noPoll);
 	}
 
+	// Check blocking
+	if (note.userId !== user.id) {
+		const block = await Blockings.findOne({
+			blockerId: note.userId,
+			blockeeId: user.id,
+		});
+		if (block) {
+			throw new ApiError(meta.errors.youHaveBeenBlocked);
+		}
+	}
+
 	const poll = await Polls.findOneOrFail({ noteId: note.id });
 
 	if (poll.expiresAt && poll.expiresAt < createdAt) {
@@ -103,13 +120,13 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Create vote
-	const vote = await PollVotes.save({
+	const vote = await PollVotes.insert({
 		id: genId(),
 		createdAt,
 		noteId: note.id,
 		userId: user.id,
 		choice: ps.choice
-	});
+	}).then(x => PollVotes.findOneOrFail(x.identifiers[0]));
 
 	// Increment votes count
 	const index = ps.choice + 1; // In SQL, array index is 1 based

src/server/api/endpoints/notes/reactions/create.ts

@@ -33,7 +33,13 @@ export const meta = {
 			message: 'You are already reacting to that note.',
 			code: 'ALREADY_REACTED',
 			id: '71efcf98-86d6-4e2b-b2ad-9d032369366b'
-		}
+		},
+
+		youHaveBeenBlocked: {
+			message: 'You cannot react this note because you have been blocked by this user.',
+			code: 'YOU_HAVE_BEEN_BLOCKED',
+			id: '20ef5475-9f38-4e4c-bd33-de6d979498ec'
+		},
 	}
 };
 
@@ -44,6 +50,7 @@ export default define(meta, async (ps, user) => {
 	});
 	await createReaction(user, note, ps.reaction).catch(e => {
 		if (e.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') throw new ApiError(meta.errors.alreadyReacted);
+		if (e.id === 'e70412a4-7197-4726-8e74-f3e0deb92aa7') throw new ApiError(meta.errors.youHaveBeenBlocked);
 		throw e;
 	});
 	return;

src/server/api/endpoints/notes/renotes.ts

@@ -7,6 +7,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Notes } from '../../../../models';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -67,6 +68,7 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMutedUserQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	const renotes = await query.take(ps.limit!).getMany();
 

src/server/api/endpoints/notes/replies.ts

@@ -5,6 +5,7 @@ import { Notes } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -52,6 +53,7 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMutedUserQuery(query, user);
+	if (user) generateBlockedUserQuery(query, user);
 
 	const timeline = await query.take(ps.limit!).getMany();
 

src/server/api/endpoints/notes/search-by-tag.ts

@@ -8,6 +8,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { Brackets } from 'typeorm';
 import { safeForSql } from '@/misc/safe-for-sql';
 import { normalizeForSearch } from '@/misc/normalize-for-search';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes', 'hashtags'],
@@ -75,6 +76,7 @@ export default define(meta, async (ps, me) => {
 
 	generateVisibilityQuery(query, me);
 	if (me) generateMutedUserQuery(query, me);
+	if (me) generateBlockedUserQuery(query, me);
 
 	try {
 		if (ps.tag) {

src/server/api/endpoints/notes/search.ts

@@ -8,6 +8,7 @@ import config from '@/config';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -82,6 +83,7 @@ export default define(meta, async (ps, me) => {
 
 		generateVisibilityQuery(query, me);
 		if (me) generateMutedUserQuery(query, me);
+		if (me) generateBlockedUserQuery(query, me);
 
 		const notes = await query.take(ps.limit!).getMany();
 

src/server/api/endpoints/notes/timeline.ts

@@ -10,6 +10,7 @@ import { Brackets } from 'typeorm';
 import { generateRepliesQuery } from '../../common/generate-replies-query';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query';
 import { generateChannelQuery } from '../../common/generate-channel-query';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['notes'],
@@ -100,6 +101,7 @@ export default define(meta, async (ps, user) => {
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);
 	generateMutedNoteQuery(query, user);
+	generateBlockedUserQuery(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(new Brackets(qb => {

src/server/api/endpoints/users.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import define from '../define';
 import { Users } from '../../../models';
 import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query';
+import { generateBlockedUserQuery } from '../common/generate-block-query';
 
 export const meta = {
 	tags: ['users'],
@@ -89,6 +90,7 @@ export default define(meta, async (ps, me) => {
 	}
 
 	if (me) generateMutedUserQueryForUsers(query, me);
+	if (me) generateBlockedUserQuery(query, me);
 
 	query.take(ps.limit!);
 	query.skip(ps.offset);

src/server/api/endpoints/users/lists/push.ts

@@ -4,7 +4,7 @@ import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';
 import { pushUserToUserList } from '../../../../../services/user-list/push';
-import { UserLists, UserListJoinings } from '../../../../../models';
+import { UserLists, UserListJoinings, Blockings } from '../../../../../models';
 
 export const meta = {
 	tags: ['lists', 'users'],
@@ -40,7 +40,13 @@ export const meta = {
 			message: 'That user has already been added to that list.',
 			code: 'ALREADY_ADDED',
 			id: '1de7c884-1595-49e9-857e-61f12f4d4fc5'
-		}
+		},
+
+		youHaveBeenBlocked: {
+			message: 'You cannot push this user because you have been blocked by this user.',
+			code: 'YOU_HAVE_BEEN_BLOCKED',
+			id: '990232c5-3f9d-4d83-9f3f-ef27b6332a4b'
+		},
 	}
 };
 
@@ -61,6 +67,17 @@ export default define(meta, async (ps, me) => {
 		throw e;
 	});
 
+	// Check blocking
+	if (user.id !== me.id) {
+		const block = await Blockings.findOne({
+			blockerId: user.id,
+			blockeeId: me.id,
+		});
+		if (block) {
+			throw new ApiError(meta.errors.youHaveBeenBlocked);
+		}
+	}
+
 	const exist = await UserListJoinings.findOne({
 		userListId: userList.id,
 		userId: user.id

src/server/api/endpoints/users/notes.ts

@@ -8,6 +8,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { Notes } from '../../../../models';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { Brackets } from 'typeorm';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['users', 'notes'],
@@ -100,6 +101,7 @@ export default define(meta, async (ps, me) => {
 
 	generateVisibilityQuery(query, me);
 	if (me) generateMutedUserQuery(query, me, user);
+	if (me) generateBlockedUserQuery(query, me);
 
 	if (ps.withFiles) {
 		query.andWhere('note.fileIds != \'{}\'');

src/server/api/endpoints/users/recommendation.ts

@@ -3,7 +3,7 @@ import $ from 'cafy';
 import define from '../../define';
 import { Users, Followings } from '../../../../models';
 import { generateMutedUserQueryForUsers } from '../../common/generate-muted-user-query';
-import { generateBlockQueryForUsers } from '../../common/generate-block-query';
+import { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../common/generate-block-query';
 
 export const meta = {
 	tags: ['users'],
@@ -46,6 +46,7 @@ export default define(meta, async (ps, me) => {
 
 	generateMutedUserQueryForUsers(query, me);
 	generateBlockQueryForUsers(query, me);
+	generateBlockedUserQuery(query, me);
 
 	const followingQuery = Followings.createQueryBuilder('following')
 		.select('following.followeeId')