リアクション一覧の公開をオプトインに

2 files changed, 18 insertions, 1 deletions

diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 9dd637251d..3b8b1579ea 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -68,6 +68,10 @@ export const meta = {
 			validator: $.optional.bool,
 		},
 
+		publicReactions: {
+			validator: $.optional.bool,
+		},
+
 		carefulBot: {
 			validator: $.optional.bool,
 		},
@@ -180,6 +184,7 @@ export default define(meta, async (ps, _user, token) => {
 	if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked;
 	if (typeof ps.isExplorable === 'boolean') updates.isExplorable = ps.isExplorable;
 	if (typeof ps.hideOnlineStatus === 'boolean') updates.hideOnlineStatus = ps.hideOnlineStatus;
+	if (typeof ps.publicReactions === 'boolean') profileUpdates.publicReactions = ps.publicReactions;
 	if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot;
 	if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
 	if (typeof ps.autoAcceptFollowed === 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
diff --git a/src/server/api/endpoints/users/reactions.ts b/src/server/api/endpoints/users/reactions.ts
index 44d7887482..fe5e4d84a9 100644
--- a/src/server/api/endpoints/users/reactions.ts
+++ b/src/server/api/endpoints/users/reactions.ts
@@ -1,9 +1,10 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
-import { NoteReactions } from '@/models/index';
+import { NoteReactions, UserProfiles } from '@/models/index';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
+import { ApiError } from '../../error';
 
 export const meta = {
 	tags: ['users', 'reactions'],
@@ -48,10 +49,21 @@ export const meta = {
 	},
 
 	errors: {
+		reactionsNotPublic: {
+			message: 'Reactions of the user is not public.',
+			code: 'REACTIONS_NOT_PUBLIC',
+			id: '673a7dd2-6924-1093-e0c0-e68456ceae5c'
+		},
 	}
 };
 
 export default define(meta, async (ps, me) => {
+	const profile = await UserProfiles.findOneOrFail(ps.userId);
+
+	if (me == null || (me.id !== ps.userId && !profile.publicReactions)) {
+		throw new ApiError(meta.errors.reactionsNotPublic);
+	}
+
 	const query = makePaginationQuery(NoteReactions.createQueryBuilder('reaction'),
 			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(`reaction.userId = :userId`, { userId: ps.userId })