Merge branch 'develop' into feature/hash-routed

1 files changed, 8 insertions, 0 deletions

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 9a21f404..2c32406b 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -3,6 +3,10 @@
     <div class="base00-background panel-heading text-center" v-bind:style="style">
       <div class='user-info'>
         <img :src="user.profile_image_url">
+        <div v-if='user.muted' class='muteinfo'>Muted</div>
+        <div class='muteinfo' v-if='isOtherUser'>
+          <button @click="toggleMute">Mute/Unmute</button>
+        </div>
         <span class="glyphicon glyphicon-user"></span>
         <div class='user-name'>{{user.name}}</div>
         <div class='user-screen-name'>@{{user.screen_name}}</div>
@@ -70,6 +74,10 @@
         const store = this.$store
         store.state.api.backendInteractor.unfollowUser(this.user.id)
           .then((unfollowedUser) => store.commit('addNewUsers', [unfollowedUser]))
+      },
+      toggleMute () {
+        const store = this.$store
+        store.commit('setMuted', {user: this.user, muted: !this.user.muted})
       }
     }
   }