chore: lint

packages/client/src/components/MkAbuseReport.vue

@@ -67,12 +67,12 @@
 <script lang="ts" setup>
 import { ref } from "vue";
 
+import type { entities } from "firefish-js";
 import MkButton from "@/components/MkButton.vue";
 import MkSwitch from "@/components/form/switch.vue";
 import MkKeyValue from "@/components/MkKeyValue.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
-import type { entities } from "firefish-js";
 
 const props = defineProps<{
 	report: entities.AbuseUserReport;

packages/client/src/components/MkAnnouncement.vue

@@ -30,12 +30,12 @@
 
 <script lang="ts" setup>
 import { shallowRef } from "vue";
+import type { entities } from "firefish-js";
 import MkModal from "@/components/MkModal.vue";
 import MkSparkle from "@/components/MkSparkle.vue";
 import MkButton from "@/components/MkButton.vue";
 import { i18n } from "@/i18n";
 import * as os from "@/os";
-import type { entities } from "firefish-js";
 
 const props = defineProps<{
 	announcement: entities.Announcement;

packages/client/src/components/MkAvatars.vue

@@ -8,8 +8,8 @@
 
 <script lang="ts" setup>
 import { onMounted, ref } from "vue";
-import * as os from "@/os";
 import type { entities } from "firefish-js";
+import * as os from "@/os";
 
 const props = defineProps<{
 	userIds: string[];

packages/client/src/components/MkChannelFollowButton.vue

@@ -24,10 +24,10 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
+import type { entities } from "firefish-js";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const props = withDefaults(
 	defineProps<{

packages/client/src/components/MkChannelPreview.vue

@@ -52,9 +52,9 @@
 
 <script lang="ts" setup>
 import { computed } from "vue";
+import type { entities } from "firefish-js";
 import { i18n } from "@/i18n";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const props = defineProps<{
 	channel: entities.Channel;

packages/client/src/components/MkContainer.vue

@@ -1,5 +1,6 @@
 <template>
 	<div
+		ref="el"
 		v-size="{ max: [380] }"
 		class="ukygtjoj _panel"
 		:class="{
@@ -9,7 +10,6 @@
 			scrollable,
 			closed: !showBody,
 		}"
-		ref="el"
 	>
 		<header v-if="showHeader" ref="header">
 			<div class="title"><slot name="header"></slot></div>

packages/client/src/components/MkGalleryPostPreview.vue

@@ -33,9 +33,9 @@
 </template>
 
 <script lang="ts" setup>
+import type { entities } from "firefish-js";
 import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
 import { i18n } from "@/i18n";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	post: entities.GalleryPost;

packages/client/src/components/MkInstanceStats.vue

@@ -44,6 +44,7 @@
 <script lang="ts" setup>
 import { onMounted, ref, shallowRef } from "vue";
 import { Chart } from "chart.js";
+import type { entities } from "firefish-js";
 import MkSelect from "@/components/form/select.vue";
 import MkChart from "@/components/MkChart.vue";
 import { useChartTooltip } from "@/scripts/use-chart-tooltip";
@@ -52,7 +53,6 @@ import { i18n } from "@/i18n";
 import MkActiveUsersHeatmap from "@/components/MkActiveUsersHeatmap.vue";
 import MkFolder from "@/components/MkFolder.vue";
 import { initChart } from "@/scripts/init-chart";
-import type { entities } from "firefish-js";
 
 initChart();
 

packages/client/src/components/MkInstanceTicker.vue

@@ -17,10 +17,10 @@
 <script lang="ts" setup>
 import { ref } from "vue";
 
+import type { entities } from "firefish-js";
 import { instanceName, version } from "@/config";
 import { instance as Instance } from "@/instance";
 import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
-import type { entities } from "firefish-js";
 
 const props = defineProps<{
 	instance?: entities.InstanceLite;

packages/client/src/components/MkMediaCaption.vue

@@ -69,6 +69,7 @@
 import { computed, onBeforeUnmount, onMounted, ref } from "vue";
 import insertTextAtCursor from "insert-text-at-cursor";
 import { length } from "stringz";
+import type { entities } from "firefish-js";
 import * as os from "@/os";
 import MkModal from "@/components/MkModal.vue";
 import MkButton from "@/components/MkButton.vue";
@@ -76,7 +77,6 @@ import bytes from "@/filters/bytes";
 import number from "@/filters/number";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
-import type { entities } from "firefish-js";
 
 const props = withDefaults(
 	defineProps<{

packages/client/src/components/MkNotes.vue

@@ -40,12 +40,12 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
+import type { entities } from "firefish-js";
 import type {
 	MkPaginationType,
 	PagingKeyOf,
 	PagingOf,
 } from "@/components/MkPagination.vue";
-import type { entities } from "firefish-js";
 import XNote from "@/components/MkNote.vue";
 import XList from "@/components/MkDateSeparatedList.vue";
 import MkPagination from "@/components/MkPagination.vue";

packages/client/src/components/MkNotification.vue

@@ -272,6 +272,8 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, toRef, watch } from "vue";
 import type { entities } from "firefish-js";
+import type { Connection } from "firefish-js/src/streaming";
+import type { Channels } from "firefish-js/src/streaming.types";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import XReactionTooltip from "@/components/MkReactionTooltip.vue";
@@ -285,8 +287,6 @@ import { useTooltip } from "@/scripts/use-tooltip";
 import { defaultStore } from "@/store";
 import { instance } from "@/instance";
 import icon from "@/scripts/icon";
-import type { Connection } from "firefish-js/src/streaming";
-import type { Channels } from "firefish-js/src/streaming.types";
 
 const props = withDefaults(
 	defineProps<{

packages/client/src/components/MkNotificationToast.vue

@@ -16,10 +16,10 @@
 
 <script lang="ts" setup>
 import { onMounted, ref } from "vue";
+import type { entities } from "firefish-js";
 import XNotification from "@/components/MkNotification.vue";
 import * as os from "@/os";
 import { defaultStore } from "@/store";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	notification: entities.Notification;

packages/client/src/components/MkPagePreview.vue

@@ -34,9 +34,9 @@
 </template>
 
 <script lang="ts" setup>
+import type { entities } from "firefish-js";
 import { userName } from "@/filters/user";
 import { ui } from "@/config";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	page: entities.Page;

packages/client/src/components/MkReactionTooltip.vue

@@ -20,9 +20,9 @@
 
 <script lang="ts" setup>
 import type { Ref } from "vue";
+import type { entities } from "firefish-js";
 import MkTooltip from "./MkTooltip.vue";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	showing: Ref<boolean>;

packages/client/src/components/MkReactionsViewer.details.vue

@@ -3,8 +3,8 @@
 		ref="tooltip"
 		:target-element="targetElement"
 		:max-width="340"
-		@closed="emit('closed')"
 		:showing="showing"
+		@closed="emit('closed')"
 	>
 		<div class="bqxuuuey">
 			<div class="reaction">
@@ -31,9 +31,9 @@
 
 <script lang="ts" setup>
 import type { Ref } from "vue";
+import type { entities } from "firefish-js";
 import MkTooltip from "./MkTooltip.vue";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	showing: Ref<boolean>;

packages/client/src/components/MkSignin.vue

@@ -136,6 +136,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref } from "vue";
 import { toUnicode } from "punycode/";
+import type { entities } from "firefish-js";
 import MkButton from "@/components/MkButton.vue";
 import MkInput from "@/components/form/input.vue";
 import MkInfo from "@/components/MkInfo.vue";
@@ -145,7 +146,6 @@ import * as os from "@/os";
 import { signIn } from "@/account";
 import { i18n } from "@/i18n";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const signing = ref(false);
 const user = ref<entities.UserDetailed | null>(null);

packages/client/src/components/MkUserList.vue

@@ -26,6 +26,7 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
+import type { entities } from "firefish-js";
 import MkUserInfo from "@/components/MkUserInfo.vue";
 import type {
 	MkPaginationType,
@@ -34,7 +35,6 @@ import type {
 } from "@/components/MkPagination.vue";
 import MkPagination from "@/components/MkPagination.vue";
 import { i18n } from "@/i18n";
-import type { entities } from "firefish-js";
 
 defineProps<{
 	pagination: PagingOf<entities.UserDetailed>;

packages/client/src/components/MkUsersTooltip.vue

@@ -3,8 +3,8 @@
 		ref="tooltip"
 		:target-element="targetElement"
 		:max-width="250"
-		@closed="emit('closed')"
 		:showing="showing"
+		@closed="emit('closed')"
 	>
 		<div class="beaffaef">
 			<div v-for="u in users" :key="u.id" class="user">
@@ -20,8 +20,8 @@
 
 <script lang="ts" setup>
 import type { Ref } from "vue";
-import MkTooltip from "./MkTooltip.vue";
 import type { entities } from "firefish-js";
+import MkTooltip from "./MkTooltip.vue";
 
 defineProps<{
 	showing: Ref<boolean>;

packages/client/src/components/MkWaitingDialog.vue

@@ -29,7 +29,8 @@
 </template>
 
 <script lang="ts" setup>
-import { MaybeRef, shallowRef, watch, unref } from "vue";
+import type { MaybeRef } from "vue";
+import { shallowRef, unref, watch } from "vue";
 import MkModal from "@/components/MkModal.vue";
 import iconify from "@/scripts/icon";
 

packages/client/src/os.ts

@@ -1,7 +1,7 @@
 // TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する
 
 import { EventEmitter } from "eventemitter3";
-import { type entities, api as firefishApi, type Endpoints } from "firefish-js";
+import { type Endpoints, type entities, api as firefishApi } from "firefish-js";
 import insertTextAtCursor from "insert-text-at-cursor";
 import type { Component, Ref } from "vue";
 import { defineAsyncComponent, markRaw, ref } from "vue";
@@ -176,12 +176,12 @@ export function promiseDialog<T>(
 
 let popupIdCount = 0;
 
-type PopupType = {
+interface PopupType {
 	id: number;
 	component: Component;
 	props: Record<string, unknown>;
 	events: Record<string, unknown>;
-};
+}
 export const popups = ref<PopupType[]>([]);
 
 const zIndexes = {

packages/client/src/pages/admin/abuses.vue

@@ -93,6 +93,7 @@
 <script lang="ts" setup>
 import { computed, ref } from "vue";
 
+import type { entities } from "firefish-js";
 import MkSelect from "@/components/form/select.vue";
 import MkPagination, {
 	type MkPaginationType,
@@ -101,7 +102,6 @@ import XAbuseReport from "@/components/MkAbuseReport.vue";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const reports = ref<MkPaginationType<typeof pagination.endpoint> | null>(null);
 

packages/client/src/pages/channel-editor.vue

@@ -41,6 +41,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, watch } from "vue";
+import type { entities } from "firefish-js";
 import MkTextarea from "@/components/form/textarea.vue";
 import MkButton from "@/components/MkButton.vue";
 import MkInput from "@/components/form/input.vue";
@@ -50,7 +51,6 @@ import { useRouter } from "@/router";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from "@/i18n";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const router = useRouter();
 

packages/client/src/pages/channel.vue

@@ -96,6 +96,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, watch } from "vue";
+import type { entities } from "firefish-js";
 import XPostForm from "@/components/MkPostForm.vue";
 import XTimeline from "@/components/MkTimeline.vue";
 import XChannelFollowButton from "@/components/MkChannelFollowButton.vue";
@@ -105,7 +106,6 @@ import { me } from "@/me";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import icon from "@/scripts/icon";
-import type { entities } from "firefish-js";
 
 const router = useRouter();
 

packages/client/src/pages/channels.vue

@@ -112,6 +112,7 @@
 import { computed, onMounted, ref, watch } from "vue";
 import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
+import type { Swiper as SwiperType } from "swiper/types";
 import MkChannelList from "@/components/MkChannelList.vue";
 import MkInput from "@/components/form/input.vue";
 import MkRadios from "@/components/form/radios.vue";
@@ -125,7 +126,6 @@ import { defaultStore } from "@/store";
 import icon from "@/scripts/icon";
 import "swiper/scss";
 import "swiper/scss/virtual";
-import type { Swiper as SwiperType } from "swiper/types";
 
 const router = useRouter();
 

packages/client/src/pages/gallery/post.vue

@@ -150,6 +150,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, watch } from "vue";
+import type { entities } from "firefish-js";
 import MkButton from "@/components/MkButton.vue";
 import * as os from "@/os";
 import MkContainer from "@/components/MkContainer.vue";
@@ -164,7 +165,6 @@ import { shareAvailable } from "@/scripts/share-available";
 import { defaultStore } from "@/store";
 import icon from "@/scripts/icon";
 import { isSignedIn, me } from "@/me";
-import type { entities } from "firefish-js";
 
 const router = useRouter();
 

packages/client/src/pages/my-antennas/index.vue

@@ -54,7 +54,8 @@
 
 <script lang="ts" setup>
 import { computed, onActivated, onDeactivated, ref } from "vue";
-import MkPagination, { MkPaginationType } from "@/components/MkPagination.vue";
+import type { MkPaginationType } from "@/components/MkPagination.vue";
+import MkPagination from "@/components/MkPagination.vue";
 import MkButton from "@/components/MkButton.vue";
 import MkInfo from "@/components/MkInfo.vue";
 import { i18n } from "@/i18n";

packages/client/src/pages/note-history.vue

@@ -34,10 +34,10 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, ref } from "vue";
+import type { entities } from "firefish-js";
 import MkPagination, {
 	type MkPaginationType,
 } from "@/components/MkPagination.vue";
-import type { entities } from "firefish-js";
 import { api } from "@/os";
 import XList from "@/components/MkDateSeparatedList.vue";
 import XNote from "@/components/MkNote.vue";

packages/client/src/scripts/use-chart-tooltip.ts

@@ -1,13 +1,13 @@
 import { onDeactivated, onUnmounted, ref } from "vue";
+import type { Color, TooltipOptions } from "chart.js";
 import * as os from "@/os";
 import MkChartTooltip from "@/components/MkChartTooltip.vue";
-import type { Color, TooltipOptions } from "chart.js";
 
-type ToolTipSerie = {
+interface ToolTipSerie {
 	backgroundColor: Color;
 	borderColor: Color;
 	text: string;
-};
+}
 
 export function useChartTooltip(
 	opts: { position: "top" | "middle" } = { position: "top" },

packages/client/src/store.ts

@@ -1,8 +1,8 @@
 import { markRaw, ref } from "vue";
+import type { ApiTypes, entities } from "firefish-js";
 import { isSignedIn } from "./me";
 import { Storage } from "./pizzax";
 import type { NoteVisibility } from "@/types/note";
-import type { entities, ApiTypes } from "firefish-js";
 
 export const postFormActions: {
 	title: string;

packages/client/src/types/form.ts

@@ -1,9 +1,9 @@
-export type BaseFormItem = {
+export interface BaseFormItem {
 	hidden?: boolean;
 	label?: string;
 	description?: string;
 	required?: boolean;
-};
+}
 
 export type FormItemTextInput = BaseFormItem & {
 	type: "string";

packages/client/src/types/note.ts

@@ -2,7 +2,7 @@ import type { noteVisibilities } from "firefish-js";
 
 export type NoteVisibility = (typeof noteVisibilities)[number] | "private";
 
-export type NoteTranslation = {
+export interface NoteTranslation {
 	sourceLang: string;
 	text: string;
-};
+}

packages/client/src/types/post-form.ts

@@ -1,11 +1,11 @@
 import type { entities } from "firefish-js";
 
-export type PollType = {
+export interface PollType {
 	choices: string[];
 	multiple: boolean;
 	expiresAt: string | null;
 	expiredAfter: number | null;
-};
+}
 
 export type NoteDraft = entities.Note & {
 	poll?: PollType;