Compare commits
No commits in common. "57043b3b9e9996c5288983e66d73d5401ddd9134" and "299921d0b0e6cd6852e83256fa416e6f2b729b83" have entirely different histories.
57043b3b9e
...
299921d0b0
@ -72,12 +72,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||||||
this.cacheService.userBlockedCache.get(me.id),
|
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 ?? [])) });
|
query.andWhere('reaction.userId NOT IN (:...userIds)', { userIds: Array.from(userIdsWhoMeMuting ?? []).concat(Array.from(userIdsWhoBlockingMe ?? [])) });
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (ps.type) {
|
if (ps.type) {
|
||||||
// ローカルリアクションはホスト名が . とされているが
|
// ローカルリアクションはホスト名が . とされているが
|
||||||
|
@ -110,10 +110,7 @@ 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>
|
||||||
@ -491,8 +488,6 @@ watch([
|
|||||||
showNoteActionsOnlyHover,
|
showNoteActionsOnlyHover,
|
||||||
showGapBetweenNotesInTimeline,
|
showGapBetweenNotesInTimeline,
|
||||||
instanceTicker,
|
instanceTicker,
|
||||||
instanceIcon,
|
|
||||||
hideReactionCount,
|
|
||||||
overridedDeviceKind,
|
overridedDeviceKind,
|
||||||
mediaListWithOneImageAppearance,
|
mediaListWithOneImageAppearance,
|
||||||
reactionsDisplaySize,
|
reactionsDisplaySize,
|
||||||
|
Loading…
Reference in New Issue
Block a user