diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-04-12 23:14:00 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-04-12 23:14:00 +0900 |
| commit | 69a05aa5de4d06ca327dc1ebcc1780ecdd74edb3 (patch) | |
| tree | e9c4099654df420f67865418394df9670f315816 /src | |
| parent | Tweak UI (diff) | |
| parent | Fix undefined user page title (#7436) (diff) | |
| download | sharkey-69a05aa5de4d06ca327dc1ebcc1780ecdd74edb3.tar.gz sharkey-69a05aa5de4d06ca327dc1ebcc1780ecdd74edb3.tar.bz2 sharkey-69a05aa5de4d06ca327dc1ebcc1780ecdd74edb3.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/components/global/acct.vue | 11 | ||||
| -rw-r--r-- | src/client/pages/user/index.vue | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/client/components/global/acct.vue b/src/client/components/global/acct.vue index e3601ff797..8354760651 100644 --- a/src/client/components/global/acct.vue +++ b/src/client/components/global/acct.vue @@ -11,7 +11,16 @@ import { toUnicode } from 'punycode/'; import { host } from '@client/config'; export default defineComponent({ - props: ['user', 'detail'], + props: { + user: { + type: Object, + required: true + }, + detail: { + type: Boolean, + default: false + }, + }, data() { return { host: toUnicode(host), diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue index 773fd4b282..55fb2198ea 100644 --- a/src/client/pages/user/index.vue +++ b/src/client/pages/user/index.vue @@ -271,6 +271,7 @@ export default defineComponent({ data() { return { [symbols.PAGE_INFO]: computed(() => this.user ? { + title: this.user.name ? `${this.user.name} (@${this.user.username})` : `@${this.user.username}`, userName: this.user, avatar: this.user, path: `/@${this.user.username}`, |