Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve waiting dialog

Browse source
This commit is contained in:
syuilo 2020-10-18 10:11:34 +09:00
parent 85a0f696bc
commit 1df7abfbb9
8 changed files with 110 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/client/scripts/search.ts
View file

@ -48,29 +48,18 @@ export async function search(q?: string | null | undefined) {
}
if (q.startsWith('https://')) {
/*
const dialog = os.dialog({
type: 'waiting',
text: i18n.global.t('fetchingAsApObject') + '...',
showOkButton: false,
showCancelButton: false,
cancelableByBgClick: false
const promise = os.api('ap/show', {
uri: q
});
*/
try {
const res = await os.api('ap/show', {
uri: q
});
//dialog.cancel();
if (res.type === 'User') {
router.push(`/@${res.object.username}@${res.object.host}`);
} else if (res.type === 'Note') {
router.push(`/notes/${res.object.id}`);
}
} catch (e) {
//dialog.cancel();
// TODO: Show error
os.promiseDialog(promise, null, null, i18n.global.t('fetchingAsApObject'));
const res = 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;