Compare commits

...

2 Commits

Author SHA1 Message Date
lvpq
57043b3b9e fix reaction 2024-10-22 11:37:18 +09:00
ひたりん
15fe9bea2a Merge pull request #55 from MattyaDaihuku/pr-25
fix(frontend): 独自機能の表示追加、instanceIconをリロードさせるように
2024-10-22 11:37:07 +09:00
2 changed files with 11 additions and 2 deletions

View File

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

View File

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