pleroma-fe

commit: fba757f595f8a1bc75d3b47a2c0efac56ee106f1
parent: 5cfc247c6b7f5dcdf7ef7e552d85f31615129eab
Author: lambda <pleromagit@rogerbraun.net>
Date:   Sun, 12 Aug 2018 10:32:40 +0000

Merge branch 'fix/remove-retweet-button-on-private-and-direct-posts' into 'develop'

Do not show retweet button if post is followers-only or a DM

See merge request pleroma/pleroma-fe!303
Diffstat:
M
src/components/retweet_button/retweet_button.js
2
+-
M
src/components/retweet_button/retweet_button.vue
4
++--
M
src/components/status/status.vue
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
@@ -1,5 +1,5 @@
 const RetweetButton = {
-  props: ['status', 'loggedIn'],
+  props: ['status', 'loggedIn', 'visibility'],
   data () {
     return {
       animated: false
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
@@ -1,9 +1,9 @@
 <template>
-  <div v-if="loggedIn">
+  <div v-if="loggedIn && visibility !== 'private' && visibility !== 'direct'">
     <i :class='classes' class='icon-retweet rt-active' v-on:click.prevent='retweet()'></i>
     <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
-  <div v-else>
+  <div v-else-if="!loggedIn">
     <i :class='classes' class='icon-retweet'></i>
     <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -88,7 +88,7 @@
                 <i class="icon-reply" :class="{'icon-reply-active': replying}"></i>
               </a>
             </div>
-            <retweet-button :loggedIn='loggedIn' :status='status'></retweet-button>
+            <retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button>
             <favorite-button :loggedIn='loggedIn' :status='status'></favorite-button>
             <delete-button :status='status'></delete-button>
           </div>