Misskey最新に追従

Type4ny-Project · Aug 29, 2024 · f5e307d · f5e307d
1 parent 5a7b311
commit f5e307d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 35 deletions.
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -5404,14 +5404,14 @@ export interface Locale extends ILocale {
      * 作成したアンテナ
      */
     "createdAntennas": string;
-    /**
-     * これ以上このクリップにノートを追加できません。
-     */
-    "clipNoteLimitExceeded": string;
     /**
      * デフォルトのプロファイルに追加する
      */
     "addToDefaultEmojiPicker": string;
+    /**
+     * これ以上このクリップにノートを追加できません。
+     */
+    "clipNoteLimitExceeded": string;
     "_delivery": {
         /**
          * 配信状態

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -138,12 +138,12 @@ import { deviceKind } from '@/scripts/device-kind.js';
 import { i18n } from '@/i18n.js';
 import { defaultStore } from '@/store.js';
 import { customEmojiCategories, customEmojis, customEmojisMap } from '@/custom-emojis.js';
-import { signinRequired } from '@/account.js';
 import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js';
 import { deepClone } from '@/scripts/clone.js';
 import MkCustomEmoji from '@/components/global/MkCustomEmoji.vue';
 import MkEmoji from '@/components/global/MkEmoji.vue';
-const $i = signinRequired();
+import { $i } from '@/account.js';
+
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;
 	pinnedEmojis?: string[];
@@ -160,7 +160,7 @@ const emit = defineEmits<{
 	(ev: 'chosen', v: string): void;
 	(ev: 'esc'): void;
 }>();
-const profileMax = $i.policies.emojiPickerProfileLimit;
+const profileMax = $i?.policies.emojiPickerProfileLimit;
 const searchEl = shallowRef<HTMLInputElement>();
 const emojisEl = shallowRef<HTMLDivElement>();
 

diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -10,10 +10,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import {defineAsyncComponent, shallowRef} from 'vue';
+import {shallowRef} from 'vue';
 import * as Misskey from 'misskey-js';
 import MkModal from '@/components/MkModal.vue';
-const MkPostForm = defineAsyncComponent(() => import('@/components/MkPostForm.vue'));
+import MkPostForm from '@/components/MkPostForm.vue';
 
 
 const props = withDefaults(defineProps<{

diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
@@ -196,32 +196,6 @@ const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
 const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
-onMounted(() => {
-	if (
-		window.navigator.connection.type === 'cellular' &&
-      !defaultStore.state.enableUltimateDataSaverMode &&
-      defaultStore.state.enableCellularWithUltimateDataSaver
-	) {
-		defaultStore.state.enableDataSaverMode = true;
-		defaultStore.state.enableUltimateDataSaverMode = true;
-	} else if (window.navigator.connection.type !== 'cellular' && window.navigator.connection.type !== 'undefined' && defaultStore.state.enableDataSaverMode && defaultStore.state.enableCellularWithDataSaver) {
-		defaultStore.state.enableDataSaverMode = false;
-		defaultStore.state.enableUltimateDataSaverMode = true;
-	}
-
-	if (
-		window.navigator.connection.type === 'cellular' &&
-      !defaultStore.state.enableDataSaverMode &&
-      defaultStore.state.enableCellularWithDataSaver
-	) {
-		defaultStore.state.enableDataSaverMode = true;
-	} else if (window.navigator.connection.type !== 'cellular' && window.navigator.connection.type !== 'undefined' && defaultStore.state.enableDataSaverMode && defaultStore.state.enableCellularWithDataSaver) {
-		defaultStore.state.enableDataSaverMode = false;
-	}
-	if (defaultStore.state.enableUltimateDataSaverMode) {
-		defaultStore.state.enableDataSaverMode = true;
-	}
-});
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
 const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
 const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);