disableReaction

src/client/app/common/views/components/settings/profile.vue

@@ -79,6 +79,7 @@
 				<ui-switch v-model="isCat" @change="save(false)">{{ $t('is-cat') }}</ui-switch>
 				<ui-switch v-model="isBot" @change="save(false)">{{ $t('is-bot') }}</ui-switch>
 				<ui-switch v-model="alwaysMarkNsfw">{{ $t('@._settings.always-mark-nsfw') }}</ui-switch>
+				<ui-switch v-model="disableReaction" @change="save(false)">{{ $t('disableReaction') }}</ui-switch>
 			</div>
 		</section>
 
@@ -184,6 +185,7 @@ export default Vue.extend({
 			autoAcceptFollowed: false,
 			avoidSearchIndex: false,
 			isExplorable: false,
+			disableReaction: false,
 			searchableBy: true,
 			hideFollows: '',
 			noFederation: false,
@@ -239,6 +241,7 @@ export default Vue.extend({
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
 		this.avoidSearchIndex = this.$store.state.i.avoidSearchIndex;
 		this.isExplorable = this.$store.state.i.isExplorable;
+		this.disableReaction = this.$store.state.i.disableReaction;
 		this.searchableBy = this.$store.state.i.searchableBy === 'public';
 		this.hideFollows = this.$store.state.i.hideFollows;
 		this.noFederation = this.$store.state.i.noFederation;
@@ -341,6 +344,7 @@ export default Vue.extend({
 				autoAcceptFollowed: !!this.autoAcceptFollowed,
 				avoidSearchIndex: !!this.avoidSearchIndex,
 				isExplorable: !!this.isExplorable,
+				disableReaction: !!this.disableReaction,
 				hideFollows: this.hideFollows || '',
 				searchableBy: this.searchableBy ? 'public' : 'none',
 				fields,

src/misc/reaction-lib.ts

@@ -1,6 +1,8 @@
 import Emoji from '../models/emoji';
 import { emojiRegex, vendorEmojiRegex } from './emoji-regex';
 import { toApHost, toDbHost } from './convert-host';
+import { IUser } from '../models/user';
+import * as mongo from 'mongodb';
 
 const basic10: Record<string, string> = {
 	'👍': 'like',
@@ -31,9 +33,17 @@ const normalizeMap: Record<string, string> = {
 
 const REACTION_STAR = '⭐';
 
-export async function toDbReaction(reaction: string | undefined | null, enableEmoji = true, reacterHost?: string | null): Promise<string> {
+export async function toDbReaction(reaction: string | undefined | null, enableEmoji = true, reacter?: IUser, reactee?: IUser): Promise<string> {
+	let reacterHost = reacter?.host;
+
 	if (reaction == null) return REACTION_STAR;
 
+	// disable reaction from
+	if (reacter?.disableReaction) return REACTION_STAR;
+
+	// disable reaction to
+	if (reactee?.disableReaction) return REACTION_STAR;
+
 	// 既存の文字列リアクションはそのまま
 	if (Object.values(basic10).includes(reaction)) return reaction;
 

src/models/packed-schemas.ts

@@ -127,6 +127,7 @@ export type PackedUser = ThinPackedUser & {
 	refuseFollow?: boolean;
 	autoAcceptFollowed?: boolean;
 	isExplorable?: boolean;
+	disableReaction?: boolean;
 	searchableBy?: string;
 	hideFollows?: string;
 	wallpaperId?: string | null;

src/models/user.ts

@@ -141,6 +141,11 @@ type IUserBase = {
 	 */
 	isExplorable?: boolean;
 
+	/**
+	 * リアクションを無効にするか
+	 */
+	disableReaction?: boolean;
+
 	searchableBy?: 'public' | 'none' | null;
 
 	/**
@@ -547,6 +552,7 @@ export async function pack(
 			isExplorable: !!db.isExplorable,
 			searchableBy: db.searchableBy || 'public',
 			hideFollows: db.hideFollows || '',
+			disableReaction: !!db.disableReaction,
 
 			wallpaperId: toOidStringOrNull(db.wallpaperId),
 			wallpaperUrl: sanitizeUrl(db.wallpaperUrl) || null,

src/server/api/endpoints/i/update.ts

@@ -146,6 +146,13 @@ export const meta = {
 			}
 		},
 
+		disableReaction: {
+			validator: $.optional.bool,
+			desc: {
+				'ja-JP': 'リアクションを無効にするか'
+			}
+		},
+
 		searchableBy: {
 			validator: $.optional.nullable.str.or(['public', 'none']),
 			desc: {
@@ -290,6 +297,7 @@ export default define(meta, async (ps, user, app) => {
 	if (typeof ps.autoAcceptFollowed == 'boolean') updates.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.avoidSearchIndex == 'boolean') updates.avoidSearchIndex = ps.avoidSearchIndex;
 	if (typeof ps.isExplorable == 'boolean') updates.isExplorable = ps.isExplorable;
+	if (typeof ps.disableReaction == 'boolean') updates.disableReaction = ps.disableReaction;
 	if (ps.searchableBy !== undefined) updates.searchableBy = ps.searchableBy;
 	if (ps.hideFollows !== undefined) updates.hideFollows = ps.hideFollows;
 	if (typeof ps.noFederation == 'boolean') updates.noFederation = ps.noFederation;

src/services/note/reaction/create.ts

@@ -31,7 +31,9 @@ export default async (user: IUser, note: INote, reaction?: string, dislike = fal
 		}
 	}
 
-	reaction = await toDbReaction(reaction, true, user.host);
+	const reactee = await User.findOne({ _id: note.userId });
+
+	reaction = await toDbReaction(reaction, true, user, reactee);
 
 	const inserted = {
 		_id: new mongo.ObjectID(),
@@ -94,7 +96,6 @@ export default async (user: IUser, note: INote, reaction?: string, dislike = fal
 		const dm = new DeliverManager(user, content)
 
 		if (isRemoteUser(note._user)) {
-			const reactee = await User.findOne({ _id: note.userId });
 			if (isRemoteUser(reactee)) dm.addDirectRecipe(reactee);
 		}