fix: iroiro

neos-love · Jul 21, 2023 · 2dafa88 · 2dafa88
1 parent 24580fd
commit 2dafa88
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -1875,7 +1875,10 @@ export interface Locale {
     "_widgets": {
         "profile": string;
         "instanceInfo": string;
+        "neosUserCount": string;
+        "neosEvent": string;
         "memo": string;
+        "memo2": string;
         "notifications": string;
         "timeline": string;
         "calendar": string;

diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
@@ -31,11 +31,11 @@
 		</MkButton>
 	</div>
 </template>
-<div v-else :class="$style.urlPreview">
-	<component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
 <suspense v-else-if="neosWorldRecordId || neosSessionId">
 	<NeosUrlPreview :compact="compact" :neos-session-id="neosSessionId" :neos-world-record-id="neosWorldRecordId" />
 </suspense>
+<div v-else :class="$style.urlPreview">
+	<component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
 		<div v-if="thumbnail" :class="$style.thumbnail" :style="`background-image: url('${thumbnail}')`">
 		</div>
 		<article :class="$style.body">
@@ -74,15 +74,15 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, onUnmounted } from 'vue';
-import type { summaly } from 'summaly';
-import { url as local } from '@/config';
-import { i18n } from '@/i18n';
+import {defineAsyncComponent, onUnmounted} from 'vue';
+import type {summaly} from 'summaly';
+import {url as local} from '@/config';
+import {i18n} from '@/i18n';
 import * as os from '@/os';
-import { deviceKind } from '@/scripts/device-kind';
+import {deviceKind} from '@/scripts/device-kind';
 import MkButton from '@/components/MkButton.vue';
-import { versatileLang } from '@/scripts/intl-const';
-import { defaultStore } from '@/store';
+import {versatileLang} from '@/scripts/intl-const';
+import {defaultStore} from '@/store';
 import NeosUrlPreview from "@/components/custom/NeosUrlPreview.vue";
 
 type SummalyResult = Awaited<ReturnType<typeof summaly>>;
@@ -126,8 +126,6 @@ let tweetHeight = $ref(150);
 let unknownUrl = $ref(false);
 
 
-
-
 const requestUrl = new URL(props.url);
 if (!['http:', 'https:'].includes(requestUrl.protocol)) throw new Error('invalid url');
 

diff --git a/packages/frontend/src/pages/neos/direct-upload.vue b/packages/frontend/src/pages/neos/direct-upload.vue
@@ -7,14 +7,13 @@
 <script lang="ts" setup>
 import { nextTick, ref } from 'vue';
 import * as misskey from 'misskey-js';
-import { Channel, DriveFile, Note, User } from 'misskey-js/built/entities';
-import { stream } from '@/stream';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
-import { getAccounts, incNotesCount, notesCount } from '@/account';
+import { getAccounts } from '@/account';
+import { useStream } from "@/stream";
 
 const marker = Math.random().toString();
-const connection = stream.useChannel('main');
+const connection = useStream().useChannel('main');
 
 const text = ref<string>('direct-upload!!');