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

Frontend ui refactor
This commit is contained in:
daniel 2018-11-02 20:59:37 -06:00 committed by GitHub
commit 833d17db4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions

View File

@ -2,12 +2,15 @@
namespace App\Http\Controllers;
use App\Follower;
use App\FollowRequest;
use App\Jobs\FollowPipeline\FollowPipeline;
use App\Profile;
use App\{
Follower,
FollowRequest,
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) {

View File

@ -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">