Merge pull request #546 from pixelfed/frontend-ui-refactor

Frontend ui refactor

app/Http/Controllers/FollowerController.php

@@ -2,12 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\Follower;
+use App\{
-use App\FollowRequest;
+    Follower,
-use App\Jobs\FollowPipeline\FollowPipeline;
+    FollowRequest,
-use App\Profile;
+    Profile,
+    UserFilter
+};
 use Auth;
 use Illuminate\Http\Request;
+use App\Jobs\FollowPipeline\FollowPipeline;
 
 class FollowerController extends Controller
 {
@@ -31,6 +34,16 @@ class FollowerController extends Controller
         $user = Auth::user()->profile;
         $target = Profile::where('id', '!=', $user->id)->findOrFail($item);
         $private = (bool) $target->is_private;
+        $blocked = UserFilter::whereUserId($target->id)
+                ->whereFilterType('block')
+                ->whereFilterableId($user->id)
+                ->whereFilterableType('App\Profile')
+                ->exists();
+
+        if($blocked == true) {
+            return redirect()->back()->with('error', 'You cannot follow this user.');
+        }
+
         $isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->count();
 
         if($private == true && $isFollowing == 0) {

resources/views/profile/private.blade.php

@@ -1,7 +1,11 @@
 @extends('layouts.app',['title' => $user->username . " on " . config('app.name')])
 
 @section('content')
-
+@if (session('error'))
+    <div class="alert alert-danger text-center font-weight-bold mb-0">
+        {{ session('error') }}
+    </div>
+@endif
 @include('profile.partial.private-info')
 
 <div class="container">