Compare commits
2 Commits
299921d0b0
...
57043b3b9e
Author | SHA1 | Date | |
---|---|---|---|
|
57043b3b9e | ||
|
15fe9bea2a |
@ -72,8 +72,12 @@ 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 ?? []));
|
||||
|
||||
if (userIds.length > 0 ){
|
||||
query.andWhere('reaction.userId NOT IN (:...userIds)', { userIds: Array.from(userIdsWhoMeMuting ?? []).concat(Array.from(userIdsWhoBlockingMe ?? [])) });
|
||||
}
|
||||
}
|
||||
|
||||
if (ps.type) {
|
||||
// ローカルリアクションはホスト名が . とされているが
|
||||
|
@ -110,7 +110,10 @@ 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>
|
||||
@ -488,6 +491,8 @@ watch([
|
||||
showNoteActionsOnlyHover,
|
||||
showGapBetweenNotesInTimeline,
|
||||
instanceTicker,
|
||||
instanceIcon,
|
||||
hideReactionCount,
|
||||
overridedDeviceKind,
|
||||
mediaListWithOneImageAppearance,
|
||||
reactionsDisplaySize,
|
||||
|
Loading…
Reference in New Issue
Block a user