natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-11-04 20:44:05 +09:00
parent cc7fec4b9f 570931cff8
commit 072bc2d9fb
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');
this.fetching = true;
Progress.start();
this.$root.api('users/show', parseAcct(acct)).then(user => {
this.user = user;
if (acct.match(/^https?:/)) {
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;
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() {