packages/backend/src/server/api/endpoints/notes/reactions.ts

@@ -72,11 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					this.cacheService.userBlockedCache.get(me.id),
 				]);
 
-				const userIds = Array.from(userIdsWhoMeMuting ?? []).concat(Array.from(userIdsWhoBlockingMe ?? []));
+			  query.andWhere('reaction.userId NOT IN (:...userIds)', { userIds: Array.from(userIdsWhoMeMuting ?? []).concat(Array.from(userIdsWhoBlockingMe ?? [])) });
-
-				if (userIds.length > 0 ){
-			  	query.andWhere('reaction.userId NOT IN (:...userIds)', { userIds: Array.from(userIdsWhoMeMuting ?? []).concat(Array.from(userIdsWhoBlockingMe ?? [])) });
-				}
 			}
 
 			if (ps.type) {

packages/frontend/src/pages/settings/general.vue

@@ -110,10 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
 				<option value="always">{{ i18n.ts._instanceTicker.always }}</option>
 			</MkSelect>
-			<MkSwitch v-if="instanceTicker !== 'none'" v-model="instanceIcon">
+
-				{{ i18n.ts.instanceIcon }}
-				<span class="_beta">{{ i18n.ts.originalFeature }}</span>
-			</MkSwitch>
 			<MkSelect v-model="nsfw">
 				<template #label>{{ i18n.ts.displayOfSensitiveMedia }}</template>
 				<option value="respect">{{ i18n.ts._displayOfSensitiveMedia.respect }}</option>
@@ -491,8 +488,6 @@ watch([
 	showNoteActionsOnlyHover,
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
-	instanceIcon,
-	hideReactionCount,
 	overridedDeviceKind,
 	mediaListWithOneImageAppearance,
 	reactionsDisplaySize,