diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:40:57 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:40:57 +0000 |
| commit | 01c5bae5948b69fa646284c711803fcb21772834 (patch) | |
| tree | b49b1e54d0ea253b6d489fcd4ebd6ba6b614d188 /src/components/status/status.vue | |
| parent | fba757f595f8a1bc75d3b47a2c0efac56ee106f1 (diff) | |
| parent | 876f7633fe34039c6f25831fa63ecc55d99081ff (diff) | |
Merge branch 'feature/emoji-in-profiles' into 'develop'
Use serverside html rendering in usernames and bios if available.
See merge request pleroma/pleroma-fe!304
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 7fff9fd7..b871d7fe 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -11,7 +11,8 @@ <div v-if="retweet && !noHeading" class="media container retweet-info"> <StillImage v-if="retweet" class='avatar' :src="statusoid.user.profile_image_url_original"/> <div class="media-body faint"> - <a :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a> + <a v-if="retweeterHtml" :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name" v-html="retweeterHtml"></a> + <a v-else :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a> <i class='fa icon-retweet retweeted'></i> {{$t('timeline.repeated')}} </div> @@ -30,7 +31,8 @@ <div v-if="!noHeading" class="media-body container media-heading"> <div class="media-heading-left"> <div class="name-and-links"> - <h4 class="user-name">{{status.user.name}}</h4> + <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4> + <h4 class="user-name" v-else>{{status.user.name}}</h4> <span class="links"> <router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link> <span v-if="status.in_reply_to_screen_name" class="faint reply-info"> |