laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(frontend): 照会処理を統一 (#15536)

Browse Source 
* fix(frontend): 照会処理を統一

* fix

* doLookup -> apLookup
This commit is contained in:
かっこかり 2025-03-03 17:45:04 +09:00 committed by GitHub
parent 7fb8fccd57
commit 59567a7ccc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/frontend/src/pages/search.note.vue
View File

@ -120,6 +120,7 @@ import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js'; import { instance } from '@/instance.js';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/scripts/misskey-api.js';
import { apLookup } from '@/scripts/lookup.js';
import { useRouter } from '@/router/supplier.js'; import { useRouter } from '@/router/supplier.js';
import MkButton from '@/components/MkButton.vue'; import MkButton from '@/components/MkButton.vue';
import MkFoldableSection from '@/components/MkFoldableSection.vue'; import MkFoldableSection from '@/components/MkFoldableSection.vue';
@ -260,13 +261,7 @@ async function search() {
text: i18n.ts.lookupConfirm, text: i18n.ts.lookupConfirm,
}); });
if (!confirm.canceled) { if (!confirm.canceled) {
const promise = misskeyApi('ap/show', { const res = await apLookup(searchParams.value.query);
uri: searchParams.value.query,
});
os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
const res = await promise;
if (res.type === 'User') { if (res.type === 'User') {
router.push(`/@${res.object.username}@${res.object.host}`); router.push(`/@${res.object.username}@${res.object.host}`);

24
packages/frontend/src/scripts/lookup.ts
View File

@ -29,6 +29,19 @@ export async function lookup(router?: Router) {
} }
if (query.startsWith('https://')) { if (query.startsWith('https://')) {
const res = await apLookup(query);
if (res.type === 'User') {
_router.push(`/@${res.object.username}@${res.object.host}`);
} else if (res.type === 'Note') {
_router.push(`/notes/${res.object.id}`);
}
return;
}
}
export async function apLookup(query: string) {
const promise = misskeyApi('ap/show', { const promise = misskeyApi('ap/show', {
uri: query, uri: query,
}); });
@ -67,14 +80,5 @@ export async function lookup(router?: Router) {
}); });
}, i18n.ts.fetchingAsApObject); }, i18n.ts.fetchingAsApObject);
const res = await promise; return await promise;
if (res.type === 'User') {
_router.push(`/@${res.object.username}@${res.object.host}`);
} else if (res.type === 'Note') {
_router.push(`/notes/${res.object.id}`);
}
return;
}
} }