From 0b97ea7a25324efa8a6d9003a6221c73ece41407 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Aug 2019 20:40:44 -0600
Subject: [PATCH 1/2] Update Timeline.vue, fix ctx menu

---
 resources/assets/js/components/Timeline.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index ba7694804..178fc5b5c 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -394,8 +394,8 @@
     body-class="list-group-flush p-0 rounded">
     <div class="list-group text-center">
       <div v-if="ctxMenuStatus && ctxMenuStatus.account.id != profile.id" class="list-group-item rounded cursor-pointer font-weight-bold text-danger" @click="ctxMenuReportPost()">Report inappropriate</div>
-      <div v-if="ctxMenuRelationship && ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-danger" @click="ctxMenuUnfollow()">Unfollow</div>
-      <div v-if="ctxMenuRelationship && !ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-primary" @click="ctxMenuFollow()">Follow</div>
+      <div v-if="ctxMenuStatus && ctxMenuStatus.account.id != profile.id && ctxMenuRelationship && ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-danger" @click="ctxMenuUnfollow()">Unfollow</div>
+      <div v-if="ctxMenuStatus && ctxMenuStatus.account.id != profile.id && ctxMenuRelationship && !ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-primary" @click="ctxMenuFollow()">Follow</div>
       <div class="list-group-item rounded cursor-pointer" @click="ctxMenuGoToPost()">Go to post</div>
       <!-- <div class="list-group-item rounded cursor-pointer" @click="ctxMenuEmbed()">Embed</div>
       <div class="list-group-item rounded cursor-pointer" @click="ctxMenuShare()">Share</div> -->

From fe36cf60d0b41c1a27be672d9155cba6bc8be6c8 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Aug 2019 21:08:14 -0600
Subject: [PATCH 2/2] Update compiled assets

---
 public/js/timeline.js    | Bin 67438 -> 67556 bytes
 public/mix-manifest.json | Bin 1575 -> 1575 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 77260e4cda44be213cb18ef2ed0ad64d0f197962..cea68a81d9646112ca6fc5eef79f7653544af424 100644
GIT binary patch
delta 212
zcmaFY$MU3~WrLqTOQdtT&*mWiYKzGi+YFf0)F!X*5TAUz{VtTdd3{HqFo%h$v7tq3
zTFPdQIdwc>Et4Ozsq<%MCORu=S{Li(X=G~ZC2qD~{YYSQ?4AoeEFhW5h9{+1iVJ)!
zC;Ol5oUD6tHJCHe!E*B96>@MRC%;?~h2VIvbVG1vuGB|xF05RE;54j?MsOalird_L
H>a`63RVz>G

delta 245
zcmaFT&+@L1WrLqTOHyub>gFK-YKzGn9j}3yZ?jFOl`uz&nPHldg+c1(x;b?`EKw<5
z&J!IhCs&`4gUd`_cp?hHVLs`G-~^u3M{qh$u0U`sPDLX)vrombDJ8mwXe&+LXe72d
zWaSY7uyZCqWK$O_&B`oS(zGtt%hSlz)Jv?@QA*MFG@1N>O@6ZMe7Vh0yZU%0Pd>hy
q1*8tBU7WpGLkZ-}$y~=fSt`sb^MR(w0hO|Ewh@bA++24i%^Col3s&m@

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 2e4047772e98d3f662ef834d55151f6216a1bf29..24ba6d8422add9508ab2ec1881ddf585c17b348b 100644
GIT binary patch
delta 32
ncmZ3^vz%uGKbwSMN>Yk}QDRzZN~)P@s)?bANwTpLS1lI+op=b`

delta 32
ncmZ3^vz%uGKbu6VnR&8hTC$~aVycOmrIA^xfw6@WS1lI+mt_cR