From b462e9d1fcdbc7e8b207896a50288e809f14746c Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 27 Jul 2023 00:44:38 +0200
Subject: [PATCH] chore: code reformat

---
 .../backend/src/models/repositories/note.ts   |   3 +-
 .../mastodon/ApiMastodonCompatibleService.ts  |  27 ++--
 .../src/server/api/mastodon/endpoints/meta.ts |  16 +-
 .../src/components/MkDateSeparatedList.vue    |   2 +-
 .../client/src/components/MkPageWindow.vue    |  20 +--
 packages/client/src/pages/about-firefish.vue  |   4 +-
 .../client/src/pages/settings/general.vue     |   3 +-
 packages/client/src/pages/settings/navbar.vue | 144 ++++++++++++------
 8 files changed, 141 insertions(+), 78 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index ecd5ead6d..25b8e8083 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -295,8 +295,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 	): Promise<Packed<"Note"> | undefined> {
 		try {
 			return await this.pack(src, me, options);
-		}
-		catch {
+		} catch {
 			return undefined;
 		}
 	},
diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index bd868c64b..44485ac42 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -8,7 +8,11 @@ import { apiTimelineMastodon } from "./endpoints/timeline.js";
 import { apiNotificationsMastodon } from "./endpoints/notifications.js";
 import { apiSearchMastodon } from "./endpoints/search.js";
 import { getInstance } from "./endpoints/meta.js";
-import {convertAccount, convertAnnouncement, convertFilter} from "./converters.js";
+import {
+	convertAccount,
+	convertAnnouncement,
+	convertFilter,
+} from "./converters.js";
 import { convertId, IdType } from "../index.js";
 import { Users } from "@/models/index.js";
 import { IsNull } from "typeorm";
@@ -55,15 +59,18 @@ export function apiMastodonCompatible(router: Router): void {
 		try {
 			const data = await client.getInstance();
 			const admin = await Users.findOne({
-					where: {
-						host: IsNull(),
-						isAdmin: true,
-						isDeleted: false,
-						isSuspended: false,
-					},
-					order: { id: "ASC" },
-				});
-			const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id)).data);
+				where: {
+					host: IsNull(),
+					isAdmin: true,
+					isDeleted: false,
+					isSuspended: false,
+				},
+				order: { id: "ASC" },
+			});
+			const contact =
+				admin == null
+					? null
+					: convertAccount((await client.getAccount(admin.id)).data);
 			ctx.body = await getInstance(data.data, contact);
 		} catch (e: any) {
 			console.error(e);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 100ff4be4..c8556aa6b 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -6,13 +6,15 @@ import { IsNull } from "typeorm";
 import { MAX_NOTE_TEXT_LENGTH, FILE_TYPE_BROWSERSAFE } from "@/const.js";
 
 // TODO: add iceshrimp features
-export async function getInstance(response: Entity.Instance, contact: Entity.Account) {
-	const [meta, totalUsers, totalStatuses] =
-		await Promise.all([
-			fetchMeta(true),
-			Users.count({ where: { host: IsNull() } }),
-			Notes.count({ where: { userHost: IsNull() } }),
-		]);
+export async function getInstance(
+	response: Entity.Instance,
+	contact: Entity.Account,
+) {
+	const [meta, totalUsers, totalStatuses] = await Promise.all([
+		fetchMeta(true),
+		Users.count({ where: { host: IsNull() } }),
+		Notes.count({ where: { userHost: IsNull() } }),
+	]);
 
 	return {
 		uri: response.uri,
diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index d84b5ba58..19461a93d 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -26,7 +26,7 @@ export default defineComponent({
 			type: Boolean,
 			required: false,
 			default: false,
-		}
+		},
 	},
 
 	setup(props, { slots, expose }) {
diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index b6a1999fe..88da05ffa 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -78,16 +78,16 @@ const buttonsLeft = $computed(() => {
 });
 const buttonsRight = $computed(() => {
 	const buttons = [
-	{
-		icon: 'ph-arrow-clockwise ph-bold ph-lg',
-		title: i18n.ts.reload,
-		onClick: reload,
-	}, 
-	{
-		icon: "ph-arrows-out-simple ph-bold ph-lg",
-		title: i18n.ts.showInPage,
-		onClick: expand,
-	},
+		{
+			icon: "ph-arrow-clockwise ph-bold ph-lg",
+			title: i18n.ts.reload,
+			onClick: reload,
+		},
+		{
+			icon: "ph-arrows-out-simple ph-bold ph-lg",
+			title: i18n.ts.showInPage,
+			onClick: expand,
+		},
 	];
 
 	return buttons;
diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue
index c02da0dad..b41f47825 100644
--- a/packages/client/src/pages/about-firefish.vue
+++ b/packages/client/src/pages/about-firefish.vue
@@ -64,7 +64,9 @@
 									><i class="ph-code ph-bold ph-lg"></i
 								></template>
 								{{ i18n.ts._aboutIceshrimp.source }}
-								<template #suffix>Iceshrimp development</template>
+								<template #suffix
+									>Iceshrimp development</template
+								>
 							</FormLink>
 						</div>
 					</FormSection>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 4a8c8d198..6865b7cdc 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -8,7 +8,8 @@
 			<template #caption>
 				<I18n :src="i18n.ts.i18nInfo" tag="span">
 					<template #link>
-						<MkLink url="https://hosted.weblate.org/engage/firefish/"
+						<MkLink
+							url="https://hosted.weblate.org/engage/firefish/"
 							>Weblate</MkLink
 						>
 					</template>
diff --git a/packages/client/src/pages/settings/navbar.vue b/packages/client/src/pages/settings/navbar.vue
index 68096ee37..d192a5e95 100644
--- a/packages/client/src/pages/settings/navbar.vue
+++ b/packages/client/src/pages/settings/navbar.vue
@@ -8,64 +8,103 @@
 					itemKey="id"
 					:animation="150"
 					:handle="'.' + $style.itemHandle"
-					@start="e => e.item.classList.add('active')"
-					@end="e => e.item.classList.remove('active')"
+					@start="(e) => e.item.classList.add('active')"
+					@end="(e) => e.item.classList.remove('active')"
 				>
-					<template #item="{element,index}">
+					<template #item="{ element, index }">
 						<div
-							v-if="element.type === '-' || navbarItemDef[element.type]"
+							v-if="
+								element.type === '-' ||
+								navbarItemDef[element.type]
+							"
 							:class="$style.item"
 						>
-							<button class="_button" :class="$style.itemHandle"><i class="ph-list ph-bold ph-lg"></i></button>
-							<i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[element.type]?.icon]"></i><span :class="$style.itemText">{{ i18n.ts[navbarItemDef[element.type]?.title] ?? i18n.ts.divider }}</span>
-							<button class="_button" :class="$style.itemRemove" @click="removeItem(index)"><i class="ph-x ph-bold ph-lg"></i></button>
+							<button class="_button" :class="$style.itemHandle">
+								<i class="ph-list ph-bold ph-lg"></i>
+							</button>
+							<i
+								class="ti-fw"
+								:class="[
+									$style.itemIcon,
+									navbarItemDef[element.type]?.icon,
+								]"
+							></i
+							><span :class="$style.itemText">{{
+								i18n.ts[navbarItemDef[element.type]?.title] ??
+								i18n.ts.divider
+							}}</span>
+							<button
+								class="_button"
+								:class="$style.itemRemove"
+								@click="removeItem(index)"
+							>
+								<i class="ph-x ph-bold ph-lg"></i>
+							</button>
 						</div>
 					</template>
 				</Sortable>
 			</MkContainer>
 		</FormSlot>
 		<div class="buttons">
-			<MkButton inline @click="addItem"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addItem }}</MkButton>
-			<MkButton inline danger @click="reset"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</MkButton>
-			<MkButton inline primary class="save" @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+			<MkButton inline @click="addItem"
+				><i class="ph-plus ph-bold ph-lg"></i>
+				{{ i18n.ts.addItem }}</MkButton
+			>
+			<MkButton inline danger @click="reset"
+				><i class="ph-arrow-clockwise ph-bold ph-lg"></i>
+				{{ i18n.ts.default }}</MkButton
+			>
+			<MkButton inline primary class="save" @click="save"
+				><i class="ph-floppy-disk ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}</MkButton
+			>
 		</div>
-	
+
 		<FormRadios v-model="menuDisplay">
 			<template #label>{{ i18n.ts.display }}</template>
-			<option value="sideFull">{{ i18n.ts._menuDisplay.sideFull }}</option>
-			<option value="sideIcon">{{ i18n.ts._menuDisplay.sideIcon }}</option>
+			<option value="sideFull">
+				{{ i18n.ts._menuDisplay.sideFull }}
+			</option>
+			<option value="sideIcon">
+				{{ i18n.ts._menuDisplay.sideIcon }}
+			</option>
 			<!--<option value="top">{{ i18n.ts._menuDisplay.top }}</option>-->
-			<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
+			<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>-->
+			<!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
 		</FormRadios>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, ref, watch } from "vue";
 import FormRadios from "@/components/form/radios.vue";
-import MkButton from '@/components/MkButton.vue';
-import FormSlot from '@/components/form/slot.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { defaultStore } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deepClone } from '@/scripts/clone';
+import MkButton from "@/components/MkButton.vue";
+import FormSlot from "@/components/form/slot.vue";
+import MkContainer from "@/components/MkContainer.vue";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { defaultStore } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deepClone } from "@/scripts/clone";
 
-const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
+const Sortable = defineAsyncComponent(() =>
+	import("vuedraggable").then((x) => x.default),
+);
 
-const items = ref(defaultStore.state.menu.map(x => ({
-	id: Math.random().toString(),
-	type: x,
-})));
+const items = ref(
+	defaultStore.state.menu.map((x) => ({
+		id: Math.random().toString(),
+		type: x,
+	})),
+);
 
-const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
+const menuDisplay = computed(defaultStore.makeGetterSetter("menuDisplay"));
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.reloadToApplySetting,
 	});
 	if (canceled) return;
@@ -74,20 +113,30 @@ async function reloadAsk() {
 }
 
 async function addItem() {
-	const menu = Object.keys(navbarItemDef).filter(k => !defaultStore.state.menu.includes(k));
+	const menu = Object.keys(navbarItemDef).filter(
+		(k) => !defaultStore.state.menu.includes(k),
+	);
 	const { canceled, result: item } = await os.select({
 		title: i18n.ts.addItem,
-		items: [...menu.map(k => ({
-			value: k, text: i18n.ts[navbarItemDef[k].title],
-		})), {
-			value: '-', text: i18n.ts.divider,
-		}],
+		items: [
+			...menu.map((k) => ({
+				value: k,
+				text: i18n.ts[navbarItemDef[k].title],
+			})),
+			{
+				value: "-",
+				text: i18n.ts.divider,
+			},
+		],
 	});
 	if (canceled) return;
-	items.value = [...items.value, {
-		id: Math.random().toString(),
-		type: item,
-	}];
+	items.value = [
+		...items.value,
+		{
+			id: Math.random().toString(),
+			type: item,
+		},
+	];
 }
 
 function removeItem(index: number) {
@@ -95,12 +144,15 @@ function removeItem(index: number) {
 }
 
 async function save() {
-	defaultStore.set('menu', items.value.map(x => x.type));
+	defaultStore.set(
+		"menu",
+		items.value.map((x) => x.type),
+	);
 	await reloadAsk();
 }
 
 function reset() {
-	items.value = defaultStore.def.menu.default.map(x => ({
+	items.value = defaultStore.def.menu.default.map((x) => ({
 		id: Math.random().toString(),
 		type: x,
 	}));
@@ -116,7 +168,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.navbar,
-	icon: 'ti ti-list',
+	icon: "ti ti-list",
 });
 </script>
 
@@ -159,4 +211,4 @@ definePageMetadata({
 	margin: 0 8px;
 	opacity: 0.5;
 }
-</style>
\ No newline at end of file
+</style>