diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 09cd8b1ae..fada324fe 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -6,6 +6,7 @@ use App\Follower; use App\Hashtag; use App\Profile; use App\Status; +use App\UserFilter; use Auth; use Illuminate\Http\Request; @@ -23,6 +24,13 @@ class DiscoverController extends Controller $following = Follower::whereProfileId($pid) ->pluck('following_id'); + $filtered = UserFilter::whereUserId($pid) + ->whereFilterableType('App\Profile') + ->whereIn('filter_type', ['mute', 'block']) + ->pluck('filterable_id'); + + $following = $following->push($filtered); + $people = Profile::inRandomOrder() ->where('id', '!=', $pid) ->whereNotIn('id', $following) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 6449bcb3a..670bf3b2c 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -7,6 +7,7 @@ use App\EmailVerification; use App\Media; use App\Profile; use App\User; +use App\UserFilter; use App\Util\Lexer\PrettyNumber; use Auth; use DB; @@ -254,4 +255,64 @@ class SettingsController extends Controller { return view('settings.developers'); } + + public function mutedUsers() + { + $pid = Auth::user()->profile->id; + $ids = (new UserFilter())->mutedUserIds($pid); + $users = Profile::whereIn('id', $ids)->simplePaginate(15); + return view('settings.privacy.muted', compact('users')); + } + + public function mutedUsersUpdate(Request $request) + { + $this->validate($request, [ + 'profile_id' => 'required|integer|min:1' + ]); + $fid = $request->input('profile_id'); + $pid = Auth::user()->profile->id; + DB::transaction(function () use ($fid, $pid) { + $filter = UserFilter::whereUserId($pid) + ->whereFilterableId($fid) + ->whereFilterableType('App\Profile') + ->whereFilterType('mute') + ->firstOrFail(); + $filter->delete(); + }); + return redirect()->back(); + } + + public function blockedUsers() + { + $pid = Auth::user()->profile->id; + $ids = (new UserFilter())->blockedUserIds($pid); + $users = Profile::whereIn('id', $ids)->simplePaginate(15); + return view('settings.privacy.blocked', compact('users')); + } + + + public function blockedUsersUpdate(Request $request) + { + $this->validate($request, [ + 'profile_id' => 'required|integer|min:1' + ]); + $fid = $request->input('profile_id'); + $pid = Auth::user()->profile->id; + DB::transaction(function () use ($fid, $pid) { + $filter = UserFilter::whereUserId($pid) + ->whereFilterableId($fid) + ->whereFilterableType('App\Profile') + ->whereFilterType('block') + ->firstOrFail(); + $filter->delete(); + }); + return redirect()->back(); + } + + public function blockedInstances() + { + $settings = Auth::user()->settings; + return view('settings.privacy.blocked-instances'); + } } + diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index ec4b00d72..de6e0c874 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -7,6 +7,7 @@ use App\Follower; use App\Profile; use App\Status; use App\User; +use App\UserFilter; use App\Util\Lexer\PrettyNumber; use Auth; use Cache; @@ -30,10 +31,16 @@ class SiteController extends Controller public function homeTimeline() { + $pid = Auth::user()->profile->id; // TODO: Use redis for timelines $following = Follower::whereProfileId(Auth::user()->profile->id)->pluck('following_id'); $following->push(Auth::user()->profile->id); + $filtered = UserFilter::whereUserId($pid) + ->whereFilterableType('App\Profile') + ->whereIn('filter_type', ['mute', 'block']) + ->pluck('filterable_id'); $timeline = Status::whereIn('profile_id', $following) + ->whereNotIn('profile_id', $filtered) ->whereHas('media') ->orderBy('id', 'desc') ->withCount(['comments', 'likes', 'shares']) diff --git a/app/UserFilter.php b/app/UserFilter.php index ab5fe321a..50cd5887e 100644 --- a/app/UserFilter.php +++ b/app/UserFilter.php @@ -12,4 +12,21 @@ class UserFilter extends Model 'filterable_type', 'filter_type', ]; + + public function mutedUserIds($profile_id) + { + return $this->whereUserId($profile_id) + ->whereFilterableType('App\Profile') + ->whereFilterType('mute') + ->pluck('filterable_id'); + } + + + public function blockedUserIds($profile_id) + { + return $this->whereUserId($profile_id) + ->whereFilterableType('App\Profile') + ->whereFilterType('block') + ->pluck('filterable_id'); + } } diff --git a/config/pixelfed.php b/config/pixelfed.php index 196571661..83fc883db 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.1.7', + 'version' => '0.1.8', /* |-------------------------------------------------------------------------- diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php index 18588b59a..04fa93991 100644 --- a/resources/views/settings/partial/sidebar.blade.php +++ b/resources/views/settings/partial/sidebar.blade.php @@ -16,7 +16,7 @@ Notifications --}} -
  • +
  • Privacy
    • {{--
  • diff --git a/resources/views/settings/privacy.blade.php b/resources/views/settings/privacy.blade.php index 161474ac6..cff620c98 100644 --- a/resources/views/settings/privacy.blade.php +++ b/resources/views/settings/privacy.blade.php @@ -6,6 +6,12 @@

    Privacy Settings

    +
    +

    + Muted Users + Blocked Users +

    +
    @csrf
    diff --git a/resources/views/settings/privacy/blocked.blade.php b/resources/views/settings/privacy/blocked.blade.php new file mode 100644 index 000000000..873ff5fa3 --- /dev/null +++ b/resources/views/settings/privacy/blocked.blade.php @@ -0,0 +1,39 @@ +@extends('settings.template') + +@section('section') + +
    +

    Blocked Users

    +
    +
    +
    +

    + Muted Users + Blocked Users +

    +
    + @if($users->count() > 0) +
      + @foreach($users as $user) +
    • +
      + {{$user->emailUrl()}} + + + @csrf + + + + +
      +
      • + @endforeach +
    +
    + {{$users->links()}} +
    + @else +

    You are not blocking any accounts.

    + @endif + +@endsection \ No newline at end of file diff --git a/resources/views/settings/privacy/muted.blade.php b/resources/views/settings/privacy/muted.blade.php new file mode 100644 index 000000000..1457cf425 --- /dev/null +++ b/resources/views/settings/privacy/muted.blade.php @@ -0,0 +1,39 @@ +@extends('settings.template') + +@section('section') + +
    +

    Muted Users

    +
    +
    +
    +

    + Muted Users + Blocked Users +

    +
    + @if($users->count() > 0) +
      + @foreach($users as $user) +
    • +
      + {{$user->emailUrl()}} + +
      + @csrf + + +
      +       +
      +
      • + @endforeach +
    +
    + {{$users->links()}} +
    + @else +

    You are not muting any accounts.

    + @endif + +@endsection \ No newline at end of file diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index e33121c0d..3fd21597e 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -14,7 +14,23 @@ Report Embed @if(Auth::check()) + @if(Auth::user()->profile->id !== $item->profile->id) +
    +
    + @csrf + + + +
    +
    + @csrf + + + +
    + @endif @if(Auth::user()->profile->id === $item->profile->id || Auth::user()->is_admin == true) +
    Edit
    @csrf diff --git a/routes/web.php b/routes/web.php index 9ce4b213a..8ca9d1582 100644 --- a/routes/web.php +++ b/routes/web.php @@ -54,6 +54,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware('validemail')->group(fu Route::post('remote-follow', 'FederationController@remoteFollowStore'); Route::post('comment', 'CommentController@store'); Route::post('delete', 'StatusController@delete'); + Route::post('mute', 'AccountController@mute'); + Route::post('block', 'AccountController@block'); Route::post('like', 'LikeController@store'); Route::post('share', 'StatusController@storeShare'); Route::post('follow', 'FollowerController@store'); @@ -97,6 +99,11 @@ Route::domain(config('pixelfed.domain.app'))->middleware('validemail')->group(fu Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications'); Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy'); Route::post('privacy', 'SettingsController@privacyStore'); + Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users'); + Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate'); + Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users'); + Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate'); + Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances'); Route::get('security', 'SettingsController@security')->name('settings.security'); Route::get('applications', 'SettingsController@applications')->name('settings.applications'); Route::get('data-export', 'SettingsController@dataExport')->name('settings.dataexport');