Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix: mute

Browse source
This commit is contained in:
mattyatea 2023-10-20 14:39:25 +09:00
parent 7bd7fe996c
commit bbf1ba6a54
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/frontend/src/components/MkNote.vue
View file

@ -141,6 +141,8 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
</I18n>
</div>
<div v-else-if="hideMutedNotes" />
</template>
<script lang="ts" setup>
@ -274,6 +276,7 @@ function smallerVisibility(a: Visibility | string, b: Visibility | string): Visi
}
function renote(viaKeyboard = false) {
if (muted && !hideMutedNotes) return;
pleaseLogin();
showMovedDialog();
@ -286,7 +289,7 @@ function renote(viaKeyboard = false) {
action: () => {
const el = renoteButton.value as HTMLElement | null | undefined;
if (el) {
const rect = el.getBoundingClientRect();
const rect = el?.getBoundingClientRect();
const x = rect.left + (el.offsetWidth / 2);
const y = rect.top + (el.offsetHeight / 2);
os.popup(MkRippleEffect, {x, y}, {}, 'end');
@ -317,7 +320,7 @@ function renote(viaKeyboard = false) {
action: () => {
const el = renoteButton.value as HTMLElement | null | undefined;
if (el) {
const rect = el.getBoundingClientRect();
const rect = el?.getBoundingClientRect();
const x = rect.left + (el.offsetWidth / 2);
const y = rect.top + (el.offsetHeight / 2);
os.popup(MkRippleEffect, {x, y}, {}, 'end');
@ -356,6 +359,7 @@ function renote(viaKeyboard = false) {
}
function reply(viaKeyboard = false): void {
if (muted && !hideMutedNotes) return;
pleaseLogin();
os.post({
reply: appearNote,
@ -367,6 +371,7 @@ function reply(viaKeyboard = false): void {
}
function react(viaKeyboard = false): void {
if (muted && !hideMutedNotes) return;
pleaseLogin();
showMovedDialog();
if (appearNote.reactionAcceptance === 'likeOnly') {
@ -376,7 +381,7 @@ function react(viaKeyboard = false): void {
});
const el = reactButton.value as HTMLElement | null | undefined;
if (el) {
const rect = el.getBoundingClientRect();
const rect = el?.getBoundingClientRect();
const x = rect.left + (el.offsetWidth / 2);
const y = rect.top + (el.offsetHeight / 2);
os.popup(MkRippleEffect, {x, y}, {}, 'end');
@ -398,6 +403,7 @@ function react(viaKeyboard = false): void {
}
function undoReact(note): void {
if (muted && !hideMutedNotes) return;
const oldReaction = note.myReaction;
if (!oldReaction) return;
os.api('notes/reactions/delete', {
@ -406,6 +412,7 @@ function undoReact(note): void {
}
function onContextmenu(ev: MouseEvent): void {
if (muted && !hideMutedNotes) return;
const isLink = (el: HTMLElement) => {
if (el.tagName === 'A') return true;
// 再生速度の選択などのために、Audio要素のコンテキストメニューはブラウザデフォルトとする。
@ -434,6 +441,7 @@ function onContextmenu(ev: MouseEvent): void {
}
function menu(viaKeyboard = false): void {
if (muted && !hideMutedNotes) return;
const {menu, cleanup} = getNoteMenu({
note: note,
translating,
@ -448,6 +456,7 @@ function menu(viaKeyboard = false): void {
}
async function clip() {
if (muted && !hideMutedNotes) return;
os.popupMenu(await getNoteClipMenu({
note: note,
isDeleted,
@ -456,6 +465,7 @@ async function clip() {
}
function showRenoteMenu(viaKeyboard = false): void {
if (muted && !hideMutedNotes) return;
function getUnrenote(): MenuItem {
return {
text: i18n.ts.unrenote,
@ -492,18 +502,22 @@ function showRenoteMenu(viaKeyboard = false): void {
}
function focus() {
if (muted && !hideMutedNotes) return;
el.value.focus();
}
function blur() {
if (muted && !hideMutedNotes) return;
el.value.blur();
}
function focusBefore() {
if (muted && !hideMutedNotes) return;
focusPrev(el.value);
}
function focusAfter() {
if (muted && !hideMutedNotes) return;
focusNext(el.value);
}

2
packages/frontend/src/pages/settings/general.vue
View file

@ -50,7 +50,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch>
<MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch>
<MkSwitch v-model="collapseRenotes">{{ i18n.ts.collapseRenotes }}</MkSwitch>
<MkSwitch v-model="hideMutedNotes">{{ i18n.ts.hideMutedNotes }}</MkSwitch>
<MkSwitch v-model="showVisibilityColor">{{ i18n.ts.showVisibilityColor}}</MkSwitch>
<MkColorInput v-if="showVisibilityColor" v-model="homeColor">
<template #label>{{ i18n.ts._visibility.home }}</template>
@ -252,7 +251,6 @@ const showNoteActionsOnlyHover = computed(defaultStore.makeGetterSetter('showNot
const showClipButtonInNoteFooter = computed(defaultStore.makeGetterSetter('showClipButtonInNoteFooter'));
const reactionsDisplaySize = computed(defaultStore.makeGetterSetter('reactionsDisplaySize'));
const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
const hideMutedNotes = computed(defaultStore.makeGetterSetter('hideMutedNotes'));
const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal'));
const useBlurEffect = computed(defaultStore.makeGetterSetter('useBlurEffect'));

7
packages/frontend/src/pages/settings/mute-block.word-mute.vue
View file

@ -11,12 +11,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
</MkTextarea>
</div>
<MkSwitch v-model="hideMutedNotes">{{ i18n.ts._wordMute.hideMutedNotes }}</MkSwitch>
<MkButton primary inline :disabled="!changed" @click="save()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>
<script lang="ts" setup>
import { ref, watch } from 'vue';
import {computed, ref, watch} from 'vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
import MkButton from '@/components/MkButton.vue';
@ -28,6 +29,7 @@ import { defaultStore } from '@/store.js';
import { $i } from '@/account.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import MkSwitch from "@/components/MkSwitch.vue";
const render = (mutedWords) => mutedWords.map(x => {
if (Array.isArray(x)) {
@ -37,10 +39,9 @@ const render = (mutedWords) => mutedWords.map(x => {
}
}).join('\n');
const tab = ref('soft');
const mutedWords = ref(render($i!.mutedWords));
const changed = ref(false);
const hideMutedNotes = computed(defaultStore.makeGetterSetter('hideMutedNotes'));
watch(mutedWords, () => {
changed.value = true;
});