From c8365254d7fc59e4a47bea85cb06d571eb6af507 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 7 Mar 2019 13:28:14 -0700
Subject: [PATCH] Fixes #977

---
 app/Http/Controllers/ProfileController.php | 11 +++++++++++
 resources/assets/js/components/Profile.vue | 13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 86ba0ce5..3580fb6a 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -68,6 +68,17 @@ class ProfileController extends Controller
         } 
         $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
         $profile = $user;
+        $settings = [
+            'crawlable' => $settings->crawlable,
+            'following' => [
+                'count' => $settings->show_profile_following_count,
+                'list' => $settings->show_profile_following
+            ], 
+            'followers' => [
+                'count' => $settings->show_profile_follower_count,
+                'list' => $settings->show_profile_followers
+            ]
+        ];
         return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin'));
     }
 
diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue
index 85b0b47e..ff0aecdf 100644
--- a/resources/assets/js/components/Profile.vue
+++ b/resources/assets/js/components/Profile.vue
@@ -38,13 +38,13 @@
 										Posts
 									</a>
 								</div>
-								<div class="font-weight-light pr-5">
+								<div v-if="profileSettings.followers.count" class="font-weight-light pr-5">
 									<a class="text-dark cursor-pointer" v-on:click="followersModal()">
 										<span class="font-weight-bold">{{profile.followers_count}}</span>
 										Followers
 									</a>
 								</div>
-								<div class="font-weight-light pr-5">
+								<div v-if="profileSettings.following.count" class="font-weight-light pr-5">
 									<a class="text-dark cursor-pointer" v-on:click="followingModal()">
 										<span class="font-weight-bold">{{profile.following_count}}</span>
 										Following
@@ -318,7 +318,8 @@
 <script type="text/javascript">
 export default {
 	props: [
-		'profile-id'
+		'profile-id',
+		'profile-settings'
 	],
 	data() {
 		return {
@@ -671,6 +672,9 @@ export default {
 		},
 
 		followingModal() {
+			if(this.profileSettings.following.list == false) {
+				return;
+			}
 			if(this.following.length > 0) {
 				this.$refs.followingModal.show();
 				return;
@@ -691,6 +695,9 @@ export default {
 		},
 
 		followersModal() {
+			if(this.profileSettings.followers.list == false) {
+				return;
+			}
 			if(this.followers.length > 0) {
 				this.$refs.followerModal.show();
 				return;