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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-11 17:39:34 -07:00 committed by GitHub
commit 7e12ddc1f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/InternalApiController.php
View file

@ -220,6 +220,7 @@ class InternalApiController extends Controller
$following = array_merge($following, $filters); $following = array_merge($following, $filters);
$posts = Status::select('id', 'caption', 'profile_id') $posts = Status::select('id', 'caption', 'profile_id')
->whereNull('uri')
->whereHas('media') ->whereHas('media')
->whereHas('profile', function($q) { ->whereHas('profile', function($q) {
return $q->whereNull('status'); return $q->whereNull('status');

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

@ -400,7 +400,7 @@ class PublicApiController extends Controller
$only_media = $request->only_media ?? false; $only_media = $request->only_media ?? false;
$user = Auth::user(); $user = Auth::user();
$account = Profile::findOrFail($id); $account = Profile::findOrFail($id);
$statuses = $account->statuses()->getQuery(); $statuses = $account->statuses()->getQuery()->whereNull('uri');
if($only_media == true) { if($only_media == true) {
$statuses = $statuses $statuses = $statuses
->whereHas('media') ->whereHas('media')