UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-14 02:24:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update PublicApiController, fix bug that does not show private posts in home timeline

Browse source
This commit is contained in:
Daniel Supernault 2019-07-07 20:24:10 -06:00
parent c480a5a023
commit f86fc83cbd
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/PublicApiController.php
View file

@ -211,6 +211,10 @@ class PublicApiController extends Controller
'limit' => 'nullable|integer|max:20' 'limit' => 'nullable|integer|max:20'
]); ]);
if(config('instance.timeline.local.is_public') == false && !Auth::check()) {
abort(403, 'Authentication required.');
}
$page = $request->input('page'); $page = $request->input('page');
$min = $request->input('min_id'); $min = $request->input('min_id');
$max = $request->input('max_id'); $max = $request->input('max_id');
@ -332,6 +336,8 @@ class PublicApiController extends Controller
->pluck('id'); ->pluck('id');
}); });
$private = $private->diff($following)->flatten();
$filters = UserFilter::whereUserId($pid) $filters = UserFilter::whereUserId($pid)
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereIn('filter_type', ['mute', 'block']) ->whereIn('filter_type', ['mute', 'block'])

6
config/instance.php
View file

@ -11,5 +11,11 @@ return [
'announcement' => [ 'announcement' => [
'enabled' => env('INSTANCE_ANNOUNCEMENT_ENABLED', true), 'enabled' => env('INSTANCE_ANNOUNCEMENT_ENABLED', true),
'message' => env('INSTANCE_ANNOUNCEMENT_MESSAGE', 'Example announcement message.<br><span class="font-weight-normal">Something else here</span>') 'message' => env('INSTANCE_ANNOUNCEMENT_MESSAGE', 'Example announcement message.<br><span class="font-weight-normal">Something else here</span>')
],
'timeline' => [
'local' => [
'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false)
]
] ]
]; ];