From 5fe20bbe969bb040f6a8ff7d85de99f3e4e690c9 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Sun, 26 Nov 2023 18:21:16 +0900
Subject: [PATCH] fix mute

---
 .../src/pages/settings/mute-block.vue         | 344 +++++++++---------
 .../pages/settings/mute-block.word-mute.vue   | 111 +++---
 2 files changed, 227 insertions(+), 228 deletions(-)

diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 4883ca0df4..e3bbf38ae1 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -4,125 +4,125 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="_gaps_m">
-	<MkFolder>
-		<template #icon><i class="ti ti-message-off"></i></template>
-		<template #label>{{ i18n.ts.wordMute }}</template>
+  <div class="_gaps_m">
+    <MkFolder>
+      <template #icon><i class="ti ti-message-off"></i></template>
+      <template #label>{{ i18n.ts.wordMute }}</template>
 
-		<XWordMute :muted="$i!.mutedWords" @save="saveMutedWords"/>
-	</MkFolder>
+      <XWordMute :muted="$i!.mutedWords" @save="saveMutedWords"/>
+    </MkFolder>
 
-	<MkFolder>
-		<template #icon><i class="ti ti-message-off"></i></template>
-		<template #label>{{ i18n.ts.hardWordMute }}</template>
+    <MkFolder>
+      <template #icon><i class="ti ti-message-off"></i></template>
+      <template #label>{{ i18n.ts.hardWordMute }}</template>
 
-		<XWordMute :muted="$i!.hardMutedWords" @save="saveHardMutedWords"/>
-	</MkFolder>
+      <XWordMute :muted="$i!.hardMutedWords" @save="saveHardMutedWords"/>
+    </MkFolder>
 
-	<MkFolder>
-		<template #icon><i class="ti ti-planet-off"></i></template>
-		<template #label>{{ i18n.ts.instanceMute }}</template>
+    <MkFolder>
+      <template #icon><i class="ti ti-planet-off"></i></template>
+      <template #label>{{ i18n.ts.instanceMute }}</template>
 
-		<XInstanceMute/>
-	</MkFolder>
+      <XInstanceMute/>
+    </MkFolder>
 
-	<MkFolder>
-		<template #icon><i class="ti ti-repeat-off"></i></template>
-		<template #label>{{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})</template>
+    <MkFolder>
+      <template #icon><i class="ti ti-repeat-off"></i></template>
+      <template #label>{{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})</template>
 
-		<MkPagination :pagination="renoteMutingPagination">
-			<template #empty>
-				<div class="_fullinfo">
-					<img :src="infoImageUrl" class="_ghost"/>
-					<div>{{ i18n.ts.noUsers }}</div>
-				</div>
-			</template>
+      <MkPagination :pagination="renoteMutingPagination">
+        <template #empty>
+          <div class="_fullinfo">
+            <img :src="infoImageUrl" class="_ghost"/>
+            <div>{{ i18n.ts.noUsers }}</div>
+          </div>
+        </template>
 
-			<template #default="{ items }">
-				<div class="_gaps_s">
-					<div v-for="item in items" :key="item.mutee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedRenoteMuteItems.includes(item.id) }]">
-						<div :class="$style.userItemMain">
-							<MkA :class="$style.userItemMainBody" :to="userPage(item.mutee)">
-								<MkUserCardMini :user="item.mutee"/>
-							</MkA>
-							<button class="_button" :class="$style.userToggle" @click="toggleRenoteMuteItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
-							<button class="_button" :class="$style.remove" @click="unrenoteMute(item.mutee, $event)"><i class="ti ti-x"></i></button>
-						</div>
-						<div v-if="expandedRenoteMuteItems.includes(item.id)" :class="$style.userItemSub">
-							<div>Muted at: <MkTime :time="item.createdAt" mode="detail"/></div>
-						</div>
-					</div>
-				</div>
-			</template>
-		</MkPagination>
-	</MkFolder>
+        <template #default="{ items }">
+          <div class="_gaps_s">
+            <div v-for="item in items" :key="item.mutee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedRenoteMuteItems.includes(item.id) }]">
+              <div :class="$style.userItemMain">
+                <MkA :class="$style.userItemMainBody" :to="userPage(item.mutee)">
+                  <MkUserCardMini :user="item.mutee"/>
+                </MkA>
+                <button class="_button" :class="$style.userToggle" @click="toggleRenoteMuteItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
+                <button class="_button" :class="$style.remove" @click="unrenoteMute(item.mutee, $event)"><i class="ti ti-x"></i></button>
+              </div>
+              <div v-if="expandedRenoteMuteItems.includes(item.id)" :class="$style.userItemSub">
+                <div>Muted at: <MkTime :time="item.createdAt" mode="detail"/></div>
+              </div>
+            </div>
+          </div>
+        </template>
+      </MkPagination>
+    </MkFolder>
 
-	<MkFolder>
-		<template #icon><i class="ti ti-eye-off"></i></template>
-		<template #label>{{ i18n.ts.mutedUsers }}</template>
+    <MkFolder>
+      <template #icon><i class="ti ti-eye-off"></i></template>
+      <template #label>{{ i18n.ts.mutedUsers }}</template>
 
-		<MkPagination :pagination="mutingPagination">
-			<template #empty>
-				<div class="_fullinfo">
-					<img :src="infoImageUrl" class="_ghost"/>
-					<div>{{ i18n.ts.noUsers }}</div>
-				</div>
-			</template>
+      <MkPagination :pagination="mutingPagination">
+        <template #empty>
+          <div class="_fullinfo">
+            <img :src="infoImageUrl" class="_ghost"/>
+            <div>{{ i18n.ts.noUsers }}</div>
+          </div>
+        </template>
 
-			<template #default="{ items }">
-				<div class="_gaps_s">
-					<div v-for="item in items" :key="item.mutee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedMuteItems.includes(item.id) }]">
-						<div :class="$style.userItemMain">
-							<MkA :class="$style.userItemMainBody" :to="userPage(item.mutee)">
-								<MkUserCardMini :user="item.mutee"/>
-							</MkA>
-							<button class="_button" :class="$style.userToggle" @click="toggleMuteItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
-							<button class="_button" :class="$style.remove" @click="unmute(item.mutee, $event)"><i class="ti ti-x"></i></button>
-						</div>
-						<div v-if="expandedMuteItems.includes(item.id)" :class="$style.userItemSub">
-							<div>Muted at: <MkTime :time="item.createdAt" mode="detail"/></div>
-							<div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
-							<div v-else>Period: {{ i18n.ts.indefinitely }}</div>
-						</div>
-					</div>
-				</div>
-			</template>
-		</MkPagination>
-	</MkFolder>
+        <template #default="{ items }">
+          <div class="_gaps_s">
+            <div v-for="item in items" :key="item.mutee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedMuteItems.includes(item.id) }]">
+              <div :class="$style.userItemMain">
+                <MkA :class="$style.userItemMainBody" :to="userPage(item.mutee)">
+                  <MkUserCardMini :user="item.mutee"/>
+                </MkA>
+                <button class="_button" :class="$style.userToggle" @click="toggleMuteItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
+                <button class="_button" :class="$style.remove" @click="unmute(item.mutee, $event)"><i class="ti ti-x"></i></button>
+              </div>
+              <div v-if="expandedMuteItems.includes(item.id)" :class="$style.userItemSub">
+                <div>Muted at: <MkTime :time="item.createdAt" mode="detail"/></div>
+                <div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
+                <div v-else>Period: {{ i18n.ts.indefinitely }}</div>
+              </div>
+            </div>
+          </div>
+        </template>
+      </MkPagination>
+    </MkFolder>
 
-	<MkFolder>
-		<template #icon><i class="ti ti-ban"></i></template>
-		<template #label>{{ i18n.ts.blockedUsers }}</template>
+    <MkFolder>
+      <template #icon><i class="ti ti-ban"></i></template>
+      <template #label>{{ i18n.ts.blockedUsers }}</template>
 
-		<MkPagination :pagination="blockingPagination">
-			<template #empty>
-				<div class="_fullinfo">
-					<img :src="infoImageUrl" class="_ghost"/>
-					<div>{{ i18n.ts.noUsers }}</div>
-				</div>
-			</template>
+      <MkPagination :pagination="blockingPagination">
+        <template #empty>
+          <div class="_fullinfo">
+            <img :src="infoImageUrl" class="_ghost"/>
+            <div>{{ i18n.ts.noUsers }}</div>
+          </div>
+        </template>
 
-			<template #default="{ items }">
-				<div class="_gaps_s">
-					<div v-for="item in items" :key="item.blockee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedBlockItems.includes(item.id) }]">
-						<div :class="$style.userItemMain">
-							<MkA :class="$style.userItemMainBody" :to="userPage(item.blockee)">
-								<MkUserCardMini :user="item.blockee"/>
-							</MkA>
-							<button class="_button" :class="$style.userToggle" @click="toggleBlockItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
-							<button class="_button" :class="$style.remove" @click="unblock(item.blockee, $event)"><i class="ti ti-x"></i></button>
-						</div>
-						<div v-if="expandedBlockItems.includes(item.id)" :class="$style.userItemSub">
-							<div>Blocked at: <MkTime :time="item.createdAt" mode="detail"/></div>
-							<div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
-							<div v-else>Period: {{ i18n.ts.indefinitely }}</div>
-						</div>
-					</div>
-				</div>
-			</template>
-		</MkPagination>
-	</MkFolder>
-</div>
+        <template #default="{ items }">
+          <div class="_gaps_s">
+            <div v-for="item in items" :key="item.blockee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedBlockItems.includes(item.id) }]">
+              <div :class="$style.userItemMain">
+                <MkA :class="$style.userItemMainBody" :to="userPage(item.blockee)">
+                  <MkUserCardMini :user="item.blockee"/>
+                </MkA>
+                <button class="_button" :class="$style.userToggle" @click="toggleBlockItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
+                <button class="_button" :class="$style.remove" @click="unblock(item.blockee, $event)"><i class="ti ti-x"></i></button>
+              </div>
+              <div v-if="expandedBlockItems.includes(item.id)" :class="$style.userItemSub">
+                <div>Blocked at: <MkTime :time="item.createdAt" mode="detail"/></div>
+                <div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
+                <div v-else>Period: {{ i18n.ts.indefinitely }}</div>
+              </div>
+            </div>
+          </div>
+        </template>
+      </MkPagination>
+    </MkFolder>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -140,18 +140,18 @@ import { $i } from '@/account.js';
 import MkFolder from '@/components/MkFolder.vue';
 
 const renoteMutingPagination = {
-	endpoint: 'renote-mute/list' as const,
-	limit: 10,
+  endpoint: 'renote-mute/list' as const,
+  limit: 10,
 };
 
 const mutingPagination = {
-	endpoint: 'mute/list' as const,
-	limit: 10,
+  endpoint: 'mute/list' as const,
+  limit: 10,
 };
 
 const blockingPagination = {
-	endpoint: 'blocking/list' as const,
-	limit: 10,
+  endpoint: 'blocking/list' as const,
+  limit: 10,
 };
 
 let expandedRenoteMuteItems = $ref([]);
@@ -159,68 +159,68 @@ let expandedMuteItems = $ref([]);
 let expandedBlockItems = $ref([]);
 
 async function unrenoteMute(user, ev) {
-	os.popupMenu([{
-		text: i18n.ts.renoteUnmute,
-		icon: 'ti ti-x',
-		action: async () => {
-			await os.apiWithDialog('renote-mute/delete', { userId: user.id });
-			//role.users = role.users.filter(u => u.id !== user.id);
-		},
-	}], ev.currentTarget ?? ev.target);
+  os.popupMenu([{
+    text: i18n.ts.renoteUnmute,
+    icon: 'ti ti-x',
+    action: async () => {
+      await os.apiWithDialog('renote-mute/delete', { userId: user.id });
+      //role.users = role.users.filter(u => u.id !== user.id);
+    },
+  }], ev.currentTarget ?? ev.target);
 }
 
 async function unmute(user, ev) {
-	os.popupMenu([{
-		text: i18n.ts.unmute,
-		icon: 'ti ti-x',
-		action: async () => {
-			await os.apiWithDialog('mute/delete', { userId: user.id });
-			//role.users = role.users.filter(u => u.id !== user.id);
-		},
-	}], ev.currentTarget ?? ev.target);
+  os.popupMenu([{
+    text: i18n.ts.unmute,
+    icon: 'ti ti-x',
+    action: async () => {
+      await os.apiWithDialog('mute/delete', { userId: user.id });
+      //role.users = role.users.filter(u => u.id !== user.id);
+    },
+  }], ev.currentTarget ?? ev.target);
 }
 
 async function unblock(user, ev) {
-	os.popupMenu([{
-		text: i18n.ts.unblock,
-		icon: 'ti ti-x',
-		action: async () => {
-			await os.apiWithDialog('blocking/delete', { userId: user.id });
-			//role.users = role.users.filter(u => u.id !== user.id);
-		},
-	}], ev.currentTarget ?? ev.target);
+  os.popupMenu([{
+    text: i18n.ts.unblock,
+    icon: 'ti ti-x',
+    action: async () => {
+      await os.apiWithDialog('blocking/delete', { userId: user.id });
+      //role.users = role.users.filter(u => u.id !== user.id);
+    },
+  }], ev.currentTarget ?? ev.target);
 }
 
 async function toggleRenoteMuteItem(item) {
-	if (expandedRenoteMuteItems.includes(item.id)) {
-		expandedRenoteMuteItems = expandedRenoteMuteItems.filter(x => x !== item.id);
-	} else {
-		expandedRenoteMuteItems.push(item.id);
-	}
+  if (expandedRenoteMuteItems.includes(item.id)) {
+    expandedRenoteMuteItems = expandedRenoteMuteItems.filter(x => x !== item.id);
+  } else {
+    expandedRenoteMuteItems.push(item.id);
+  }
 }
 
 async function toggleMuteItem(item) {
-	if (expandedMuteItems.includes(item.id)) {
-		expandedMuteItems = expandedMuteItems.filter(x => x !== item.id);
-	} else {
-		expandedMuteItems.push(item.id);
-	}
+  if (expandedMuteItems.includes(item.id)) {
+    expandedMuteItems = expandedMuteItems.filter(x => x !== item.id);
+  } else {
+    expandedMuteItems.push(item.id);
+  }
 }
 
 async function toggleBlockItem(item) {
-	if (expandedBlockItems.includes(item.id)) {
-		expandedBlockItems = expandedBlockItems.filter(x => x !== item.id);
-	} else {
-		expandedBlockItems.push(item.id);
-	}
+  if (expandedBlockItems.includes(item.id)) {
+    expandedBlockItems = expandedBlockItems.filter(x => x !== item.id);
+  } else {
+    expandedBlockItems.push(item.id);
+  }
 }
 
 async function saveMutedWords(mutedWords: (string | string[])[]) {
-	await os.api('i/update', { mutedWords });
+  await os.api('i/update', { mutedWords });
 }
 
 async function saveHardMutedWords(hardMutedWords: (string | string[])[]) {
-	await os.api('i/update', { hardMutedWords });
+  await os.api('i/update', { hardMutedWords });
 }
 
 const headerActions = $computed(() => []);
@@ -228,47 +228,47 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: i18n.ts.muteAndBlock,
-	icon: 'ti ti-ban',
+  title: i18n.ts.muteAndBlock,
+  icon: 'ti ti-ban',
 });
 </script>
 
 <style lang="scss" module>
 .userItemMain {
-	display: flex;
+  display: flex;
 }
 
 .userItemSub {
-	padding: 6px 12px;
-	font-size: 85%;
-	color: var(--fgTransparentWeak);
+  padding: 6px 12px;
+  font-size: 85%;
+  color: var(--fgTransparentWeak);
 }
 
 .userItemMainBody {
-	flex: 1;
-	min-width: 0;
-	margin-right: 8px;
+  flex: 1;
+  min-width: 0;
+  margin-right: 8px;
 
-	&:hover {
-		text-decoration: none;
-	}
+  &:hover {
+    text-decoration: none;
+  }
 }
 
 .userToggle,
 .remove {
-	width: 32px;
-	height: 32px;
-	align-self: center;
+  width: 32px;
+  height: 32px;
+  align-self: center;
 }
 
 .chevron {
-	display: block;
-	transition: transform 0.1s ease-out;
+  display: block;
+  transition: transform 0.1s ease-out;
 }
 
 .userItem.userItemOpend {
-	.chevron {
-		transform: rotateX(180deg);
-	}
+  .chevron {
+    transform: rotateX(180deg);
+  }
 }
 </style>
diff --git a/packages/frontend/src/pages/settings/mute-block.word-mute.vue b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
index 9e0f92030f..0e8bc702dd 100644
--- a/packages/frontend/src/pages/settings/mute-block.word-mute.vue
+++ b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
@@ -4,15 +4,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="_gaps_m">
-	<div>
-		<MkTextarea v-model="mutedWords">
-			<span>{{ i18n.ts._wordMute.muteWords }}</span>
-			<template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
-		</MkTextarea>
-	</div>
-	<MkButton primary inline :disabled="!changed" @click="save()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
-</div>
+  <div class="_gaps_m">
+    <div>
+      <MkTextarea v-model="mutedWords">
+        <span>{{ i18n.ts._wordMute.muteWords }}</span>
+        <template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
+      </MkTextarea>
+    </div>
+    <MkButton primary inline :disabled="!changed" @click="save()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -23,71 +23,70 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 
 const props = defineProps<{
-	muted: (string[] | string)[];
+  muted: (string[] | string)[];
 }>();
 
 const emit = defineEmits<{
-	(ev: 'save', value: (string[] | string)[]): void;
+  (ev: 'save', value: (string[] | string)[]): void;
 }>();
 
 const render = (mutedWords) => mutedWords.map(x => {
-	if (Array.isArray(x)) {
-		return x.join(' ');
-	} else {
-		return x;
-	}
+  if (Array.isArray(x)) {
+    return x.join(' ');
+  } else {
+    return x;
+  }
 }).join('\n');
 
-const tab = ref('soft');
-const mutedWords = ref(render($i!.mutedWords));
+const mutedWords = ref(render(props.muted));
 const changed = ref(false);
 
 watch(mutedWords, () => {
-	changed.value = true;
+  changed.value = true;
 });
 
 async function save() {
-	const parseMutes = (mutes) => {
-		// split into lines, remove empty lines and unnecessary whitespace
-		let lines = mutes.trim().split('\n').map(line => line.trim()).filter(line => line !== '');
+  const parseMutes = (mutes) => {
+    // split into lines, remove empty lines and unnecessary whitespace
+    let lines = mutes.trim().split('\n').map(line => line.trim()).filter(line => line !== '');
 
-		// check each line if it is a RegExp or not
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-			const regexp = line.match(/^\/(.+)\/(.*)$/);
-			if (regexp) {
-				// check that the RegExp is valid
-				try {
-					new RegExp(regexp[1], regexp[2]);
-					// note that regex lines will not be split by spaces!
-				} catch (err: any) {
-					// invalid syntax: do not save, do not reset changed flag
-					os.alert({
-						type: 'error',
-						title: i18n.ts.regexpError,
-						text: i18n.t('regexpErrorDescription', { tab: 'word mute', line: i + 1 }) + '\n' + err.toString(),
-					});
-					// re-throw error so these invalid settings are not saved
-					throw err;
-				}
-			} else {
-				lines[i] = line.split(' ');
-			}
-		}
+    // check each line if it is a RegExp or not
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const regexp = line.match(/^\/(.+)\/(.*)$/);
+      if (regexp) {
+        // check that the RegExp is valid
+        try {
+          new RegExp(regexp[1], regexp[2]);
+          // note that regex lines will not be split by spaces!
+        } catch (err: any) {
+          // invalid syntax: do not save, do not reset changed flag
+          os.alert({
+            type: 'error',
+            title: i18n.ts.regexpError,
+            text: i18n.t('regexpErrorDescription', { tab: 'word mute', line: i + 1 }) + '\n' + err.toString(),
+          });
+          // re-throw error so these invalid settings are not saved
+          throw err;
+        }
+      } else {
+        lines[i] = line.split(' ');
+      }
+    }
 
-		return lines;
-	};
+    return lines;
+  };
 
-	let parsed;
-	try {
-		parsed = parseMutes(mutedWords.value);
-	} catch (err) {
-		// already displayed error message in parseMutes
-		return;
-	}
+  let parsed;
+  try {
+    parsed = parseMutes(mutedWords.value);
+  } catch (err) {
+    // already displayed error message in parseMutes
+    return;
+  }
 
-	emit('save', parsed);
+  emit('save', parsed);
 
-	changed.value = false;
+  changed.value = false;
 }
 </script>