From 66f4f05419a6af3e805a44004fcc39da57b11dc0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 19 Nov 2018 21:03:21 -0700 Subject: [PATCH 1/3] Update nav --- resources/views/layouts/partial/nav.blade.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 26a7af299..2710e8bb0 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -19,10 +19,13 @@
  • {{ __('Login') }}
  • {{ __('Register') }}
    • @else -
  • +
    • -
  • +
  • + +
    • + {{--
  • @@ -33,7 +36,7 @@
    {{-- - --}} + -}} @@ -41,8 +44,8 @@
    -
    • -
  • +
    • --}} +
  • From cd89925c45aff53e83d9032992790c53b7e7be01 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 19 Nov 2018 21:06:55 -0700 Subject: [PATCH 2/3] Update InternalApiController --- app/Http/Controllers/InternalApiController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index 9b1b3af4e..d724be0c1 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -146,9 +146,6 @@ class InternalApiController extends Controller $posts = Status::select('id', 'caption', 'profile_id') ->whereHas('media') - ->whereHas('profile', function($q) { - $q->where('is_private', false); - }) ->whereIsNsfw(false) ->whereVisibility('public') ->whereNotIn('profile_id', $following) From 9aec7ad8ea2f901a849875d607c0b90d6dbb8ab5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 19 Nov 2018 21:07:19 -0700 Subject: [PATCH 3/3] Update routes --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index c7baa739e..98282636f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -119,7 +119,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('email', 'SettingsController@email')->name('settings.email'); Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications'); Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy'); - Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:25,1440'); + Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:50,1440'); Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users'); Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate')->middleware('throttle:100,1440'); Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');