2 files changed, 17 insertions, 6 deletions
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 4a43542d..eb4e4b41 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -1,7 +1,10 @@
 const RetweetButton = {
-  props: ['status', 'loggedIn'],
+  props: ['status', 'loggedIn', 'visibility'],
   data () {
     return {
+      hidePostStatsLocal: typeof this.$store.state.config.hidePostStats === 'undefined'
+        ? this.$store.state.instance.hidePostStats
+        : this.$store.state.config.hidePostStats,
       animated: false
     }
   },
@@ -9,6 +12,8 @@ const RetweetButton = {
     retweet () {
       if (!this.status.repeated) {
         this.$store.dispatch('retweet', {id: this.status.id})
+      } else {
+        this.$store.dispatch('unretweet', {id: this.status.id})
       }
       this.animated = true
       setTimeout(() => {
@@ -20,6 +25,7 @@ const RetweetButton = {
     classes () {
       return {
         'retweeted': this.status.repeated,
+        'retweeted-empty': !this.status.repeated,
         'animate-spin': this.animated
       }
     }
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 1bee3d08..c957fb77 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,11 +1,16 @@
 <template>
   <div v-if="loggedIn">
-    <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>
+    <template v-if="visibility !== 'private' && visibility !== 'direct'">
+      <i :class='classes' class='retweet-button icon-retweet rt-active' v-on:click.prevent='retweet()' :title="$t('tool_tip.repeat')"></i>
+      <span v-if='!hidePostStatsLocal && status.repeat_num > 0'>{{status.repeat_num}}</span>
+    </template>
+    <template v-else>
+      <i :class='classes' class='icon-lock' :title="$t('timeline.no_retweet_hint')"></i>
+    </template>
   </div>
-  <div v-else>
-    <i :class='classes' class='icon-retweet'></i>
-    <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
+  <div v-else-if="!loggedIn">
+    <i :class='classes' class='icon-retweet' :title="$t('tool_tip.repeat')"></i>
+    <span v-if='!hidePostStatsLocal && status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
 </template>