diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index 562a9e5422..d89dd2499e 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -1,12 +1,12 @@ -import type * as firefish from "firefish-js"; -import { defineAsyncComponent } from "vue"; -import { i18n } from "./i18n"; import { apiUrl } from "@/config"; import { alert, api, popup, popupMenu, waiting } from "@/os"; import { $i } from "@/reactiveAccount"; import icon from "@/scripts/icon"; import { del, get, set } from "@/scripts/idb-proxy"; import { reloadChannel, unisonReload } from "@/scripts/unison-reload"; +import type * as firefish from "firefish-js"; +import { defineAsyncComponent } from "vue"; +import { i18n } from "./i18n"; // TODO: 他のタブと永続化されたstateを同期 diff --git a/packages/client/src/i18n.ts b/packages/client/src/i18n.ts index 5b0a7f9ed8..31a6686f1a 100644 --- a/packages/client/src/i18n.ts +++ b/packages/client/src/i18n.ts @@ -1,6 +1,6 @@ -import { markRaw } from "vue"; import { locale } from "@/config"; import { I18n } from "@/scripts/i18n"; +import { markRaw } from "vue"; export const i18n = markRaw(new I18n(locale)); diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index b758b4c99e..be93c75fba 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -22,6 +22,7 @@ if (accounts) { } // #endregion +import { set } from "@/scripts/idb-proxy"; import { compareVersions } from "compare-versions"; import { computed, @@ -31,7 +32,6 @@ import { version as vueVersion, watch, } from "vue"; -import { set } from "@/scripts/idb-proxy"; import { login, refreshAccount, signout, updateAccount } from "@/account"; import components from "@/components"; diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index 55cfab5bba..7a120c5208 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -1,4 +1,3 @@ -import { computed, reactive } from "vue"; import { ui } from "@/config"; import { i18n } from "@/i18n"; import * as os from "@/os"; @@ -6,6 +5,7 @@ import { $i } from "@/reactiveAccount"; import icon from "@/scripts/icon"; import { search } from "@/scripts/search"; import { unisonReload } from "@/scripts/unison-reload"; +import { computed, reactive } from "vue"; export const navbarItemDef = reactive({ notifications: { diff --git a/packages/client/src/nirax.ts b/packages/client/src/nirax.ts index 800d47042c..ed1a57bbf4 100644 --- a/packages/client/src/nirax.ts +++ b/packages/client/src/nirax.ts @@ -1,10 +1,10 @@ // NIRAX --- A lightweight router +import { pleaseLogin } from "@/scripts/please-login"; +import { safeURIDecode } from "@/scripts/safe-uri-decode"; import { EventEmitter } from "eventemitter3"; import type { Component, ShallowRef } from "vue"; import { shallowRef } from "vue"; -import { safeURIDecode } from "@/scripts/safe-uri-decode"; -import { pleaseLogin } from "@/scripts/please-login"; interface RouteDef { path: string; diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index d367dc2fc9..022cd1bd81 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -1,18 +1,18 @@ // TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する +import MkDialog from "@/components/MkDialog.vue"; +import MkPostFormDialog from "@/components/MkPostFormDialog.vue"; +import MkToast from "@/components/MkToast.vue"; +import MkWaitingDialog from "@/components/MkWaitingDialog.vue"; +import { url, apiUrl } from "@/config"; +import { $i } from "@/reactiveAccount"; +import type { MenuItem } from "@/types/menu"; import { EventEmitter } from "eventemitter3"; import * as firefish from "firefish-js"; import insertTextAtCursor from "insert-text-at-cursor"; import type { Component, Ref } from "vue"; import { defineAsyncComponent, markRaw, ref } from "vue"; import { i18n } from "./i18n"; -import MkDialog from "@/components/MkDialog.vue"; -import MkPostFormDialog from "@/components/MkPostFormDialog.vue"; -import MkToast from "@/components/MkToast.vue"; -import MkWaitingDialog from "@/components/MkWaitingDialog.vue"; -import { apiUrl, url } from "@/config"; -import { $i } from "@/reactiveAccount"; -import type { MenuItem } from "@/types/menu"; export const pendingApiRequestsCount = ref(0); diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index a16c8067f6..489a740ef9 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -1,10 +1,10 @@ // PIZZAX --- A lightweight store +import { $i } from "@/reactiveAccount"; import type { Ref } from "vue"; import { onUnmounted, ref, watch } from "vue"; import { api } from "./os"; import { stream } from "./stream"; -import { $i } from "@/reactiveAccount"; type StateDef = Record< string, diff --git a/packages/client/src/plugin.ts b/packages/client/src/plugin.ts index c38aaa365a..2789cc7937 100644 --- a/packages/client/src/plugin.ts +++ b/packages/client/src/plugin.ts @@ -1,4 +1,3 @@ -import { Interpreter, Parser, utils, values } from "@syuilo/aiscript"; import { inputText } from "@/os"; import { createAiScriptEnv } from "@/scripts/aiscript/api"; import { @@ -8,6 +7,7 @@ import { postFormActions, userActions, } from "@/store"; +import { Interpreter, Parser, utils, values } from "@syuilo/aiscript"; const parser = new Parser(); const pluginContexts = new Map(); diff --git a/packages/client/src/reactiveAccount.ts b/packages/client/src/reactiveAccount.ts index 46ff249926..c192cdb7c3 100644 --- a/packages/client/src/reactiveAccount.ts +++ b/packages/client/src/reactiveAccount.ts @@ -1,5 +1,5 @@ -import { reactive } from "vue"; import type { Account } from "@/account"; +import { reactive } from "vue"; const accountData = localStorage.getItem("account"); diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 5dff5a4ba8..c1aaeb5b91 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -1,10 +1,10 @@ -import type { AsyncComponentLoader } from "vue"; -import { defineAsyncComponent, inject } from "vue"; import { iAmModerator } from "@/account"; import { Router } from "@/nirax"; import MkError from "@/pages/_error_.vue"; import MkLoading from "@/pages/_loading_.vue"; import { $i } from "@/reactiveAccount"; +import type { AsyncComponentLoader } from "vue"; +import { defineAsyncComponent, inject } from "vue"; // import { api } from "@/os"; // function getGuestTimelineStatus() { diff --git a/packages/client/src/stream.ts b/packages/client/src/stream.ts index f0dd1879a2..a1a9fbf78d 100644 --- a/packages/client/src/stream.ts +++ b/packages/client/src/stream.ts @@ -1,7 +1,7 @@ -import * as firefish from "firefish-js"; -import { markRaw } from "vue"; import { url } from "@/config"; import { $i } from "@/reactiveAccount"; +import * as firefish from "firefish-js"; +import { markRaw } from "vue"; export const stream = markRaw( new firefish.Stream( diff --git a/packages/client/src/theme-store.ts b/packages/client/src/theme-store.ts index 866ba064c4..a60d8e8c69 100644 --- a/packages/client/src/theme-store.ts +++ b/packages/client/src/theme-store.ts @@ -1,6 +1,6 @@ -import type { Theme } from "./scripts/theme"; import { api } from "@/os"; import { $i } from "@/reactiveAccount"; +import type { Theme } from "./scripts/theme"; const lsCacheKey = $i ? `themes:${$i.id}` : ""; diff --git a/packages/firefish-js/src/api.types.ts b/packages/firefish-js/src/api.types.ts index 626bdaad02..c2344991d8 100644 --- a/packages/firefish-js/src/api.types.ts +++ b/packages/firefish-js/src/api.types.ts @@ -11,30 +11,30 @@ import { DetailedInstanceMetadata, DriveFile, DriveFolder, + FollowRequest, Following, FollowingFolloweePopulated, FollowingFollowerPopulated, - FollowRequest, GalleryPost, Instance, InstanceMetadata, LiteInstanceMetadata, MeDetailed, + MessagingMessage, Note, NoteFavorite, + NoteReaction, + Notification, OriginType, Page, ServerInfo, + Signin, Stats, User, UserDetailed, UserGroup, UserList, UserSorting, - Notification, - NoteReaction, - Signin, - MessagingMessage, } from "./entities"; type TODO = Record | null; diff --git a/packages/firefish-js/src/index.ts b/packages/firefish-js/src/index.ts index 128ed8c535..c0212f8501 100644 --- a/packages/firefish-js/src/index.ts +++ b/packages/firefish-js/src/index.ts @@ -1,8 +1,8 @@ +import { Acct } from "./acct"; import { Endpoints } from "./api.types"; +import * as consts from "./consts"; import Stream, { Connection } from "./streaming"; import { Channels } from "./streaming.types"; -import { Acct } from "./acct"; -import * as consts from "./consts"; export { Endpoints, Stream, Connection as ChannelConnection, Channels, Acct }; diff --git a/packages/firefish-js/src/streaming.ts b/packages/firefish-js/src/streaming.ts index 4697acabd7..b3c2819d4f 100644 --- a/packages/firefish-js/src/streaming.ts +++ b/packages/firefish-js/src/streaming.ts @@ -27,9 +27,9 @@ export function urlQuery( const params = Object.entries(obj) .filter(([, v]) => (Array.isArray(v) ? v.length : v !== undefined)) .reduce( - // rome-ignore lint/suspicious/noAssignInExpressions: - // rome-ignore lint/style/noNonNullAssertion: <> - // rome-ignore lint/style/noCommaOperator: <> + // biome-ignore lint/suspicious/noAssignInExpressions: + // biome-ignore lint/style/noNonNullAssertion: <> + // biome-ignore lint/style/noCommaOperator: <> (a, [k, v]) => ((a[k] = v!), a), {} as Record, ); diff --git a/packages/megalodon/src/index.ts b/packages/megalodon/src/index.ts index 758d3a46ad..c205988721 100644 --- a/packages/megalodon/src/index.ts +++ b/packages/megalodon/src/index.ts @@ -1,17 +1,17 @@ -import Response from "./response"; -import OAuth from "./oauth"; -import { isCancel, RequestCanceledError } from "./cancel"; -import { ProxyConfig } from "./proxy_config"; +import { RequestCanceledError, isCancel } from "./cancel"; +import Converter from "./converter"; +import Entity from "./entity"; +import FilterContext from "./filter_context"; import generator, { - detector, MegalodonInterface, WebSocketInterface, + detector, } from "./megalodon"; import Misskey from "./misskey"; -import Entity from "./entity"; import NotificationType from "./notification"; -import FilterContext from "./filter_context"; -import Converter from "./converter"; +import OAuth from "./oauth"; +import { ProxyConfig } from "./proxy_config"; +import Response from "./response"; export { Response, diff --git a/packages/megalodon/src/megalodon.ts b/packages/megalodon/src/megalodon.ts index 33a5790f67..0b760fe87d 100644 --- a/packages/megalodon/src/megalodon.ts +++ b/packages/megalodon/src/megalodon.ts @@ -1,10 +1,10 @@ -import Response from "./response"; +import axios, { AxiosRequestConfig } from "axios"; +import { DEFAULT_UA } from "./default"; +import Entity from "./entity"; +import Misskey from "./misskey"; import OAuth from "./oauth"; import proxyAgent, { ProxyConfig } from "./proxy_config"; -import Entity from "./entity"; -import axios, { AxiosRequestConfig } from "axios"; -import Misskey from "./misskey"; -import { DEFAULT_UA } from "./default"; +import Response from "./response"; export interface WebSocketInterface { start(): void; diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts index 25922a2ffc..1c2c2ad6db 100644 --- a/packages/megalodon/src/misskey.ts +++ b/packages/megalodon/src/misskey.ts @@ -1,22 +1,22 @@ -import FormData from "form-data"; import AsyncLock from "async-lock"; +import FormData from "form-data"; -import MisskeyAPI from "./misskey/api_client"; +import fs from "node:fs"; +import MegalodonEntity from "@/entity"; import { DEFAULT_UA } from "./default"; -import { ProxyConfig } from "./proxy_config"; -import OAuth from "./oauth"; -import Response from "./response"; import Entity from "./entity"; import { - MegalodonInterface, - WebSocketInterface, - NoImplementedError, ArgumentError, + MegalodonInterface, + NoImplementedError, UnexpectedError, + WebSocketInterface, } from "./megalodon"; -import MegalodonEntity from "@/entity"; -import fs from "node:fs"; +import MisskeyAPI from "./misskey/api_client"; import MisskeyNotificationType from "./misskey/notification"; +import OAuth from "./oauth"; +import { ProxyConfig } from "./proxy_config"; +import Response from "./response"; type AccountCache = { locks: AsyncLock;