moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Fix #5552 (#5579)

Browse Source
This commit is contained in:
MeiMei 2019-11-03 17:54:37 +09:00 committed by syuilo
parent 88ec15d4c7
commit 570931cff8
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/client/app/common/views/pages/follow.vue
View File

@ -72,11 +72,40 @@ export default Vue.extend({
const acct = new URL(location.href).searchParams.get('acct'); const acct = new URL(location.href).searchParams.get('acct');
this.fetching = true; this.fetching = true;
Progress.start(); Progress.start();
this.$root.api('users/show', parseAcct(acct)).then(user => { if (acct.match(/^https?:/)) {
this.user = user; this.$root.api('ap/show', {
uri: acct
}).then((res: { type: string, object: any }) => {
if (res.type !== 'User') {
this.$root.dialog({
type: 'error',
text: 'acct is not an user'
});
} else {
this.user = res.object;
}
}).catch((e: any) => {
this.$root.dialog({
type: 'error',
text: e.message
});
}).finally(() => {
this.fetching = false; this.fetching = false;
Progress.done(); Progress.done();
}); });
} else {
this.$root.api('users/show', parseAcct(acct)).then((user: any) => {
this.user = user;
}).catch((e: any) => {
this.$root.dialog({
type: 'error',
text: e.message
});
}).finally(() => {
this.fetching = false;
Progress.done();
});
}
}, },
async onClick() { async onClick() {