diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
| commit | 91f93d4a55cbf927a6adee35dc184b09d1f9b75d (patch) | |
| tree | 882fb179fa7ed36e6c212a4874559b27a73f3d1e /src/components/status | |
| parent | 670abd633f97e75cf35981ee0f617d0be1b43816 (diff) | |
| parent | b4782ad159026e3fb50c476e5cf9d89176e441f4 (diff) | |
Merge branch 'develop' into 'feat/timeline-quick-settings'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 4 | ||||
| -rw-r--r-- | src/components/status/status.vue | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 2bf93a9e..470c01f1 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -136,7 +136,7 @@ const Status = { } }, retweet () { return !!this.statusoid.retweeted_status }, - retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name }, + retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name_ui }, retweeterHtml () { return this.statusoid.user.name_html }, retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) }, status () { @@ -216,7 +216,7 @@ const Status = { return this.status.in_reply_to_screen_name } else { const user = this.$store.getters.findUser(this.status.in_reply_to_user_id) - return user && user.screen_name + return user && user.screen_name_ui } }, replySubject () { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 6ee8117f..00e962f3 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -26,7 +26,7 @@ icon="retweet" /> <router-link :to="userProfileLink"> - {{ status.user.screen_name }} + {{ status.user.screen_name_ui }} </router-link> </small> <small @@ -156,10 +156,10 @@ </h4> <router-link class="account-name" - :title="status.user.screen_name" + :title="status.user.screen_name_ui" :to="userProfileLink" > - {{ status.user.screen_name }} + {{ status.user.screen_name_ui }} </router-link> <img v-if="!!(status.user && status.user.favicon)" |