From da6f07952b317792bed7f62b0cb1cabd91c2d39f Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Thu, 11 Apr 2024 16:55:39 +0800
Subject: [PATCH] rename client-types.ts -> note.ts; fix type importing
---
packages/client/src/components/MkPostForm.vue | 2 +-
packages/client/src/components/MkPostFormDialog.vue | 2 +-
packages/client/src/components/MkVisibilityPicker.vue | 6 ++----
packages/client/src/pages/share.vue | 6 ++----
packages/client/src/scripts/consts.ts | 2 +-
packages/client/src/store.ts | 2 +-
packages/client/src/types/{client-types.ts => note.ts} | 0
7 files changed, 8 insertions(+), 12 deletions(-)
rename packages/client/src/types/{client-types.ts => note.ts} (100%)
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 11cc812689..aeb51f7bf7 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -340,7 +340,7 @@ import {
import type { MenuItem } from "@/types/menu";
import icon from "@/scripts/icon";
import MkVisibilityPicker from "@/components/MkVisibilityPicker.vue";
-import type { NoteVisibility } from "@/types/client-types";
+import type { NoteVisibility } from "@/types/note";
const modal = inject("modal");
diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue
index 1f7eca0ba7..56f009c338 100644
--- a/packages/client/src/components/MkPostFormDialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -24,7 +24,7 @@ import { shallowRef } from "vue";
import type { entities, languages } from "firefish-js";
import MkModal from "@/components/MkModal.vue";
import MkPostForm from "@/components/MkPostForm.vue";
-import type { NoteVisibility } from "@/types/client-types";
+import type { NoteVisibility } from "@/types/note";
const props = defineProps<{
reply?: entities.Note;
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 746f609d31..0e6f8cb153 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -145,7 +145,7 @@ import { nextTick, ref, shallowRef, watch } from "vue";
import MkModal from "@/components/MkModal.vue";
import { i18n } from "@/i18n";
import icon from "@/scripts/icon";
-import type { NoteVisibility } from "@/types/client-types";
+import type { NoteVisibility } from "@/types/note";
const modal = shallowRef<InstanceType<typeof MkModal>>();
@@ -171,9 +171,7 @@ watch(localOnly, () => {
emit("changeLocalOnly", localOnly.value);
});
-function choose(
- visibility: NoteVisibility,
-): void {
+function choose(visibility: NoteVisibility): void {
v.value = visibility;
emit("changeVisibility", visibility);
nextTick(() => {
diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue
index 3933681d44..6b57aae360 100644
--- a/packages/client/src/pages/share.vue
+++ b/packages/client/src/pages/share.vue
@@ -42,7 +42,7 @@ import { mainRouter } from "@/router";
import { definePageMetadata } from "@/scripts/page-metadata";
import { i18n } from "@/i18n";
import icon from "@/scripts/icon";
-import type { NoteVisibility } from "@/types/client-types";
+import type { NoteVisibility } from "@/types/note";
import { noteVisibilitiesClient } from "@/scripts/consts";
const urlParams = new URLSearchParams(window.location.search);
@@ -57,9 +57,7 @@ const initialText = ref(null as string | null);
const reply = ref(null as entities.Note | null);
const renote = ref(null as entities.Note | null);
-function isVisibility(
- v: string | null,
-): v is NoteVisibility {
+function isVisibility(v: string | null): v is NoteVisibility {
if (v == null) return false;
return (noteVisibilitiesClient as readonly string[]).includes(v);
}
diff --git a/packages/client/src/scripts/consts.ts b/packages/client/src/scripts/consts.ts
index 62b884c840..dd8e03a1e4 100644
--- a/packages/client/src/scripts/consts.ts
+++ b/packages/client/src/scripts/consts.ts
@@ -1,5 +1,5 @@
import { noteVisibilities } from "firefish-js";
-import type { NoteVisibility } from "../types/client-types";
+import type { NoteVisibility } from "@/types/note";
export const noteVisibilitiesClient = (
noteVisibilities as readonly NoteVisibility[]
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index b1b6e237d2..9dcb305a43 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,6 +1,7 @@
import { markRaw, ref } from "vue";
import { isSignedIn } from "./me";
import { Storage } from "./pizzax";
+import type { NoteVisibility } from "@/types/note/note";
export const postFormActions = [];
export const userActions = [];
@@ -452,7 +453,6 @@ 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 { NoteVisibility } from "./types/client-types";
export class ColdDeviceStorage {
public static default = {
diff --git a/packages/client/src/types/client-types.ts b/packages/client/src/types/note.ts
similarity index 100%
rename from packages/client/src/types/client-types.ts
rename to packages/client/src/types/note.ts