From 291cd65417de39d97118008c8c6ac7b79ccd1afd Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 19 Oct 2023 11:24:58 -0700 Subject: [PATCH 01/62] fix: :bug: icon in titleContainer --- packages/client/src/components/global/MkPageHeader.vue | 2 +- packages/client/src/pages/admin/_header_.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue index 78abe21b3e..f6f32fc2f9 100644 --- a/packages/client/src/components/global/MkPageHeader.vue +++ b/packages/client/src/components/global/MkPageHeader.vue @@ -43,7 +43,7 @@
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue index 0192a48c0d..6d2506a177 100644 --- a/packages/client/src/pages/admin/_header_.vue +++ b/packages/client/src/pages/admin/_header_.vue @@ -2,7 +2,7 @@
- +
diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue index 59d5a95343..3b736d39ec 100644 --- a/packages/client/src/pages/settings/plugin.install.vue +++ b/packages/client/src/pages/settings/plugin.install.vue @@ -21,6 +21,7 @@ import { defineAsyncComponent, nextTick, ref } from "vue"; import { Interpreter, Parser, utils } from "@syuilo/aiscript"; import { v4 as uuid } from "uuid"; +import { compareVersions } from "compare-versions"; import FormTextarea from "@/components/form/textarea.vue"; import FormButton from "@/components/MkButton.vue"; import FormInfo from "@/components/MkInfo.vue"; @@ -29,7 +30,6 @@ import { ColdDeviceStorage } from "@/store"; import { unisonReload } from "@/scripts/unison-reload"; import { i18n } from "@/i18n"; import { definePageMetadata } from "@/scripts/page-metadata"; -import { compareVersions } from "compare-versions"; import icon from "@/scripts/icon"; const code = ref(); diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index 527b62c470..474fe51b08 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -90,8 +90,8 @@ color: color.forPreview ? color.forPreview : theme.base === 'light' - ? '#5f5f5f' - : '#dadada', + ? '#5f5f5f' + : '#dadada', }" > A diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 05dcaa6abf..af5af76d84 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -270,12 +270,12 @@ definePageMetadata( src.value === "local" ? "ph-users ph-lg" : src.value === "social" - ? "ph-handshake ph-lg" - : src.value === "recommended" - ? "ph-thumbs-up ph-lg" - : src.value === "global" - ? "ph-planet ph-lg" - : "ph-house ph-lg", + ? "ph-handshake ph-lg" + : src.value === "recommended" + ? "ph-thumbs-up ph-lg" + : src.value === "global" + ? "ph-planet ph-lg" + : "ph-house ph-lg", })), ); diff --git a/packages/client/src/plugin.ts b/packages/client/src/plugin.ts index 44df90ff08..c38aaa365a 100644 --- a/packages/client/src/plugin.ts +++ b/packages/client/src/plugin.ts @@ -1,6 +1,6 @@ import { Interpreter, Parser, utils, values } from "@syuilo/aiscript"; -import { createAiScriptEnv } from "@/scripts/aiscript/api"; import { inputText } from "@/os"; +import { createAiScriptEnv } from "@/scripts/aiscript/api"; import { noteActions, notePostInterruptors, @@ -114,7 +114,10 @@ function createPluginEnv(opts) { }); }), "Plugin:register_page_view_interruptor": values.FN_NATIVE(([handler]) => { - registerPageViewInterruptor({ pluginId: opts.plugin.id, handler }); + registerPageViewInterruptor({ + pluginId: opts.plugin.id, + handler, + }); }), "Plugin:open_url": values.FN_NATIVE(([url]) => { window.open(url.value, "_blank"); diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 2f7446e68b..5dff5a4ba8 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 { Router } from "@/nirax"; import { iAmModerator } from "@/account"; -import { $i } from "@/reactiveAccount"; -import MkLoading from "@/pages/_loading_.vue"; +import { Router } from "@/nirax"; import MkError from "@/pages/_error_.vue"; +import MkLoading from "@/pages/_loading_.vue"; +import { $i } from "@/reactiveAccount"; // import { api } from "@/os"; // function getGuestTimelineStatus() { diff --git a/packages/client/src/scripts/autocomplete.ts b/packages/client/src/scripts/autocomplete.ts index 0d5d16f180..18e56ba38d 100644 --- a/packages/client/src/scripts/autocomplete.ts +++ b/packages/client/src/scripts/autocomplete.ts @@ -88,7 +88,11 @@ export class Autocomplete { const isHashtag = hashtagIndex !== -1; const isMfmTag = mfmTagIndex !== -1; const isEmoji = - emojiIndex !== -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(":"); + emojiIndex !== -1 && + text + .split(/:[a-z0-9_+\-]+:/) + .pop()! + .includes(":"); let opened = false; diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index 39dd533785..48885bac62 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -385,11 +385,11 @@ interface Plugin { ast: any[]; } +import darkTheme from "@/themes/d-rosepine.json5"; /** * Storage for configuration information that does not need to be constantly loaded into memory (non-reactive) */ import lightTheme from "@/themes/l-rosepinedawn.json5"; -import darkTheme from "@/themes/d-rosepine.json5"; export class ColdDeviceStorage { public static default = { diff --git a/packages/client/src/stream.ts b/packages/client/src/stream.ts index 28a8a26650..f0dd1879a2 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 { $i } from "@/reactiveAccount"; import { url } from "@/config"; +import { $i } from "@/reactiveAccount"; export const stream = markRaw( new firefish.Stream( diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue index 0f1469a0c1..a00f143d85 100644 --- a/packages/client/src/widgets/aiscript.vue +++ b/packages/client/src/widgets/aiscript.vue @@ -28,12 +28,12 @@