From a9a95e9120292f428a2e6abbff2cfffd0f427fb8 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Thu, 26 Jan 2023 20:49:07 +0000
Subject: [PATCH 1/2] Add indicator if user blocks you

---
 src/components/user_card/user_card.scss | 2 +-
 src/components/user_card/user_card.vue  | 6 ++++++
 src/i18n/en.json                        | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 2cae1c35..0a5e744e 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -235,7 +235,7 @@
     line-height: 22px;
     flex-wrap: wrap;
 
-    .following, .requested_by {
+    .following, .requested_by, .blocking {
       flex: 1 0 auto;
       margin: 0;
       margin-bottom: .25em;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 2eefbad8..6a9d093d 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -127,6 +127,12 @@
           </div>
         </div>
         <div class="user-meta">
+          <div
+            v-if="relationship.blocked_by && loggedIn && isOtherUser"
+            class="blocking"
+          >
+            {{ $t('user_card.blocks_you') }}
+          </div>
           <div
             v-if="relationship.followed_by && loggedIn && isOtherUser"
             class="following"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 534f1c1c..46890345 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1123,6 +1123,7 @@
         "block_confirm_title": "Block user",
         "block_progress": "Blocking…",
         "blocked": "Blocked!",
+        "blocks_you": "Blocks you!",
         "bot": "Bot",
         "deactivated": "Deactivated",
         "deny": "Deny",

From 7f4dd9ff037a98192c546426e05492a98c536d51 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Fri, 27 Jan 2023 00:26:50 +0000
Subject: [PATCH 2/2] Disable follow button if blocked by user

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

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 6a9d093d..289db15b 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -193,6 +193,7 @@
             <FollowButton
               :relationship="relationship"
               :user="user"
+              :disabled="relationship.blocked_by"
             />
             <template v-if="relationship.following">
               <ProgressButton