From 7ed9d17ce745abc38a27d4994452a136357aba46 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Sun, 7 Jul 2019 23:02:09 +0300
Subject: Add thread muting to context menu of status

---
 src/components/extra_buttons/extra_buttons.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/components/extra_buttons/extra_buttons.vue')

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 8e24e9a5..5027be1b 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -1,6 +1,6 @@
 <template>
   <Popper
-    v-if="enabled && showPopper"
+    v-if="showPopper"
     trigger="click"
     append-to-body
     :options="{
@@ -14,6 +14,20 @@
   >
     <div class="popper-wrapper">
       <div class="dropdown-menu">
+        <button
+          v-if="!status.muted"
+          class="dropdown-item dropdown-item-icon"
+          @click.prevent="muteConversation"
+        >
+          <i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
+        </button>
+        <button
+          v-if="status.muted"
+          class="dropdown-item dropdown-item-icon"
+          @click.prevent="unmuteConversation"
+        >
+          <i class="icon-eye-off" /><span>{{ $t("status.unmute_conversation") }}</span>
+        </button>
         <button
           v-if="!status.pinned && canPin"
           class="dropdown-item dropdown-item-icon"
-- 
cgit v1.2.3-70-g09d2


From d4c366a123b285aee51e9debb4aa1b4997bba960 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Thu, 8 Aug 2019 21:24:40 +0300
Subject: fix extra buttons merge bug

---
 src/components/extra_buttons/extra_buttons.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components/extra_buttons/extra_buttons.vue')

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index fc800072..564d34df 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -1,6 +1,5 @@
 <template>
   <v-popover
-    v-if="enabled"
     trigger="click"
     placement="top"
     class="extra-button-popover"
-- 
cgit v1.2.3-70-g09d2


From 92a0c475f796989098bf84c813900c0fd89da7d0 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 20 Aug 2019 16:55:42 -0400
Subject: hide mute conversation button to guests

---
 src/components/extra_buttons/extra_buttons.js  | 3 +++
 src/components/extra_buttons/extra_buttons.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/components/extra_buttons/extra_buttons.vue')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 2d05ad39..5ac73e97 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -40,6 +40,9 @@ const ExtraButtons = {
     },
     canPin () {
       return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
+    },
+    canMute () {
+      return !!this.currentUser
     }
   }
 }
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 564d34df..1b48540e 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -9,14 +9,14 @@
     <div slot="popover">
       <div class="dropdown-menu">
         <button
-          v-if="!status.muted"
+          v-if="canMute && !status.muted"
           class="dropdown-item dropdown-item-icon"
           @click.prevent="muteConversation"
         >
           <i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
         </button>
         <button
-          v-if="status.muted"
+          v-if="canMute && status.muted"
           class="dropdown-item dropdown-item-icon"
           @click.prevent="unmuteConversation"
         >
-- 
cgit v1.2.3-70-g09d2


From 65579796ed430bdf2ac4ecc7403120f316e69b23 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 20 Aug 2019 17:00:28 -0400
Subject: show three dot button only if needed

---
 src/components/extra_buttons/extra_buttons.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/extra_buttons/extra_buttons.vue')

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 1b48540e..ed0f3aa4 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -1,5 +1,6 @@
 <template>
   <v-popover
+    v-if="canDelete || canMute || canPin"
     trigger="click"
     placement="top"
     class="extra-button-popover"
-- 
cgit v1.2.3-70-g09d2

