diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue index 79ca3321e4..f0921f91d6 100644 --- a/src/client/app/mobile/views/components/notification-preview.vue +++ b/src/client/app/mobile/views/components/notification-preview.vue @@ -3,7 +3,7 @@ @@ -11,7 +11,7 @@ @@ -19,7 +19,7 @@ @@ -27,14 +27,14 @@ @@ -42,7 +42,7 @@ @@ -50,7 +50,7 @@ @@ -64,17 +64,10 @@ import getUserName from '../../../../../renderers/get-user-name'; export default Vue.extend({ props: ['notification'], - computed: { - name() { - return getUserName(this.notification.user); - }, - noteerName() { - return getUserName(this.notification.note.user); - } - }, data() { return { - getNoteSummary + getNoteSummary, + getUserName }; } }); diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue index e1294a8778..4c98e19901 100644 --- a/src/client/app/mobile/views/components/notification.vue +++ b/src/client/app/mobile/views/components/notification.vue @@ -2,15 +2,15 @@
- + avatar

- {{ getUserName(notification.user) }} + {{ getUserName(notification.user) }}

- + %fa:quote-left%{{ getNoteSummary(notification.note) }} %fa:quote-right% @@ -19,15 +19,15 @@
- - avatar + + avatar

%fa:retweet% - {{ getUserName(notification.note.user) }} + {{ getUserName(notification.user) }}

- + %fa:quote-left%{{ getNoteSummary(notification.note.renote) }}%fa:quote-right%
@@ -39,13 +39,13 @@ @@ -60,15 +60,15 @@
- + avatar

%fa:chart-pie% - {{ getUserName(notification.user) }} + {{ getUserName(notification.user) }}

- + %fa:quote-left%{{ getNoteSummary(notification.note) }}%fa:quote-right%
@@ -84,20 +84,11 @@ import getUserName from '../../../../../renderers/get-user-name'; export default Vue.extend({ props: ['notification'], - computed: { - acct() { - return getAcct(this.notification.user); - }, - name() { - return getUserName(this.notification.user); - }, - noteerName() { - return getUserName(this.notification.note.user); - } - }, data() { return { - getNoteSummary + getNoteSummary, + getAcct, + getUserName }; } }); diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue index f33f209db1..aac8b628bc 100644 --- a/src/client/app/mobile/views/pages/user.vue +++ b/src/client/app/mobile/views/pages/user.vue @@ -12,8 +12,8 @@
-

{{ user }}

- @{{ acct }} +

{{ getUserName(user) }}

+ @{{ getAcct(user) }} %i18n:mobile.tags.mk-user.follows-you%
{{ user.description }}
@@ -30,11 +30,11 @@ {{ user.notesCount | number }} %i18n:mobile.tags.mk-user.notes% - + {{ user.followingCount | number }} %i18n:mobile.tags.mk-user.following% - + {{ user.followersCount | number }} %i18n:mobile.tags.mk-user.followers% @@ -60,6 +60,7 @@