pleroma-fe

commit: bb335ea71b7e94dd39b583e039e4e42d05ed807d
parent: d6ee6e8394a86cadc1419f014dc5e77569c62c75
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon,  4 Feb 2019 04:22:33 +0000

Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop'

#307 - replace user links with router links in repeats

See merge request pleroma/pleroma-fe!516
Diffstat:
M
src/components/status/status.js
1
+
M
src/components/status/status.vue
7
+++++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
@@ -89,6 +89,7 @@ const Status = {
     retweet () { return !!this.statusoid.retweeted_status },
     retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name },
     retweeterHtml () { return this.statusoid.user.name_html },
+    retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
     status () {
       if (this.retweet) {
         return this.statusoid.retweeted_status
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -15,8 +15,11 @@
       <div v-if="retweet && !noHeading" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
         <UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
         <div class="media-body faint">
-          <a v-if="retweeterHtml" :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name" v-html="retweeterHtml"></a>
-          <a v-else :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a>
+          <span class="user-name">
+            <router-link :to="retweeterProfileLink">
+              {{retweeterHtml || retweeter}}
+            </router-link>
+          </span>
           <i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
           {{$t('timeline.repeated')}}
         </div>