From 882a288326fa2d43e8983866ae6edaf2c4d24c93 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 23 Mar 2018 08:39:09 -0700
Subject: [PATCH] only show hourglass for locked accounts

---
 routes/_actions/follow.js               |  7 ++++---
 routes/_components/AccountProfile.html  | 20 +++++++++++---------
 routes/_pages/accounts/[accountId].html |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/routes/_actions/follow.js b/routes/_actions/follow.js
index 9f9c1c03..e50f8115 100644
--- a/routes/_actions/follow.js
+++ b/routes/_actions/follow.js
@@ -8,16 +8,17 @@ export async function setAccountFollowed (accountId, follow, toastOnSuccess) {
   let instanceName = store.get('currentInstance')
   let accessToken = store.get('accessToken')
   try {
+    let account
     if (follow) {
-      await followAccount(instanceName, accessToken, accountId)
+      account = await followAccount(instanceName, accessToken, accountId)
     } else {
-      await unfollowAccount(instanceName, accessToken, accountId)
+      account = await unfollowAccount(instanceName, accessToken, accountId)
     }
     await updateProfileAndRelationship(accountId)
     let relationship = await database.getRelationship(instanceName, accountId)
     if (toastOnSuccess) {
       if (follow) {
-        if (relationship.requested) {
+        if (account.locked && relationship.requested) {
           toast.say('Requested to follow account')
         } else {
           toast.say('Followed account')
diff --git a/routes/_components/AccountProfile.html b/routes/_components/AccountProfile.html
index 92815dc3..f29ee78a 100644
--- a/routes/_components/AccountProfile.html
+++ b/routes/_components/AccountProfile.html
@@ -1,18 +1,18 @@
 <div class="account-profile {{headerIsMissing ? 'header-is-missing' : ''}}"
-     style="background-image: url({{$autoplayGifs ? profile.header : profile.header_static}});">
+     style="background-image: url({{$autoplayGifs ? account.header : account.header_static}});">
   <div class="account-profile-grid-wrapper">
     <div class="account-profile-backdrop"></div>
     <div class="account-profile-grid">
       <div class="account-profile-avatar">
-        <Avatar account="{{profile}}" size="big" />
+        <Avatar :account size="big" />
       </div>
       <div class="account-profile-name">
-        <ExternalLink href="{{profile.url}}" showIcon="true" normalIconColor="true">
-          {{profile.display_name || profile.acct}}
+        <ExternalLink href="{{account.url}}" showIcon="true" normalIconColor="true">
+          {{account.display_name || account.acct}}
         </ExternalLink>
       </div>
       <div class="account-profile-username">
-        {{'@' + profile.acct}}
+        {{'@' + account.acct}}
       </div>
       <div class="account-profile-followed-by">
         {{#if relationship && relationship.followed_by}}
@@ -195,7 +195,7 @@
   export default {
     methods: {
       async onFollowButtonClick() {
-        let accountId = this.get('profile').id
+        let accountId = this.get('account').id
         let instanceName = this.store.get('currentInstance')
         let following = this.get('following')
         let followRequested = this.get('followRequested')
@@ -210,8 +210,8 @@
       followButtonAnimation: FOLLOW_BUTTON_ANIMATION
     }),
     computed: {
-      headerIsMissing: (profile) => profile.header.endsWith('missing.png'),
-      note: (profile) => profile.note,
+      headerIsMissing: (account) => account.header.endsWith('missing.png'),
+      note: (account) => account.note,
       massagedNote: (note) => {
         // GNU Social / Pleroma don't add <p> tags
         if (!note.startsWith('<p>')) {
@@ -220,7 +220,9 @@
         return note
       },
       following: (relationship) => relationship && relationship.following,
-      followRequested: (relationship) => relationship && relationship.requested,
+      followRequested: (relationship, account) => {
+        return relationship && relationship.requested && account && account.locked
+      },
       followLabel: (following, followRequested) => {
         if (following) {
           return 'Unfollow'
diff --git a/routes/_pages/accounts/[accountId].html b/routes/_pages/accounts/[accountId].html
index 879a681b..2288e170 100644
--- a/routes/_pages/accounts/[accountId].html
+++ b/routes/_pages/accounts/[accountId].html
@@ -1,7 +1,7 @@
 {{#if $isUserLoggedIn}}
 <DynamicPageBanner title="" />
   {{#if $currentAccountProfile && $currentVerifyCredentials}}
-    <AccountProfile profile="{{$currentAccountProfile}}"
+    <AccountProfile account="{{$currentAccountProfile}}"
                     relationship="{{$currentAccountRelationship}}"
                     verifyCredentials="{{$currentVerifyCredentials}}"
     />