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

This commit is contained in:
syuilo 2021-04-12 23:14:00 +09:00
commit 69a05aa5de
2 changed files with 11 additions and 1 deletions

View file

@ -11,7 +11,16 @@ import { toUnicode } from 'punycode/';
import { host } from '@client/config'; import { host } from '@client/config';
export default defineComponent({ export default defineComponent({
props: ['user', 'detail'], props: {
user: {
type: Object,
required: true
},
detail: {
type: Boolean,
default: false
},
},
data() { data() {
return { return {
host: toUnicode(host), host: toUnicode(host),

View file

@ -271,6 +271,7 @@ export default defineComponent({
data() { data() {
return { return {
[symbols.PAGE_INFO]: computed(() => this.user ? { [symbols.PAGE_INFO]: computed(() => this.user ? {
title: this.user.name ? `${this.user.name} (@${this.user.username})` : `@${this.user.username}`,
userName: this.user, userName: this.user,
avatar: this.user, avatar: this.user,
path: `/@${this.user.username}`, path: `/@${this.user.username}`,