aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.vue
diff options
context:
space:
mode:
authorEdijs <iamedijs@hotmail.com>2019-02-10 11:59:19 -0700
committerEdijs <iamedijs@hotmail.com>2019-02-10 11:59:19 -0700
commitfc26f1852ebc686ec34a7b65a3c7ad9f36ef630b (patch)
treefafab5ab9b434b4af0f70cc53dc980446b463e1c /src/components/status/status.vue
parentd39e2643f523e84cdce1945538149a9bd6419fd6 (diff)
parent4bea3c525f377a45919893ae0a474859b5744820 (diff)
Merge branch 'develop' into fix/hashtag-opening
Diffstat (limited to 'src/components/status/status.vue')
-rw-r--r--src/components/status/status.vue7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 779696ea..76daf73a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
<template>
- <div class="status-el" v-if="!hideReply && !deleted" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+ <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
<template v-if="muted && !noReplyLinks">
<div class="media status container muted">
<small>
@@ -16,9 +16,8 @@
<UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
<div class="media-body faint">
<span class="user-name">
- <router-link :to="retweeterProfileLink">
- {{retweeterHtml || retweeter}}
- </router-link>
+ <router-link v-if="retweeterHtml" :to="retweeterProfileLink" v-html="retweeterHtml"/>
+ <router-link v-else :to="retweeterProfileLink">{{retweeter}}</router-link>
</span>
<i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
{{$t('timeline.repeated')}}