Revert "被ブロックをタイムラインで隠すように (#1979)"

This reverts commit e299b7b.
sakura-tel · Nov 10, 2022 · 3de1369 · 3de1369
1 parent f2d6f2a
commit 3de1369
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 106 deletions.
diff --git a/src/misc/is-blocker-user-related.ts b/src/misc/is-blocker-user-related.ts
diff --git a/src/server/api/common/generate-block-query.ts b/src/server/api/common/generate-block-query.ts
@@ -1,31 +1,8 @@
 import { User } from '../../../models/entities/user';
 import { Blockings } from '../../../models';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 
-// ここでいうBlockedは被Blockedの意
-export function generateBlockedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
-	const blockingQuery = Blockings.createQueryBuilder('blocking')
-		.select('blocking.blockerId')
-		.where('blocking.blockeeId = :blockeeId', { blockeeId: me.id });
-
-	// 投稿の作者にブロックされていない かつ
-	// 投稿の返信先の作者にブロックされていない かつ
-	// 投稿の引用元の作者にブロックされていない
-	q
-		.andWhere(`note.userId NOT IN (${ blockingQuery.getQuery() })`)
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyUserId IS NULL`)
-			.orWhere(`note.replyUserId NOT IN (${ blockingQuery.getQuery() })`);
-		}))
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.renoteUserId IS NULL`)
-			.orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
-		}));
-
-	q.setParameters(blockingQuery.getParameters());
-}
-
-export function generateBlockQueryForUsers(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
+export function generateBlockQueryForUsers(q: SelectQueryBuilder<any>, me: User) {
 	const blockingQuery = Blockings.createQueryBuilder('blocking')
 		.select('blocking.blockeeId')
 		.where('blocking.blockerId = :blockerId', { blockerId: me.id });

diff --git a/src/server/api/endpoints/notes/children.ts b/src/server/api/endpoints/notes/children.ts
@@ -6,7 +6,6 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { Brackets } from 'typeorm';
 import { Notes } from '../../../../models';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -79,7 +78,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMuteQuery(query, user);
-	if (user) generateBlockedUserQuery(query, user);
 
 	const notes = await query.take(ps.limit!).getMany();
 

diff --git a/src/server/api/endpoints/notes/featured.ts b/src/server/api/endpoints/notes/featured.ts
@@ -2,7 +2,6 @@ import $ from 'cafy';
 import define from '../../define';
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { Notes } from '../../../../models';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -56,7 +55,6 @@ export default define(meta, async (ps, user) => {
 		.leftJoinAndSelect('renoteUser.banner', 'renoteUserBanner');
 
 	if (user) generateMuteQuery(query, user);
-	if (user) generateBlockedUserQuery(query, user);
 
 	const notes = await query.orderBy('note.score', 'DESC').take(ps.limit!).getMany();
 

diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
@@ -7,7 +7,6 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Notes } from '../../../../models';
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { activeUsersChart } from '../../../../services/chart';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {

diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -9,7 +9,6 @@ import { Brackets } from 'typeorm';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { activeUsersChart } from '../../../../services/chart';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -140,7 +139,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMuteQuery(query, user);
-	generateBlockedUserQuery(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(new Brackets(qb => {

diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
@@ -9,7 +9,6 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { activeUsersChart } from '../../../../services/chart';
 import { Brackets } from 'typeorm';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {

diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts
@@ -7,7 +7,6 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Brackets } from 'typeorm';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -78,7 +77,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMuteQuery(query, user);
-	generateBlockedUserQuery(query, user);
 
 	if (ps.visibility) {
 		query.andWhere('note.visibility = :visibility', { visibility: ps.visibility });

diff --git a/src/server/api/endpoints/notes/renotes.ts b/src/server/api/endpoints/notes/renotes.ts
@@ -7,7 +7,6 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Notes } from '../../../../models';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -83,7 +82,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMuteQuery(query, user);
-	if (user) generateBlockedUserQuery(query, user);
 
 	const renotes = await query.take(ps.limit!).getMany();
 

diff --git a/src/server/api/endpoints/notes/replies.ts b/src/server/api/endpoints/notes/replies.ts
@@ -5,7 +5,6 @@ import { Notes } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMuteQuery } from '../../common/generate-mute-query';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -74,7 +73,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	if (user) generateMuteQuery(query, user);
-	if (user) generateBlockedUserQuery(query, user);
 
 	const timeline = await query.take(ps.limit!).getMany();
 

diff --git a/src/server/api/endpoints/notes/search-by-tag.ts b/src/server/api/endpoints/notes/search-by-tag.ts
@@ -8,7 +8,6 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { Brackets } from 'typeorm';
 import { normalizeTag } from '../../../../misc/normalize-tag';
 import { safeForSql } from '../../../../misc/safe-for-sql';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -110,7 +109,6 @@ export default define(meta, async (ps, me) => {
 
 	generateVisibilityQuery(query, me);
 	if (me) generateMuteQuery(query, me);
-	if (me) generateBlockedUserQuery(query, me);
 
 	if (ps.tag) {
 		query.andWhere(`'{"${safeForSql(ps.tag) ? normalizeTag(ps.tag) : 'aichan_kawaii'}"}' <@ note.tags`);

diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
@@ -7,7 +7,6 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
 import { generateMuteQuery } from '../../common/generate-mute-query';
 import { activeUsersChart } from '../../../../services/chart';
 import { Brackets } from 'typeorm';
-import { generateBlockedUserQuery } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -126,7 +125,6 @@ export default define(meta, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMuteQuery(query, user);
-	generateBlockedUserQuery(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(new Brackets(qb => {

diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
@@ -145,7 +145,6 @@ export default define(meta, async (ps, me) => {
 
 	generateVisibilityQuery(query, me);
 	if (me) generateMuteQuery(query, me, user);
-	// モデレーションの問題があるため被ブロックには対応しない
 
 	if (ps.withFiles) {
 		query.andWhere('note.fileIds != \'{}\'');

diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
@@ -3,7 +3,7 @@ import $ from 'cafy';
 import define from '../../define';
 import { Users, Followings } from '../../../../models';
 import { generateMuteQueryForUsers } from '../../common/generate-mute-query';
-import { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../common/generate-block-query';
+import { generateBlockQueryForUsers } from '../../common/generate-block-query';
 
 export const meta = {
 	desc: {
@@ -49,7 +49,6 @@ export default define(meta, async (ps, me) => {
 
 	generateMuteQueryForUsers(query, me);
 	generateBlockQueryForUsers(query, me);
-	generateBlockedUserQuery(query, me);
 
 	const followingQuery = Followings.createQueryBuilder('following')
 		.select('following.followeeId')

diff --git a/src/server/api/stream/channel.ts b/src/server/api/stream/channel.ts
@@ -23,10 +23,6 @@ export default abstract class Channel {
 		return this.connection.muting;
 	}
 
-	protected get blocking() {
-		return this.connection.blocking;
-	}
-
 	protected get subscriber() {
 		return this.connection.subscriber;
 	}

diff --git a/src/server/api/stream/channels/global-timeline.ts b/src/server/api/stream/channels/global-timeline.ts
@@ -4,7 +4,6 @@ import Channel from '../channel';
 import { fetchMeta } from '../../../../misc/fetch-meta';
 import { Notes } from '../../../../models';
 import { PackedNote } from '../../../../models/repositories/note';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'globalTimeline';

diff --git a/src/server/api/stream/channels/hashtag.ts b/src/server/api/stream/channels/hashtag.ts
@@ -4,7 +4,6 @@ import Channel from '../channel';
 import { Notes } from '../../../../models';
 import { PackedNote } from '../../../../models/repositories/note';
 import { normalizeTag } from '../../../../misc/normalize-tag';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'hashtag';
@@ -37,7 +36,6 @@ export default class extends Channel {
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (shouldMuteThisNote(note, this.muting)) return;
-		if (isBlockerUserRelated(note, this.blocking)) return;
 
 		this.send('note', note);
 	}

diff --git a/src/server/api/stream/channels/home-timeline.ts b/src/server/api/stream/channels/home-timeline.ts
@@ -3,7 +3,6 @@ import shouldMuteThisNote from '../../../../misc/should-mute-this-note';
 import Channel from '../channel';
 import { Notes } from '../../../../models';
 import { PackedNote } from '../../../../models/repositories/note';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'homeTimeline';
@@ -46,7 +45,6 @@ export default class extends Channel {
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (shouldMuteThisNote(note, this.muting)) return;
-		if (isBlockerUserRelated(note, this.blocking)) return;
 
 		this.send('note', note);
 	}

diff --git a/src/server/api/stream/channels/hybrid-timeline.ts b/src/server/api/stream/channels/hybrid-timeline.ts
@@ -5,7 +5,6 @@ import { fetchMeta } from '../../../../misc/fetch-meta';
 import { Notes } from '../../../../models';
 import { PackedNote } from '../../../../models/repositories/note';
 import { PackedUser } from '../../../../models/repositories/user';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'hybridTimeline';
@@ -55,7 +54,6 @@ export default class extends Channel {
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (shouldMuteThisNote(note, this.muting)) return;
-		if (isBlockerUserRelated(note, this.blocking)) return;
 
 		this.send('note', note);
 	}

diff --git a/src/server/api/stream/channels/local-timeline.ts b/src/server/api/stream/channels/local-timeline.ts
@@ -5,7 +5,6 @@ import { fetchMeta } from '../../../../misc/fetch-meta';
 import { Notes } from '../../../../models';
 import { PackedNote } from '../../../../models/repositories/note';
 import { PackedUser } from '../../../../models/repositories/user';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'localTimeline';

diff --git a/src/server/api/stream/channels/user-list.ts b/src/server/api/stream/channels/user-list.ts
@@ -4,7 +4,6 @@ import { Notes, UserListJoinings, UserLists } from '../../../../models';
 import shouldMuteThisNote from '../../../../misc/should-mute-this-note';
 import { User } from '../../../../models/entities/user';
 import { PackedNote } from '../../../../models/repositories/note';
-import { isBlockerUserRelated } from '../../../../misc/is-blocker-user-related';
 
 export default class extends Channel {
 	public readonly chName = 'userList';
@@ -75,7 +74,6 @@ export default class extends Channel {
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (shouldMuteThisNote(note, this.muting)) return;
-		if (isBlockerUserRelated(note, this.blocking)) return;
 
 		this.send('note', note);
 	}

diff --git a/src/server/api/stream/index.ts b/src/server/api/stream/index.ts
@@ -8,7 +8,7 @@ import channels from './channels';
 import { EventEmitter } from 'events';
 import { User } from '../../../models/entities/user';
 import { App } from '../../../models/entities/app';
-import { Users, Followings, Mutings, Blockings } from '../../../models';
+import { Users, Followings, Mutings } from '../../../models';
 
 /**
  * Main stream connection
@@ -17,7 +17,6 @@ export default class Connection {
 	public user?: User;
 	public following: User['id'][] = [];
 	public muting: User['id'][] = [];
-	public blocking: User['id'][] = [];
 	public app: App;
 	private wsConnection: websocket.connection;
 	public subscriber: EventEmitter;
@@ -40,7 +39,6 @@ export default class Connection {
 		if (this.user) {
 			this.updateFollowing();
 			this.updateMuting();
-			this.updateBlocking();
 			this.subscriber.on(`serverEvent:${this.user.id}`, this.onServerEvent);
 		}
 	}
@@ -227,10 +225,6 @@ export default class Connection {
 			this.updateMuting();
 		}
 
-		if (data.type === 'blockingChanged') {
-			this.updateBlocking();
-		}
-
 		if (data.type === 'terminate') {
 			this.wsConnection.close();
 			this.dispose();
@@ -261,18 +255,6 @@ export default class Connection {
 		this.muting = mutings.map(x => x.muteeId);
 	}
 
-	@autobind
-	private async updateBlocking() { // ここでいうBlockingは被Blockingの意
-		const blockings = await Blockings.find({
-			where: {
-				blockeeId: this.user!.id
-			},
-			select: ['blockerId']
-		});
-
-		this.blocking = blockings.map(x => x.blockerId);
-	}
-
 	/**
 	 * ストリームが切れたとき
 	 */

diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts
@@ -9,7 +9,7 @@ import { User } from '../../models/entities/user';
 import { Blockings, Users, FollowRequests, Followings } from '../../models';
 import { perUserFollowingChart } from '../chart';
 import { genId } from '../../misc/gen-id';
-import { publishBlockingChanged, publishFollowingChanged } from '../server-event';
+import { publishFollowingChanged } from '../server-event';
 
 export default async function(blocker: User, blockee: User) {
 	await Promise.all([
@@ -30,9 +30,6 @@ export default async function(blocker: User, blockee: User) {
 		const content = renderActivity(renderBlock(blocker, blockee));
 		deliver(blocker, content, blockee.inbox);
 	}
-
-	publishBlockingChanged(blocker.id);
-	if (Users.isLocalUser(blockee)) publishBlockingChanged(blockee.id);
 }
 
 async function cancelRequest(follower: User, followee: User) {

diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts
@@ -5,7 +5,6 @@ import { deliver } from '../../queue';
 import Logger from '../logger';
 import { User } from '../../models/entities/user';
 import { Blockings, Users } from '../../models';
-import { publishBlockingChanged } from '../server-event';
 
 const logger = new Logger('blocking/delete');
 
@@ -27,7 +26,4 @@ export default async function(blocker: User, blockee: User) {
 		const content = renderActivity(renderUndo(renderBlock(blocker, blockee), blocker));
 		deliver(blocker, content, blockee.inbox);
 	}
-
-	publishBlockingChanged(blocker.id);
-	if (Users.isLocalUser(blockee)) publishBlockingChanged(blockee.id);
 }