mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1648 from pixelfed/staging 

Update SearchController
This commit is contained in:
daniel 2019-08-28 19:53:20 -06:00 committed by GitHub
parent 270a042b0f 58a9ca664c
commit d07b80da43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/SearchController.php
View File

@ -54,7 +54,8 @@ class SearchController extends Controller
'id' => (string) $item->id, 'id' => (string) $item->id,
'following' => $item->followedBy(Auth::user()->profile), 'following' => $item->followedBy(Auth::user()->profile),
'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
'thumb' => $item->avatarUrl() 'thumb' => $item->avatarUrl(),
'local' => (bool) !$item->domain
] ]
]]; ]];
} else if ($type == 'Note') { } else if ($type == 'Note') {
@ -92,7 +93,7 @@ class SearchController extends Controller
} }
return $tokens; return $tokens;
}); });
$users = Profile::select('username', 'name', 'id') $users = Profile::select('domain', 'username', 'name', 'id')
->whereNull('status') ->whereNull('status')
->whereNull('domain') ->whereNull('domain')
->where('id', '!=', Auth::user()->profile->id) ->where('id', '!=', Auth::user()->profile->id)
@ -113,9 +114,11 @@ class SearchController extends Controller
'avatar' => $item->avatarUrl(), 'avatar' => $item->avatarUrl(),
'id' => $item->id, 'id' => $item->id,
'entity' => [ 'entity' => [
'id' => $item->id, 'id' => (string) $item->id,
'following' => $item->followedBy(Auth::user()->profile), 'following' => $item->followedBy(Auth::user()->profile),
'thumb' => $item->avatarUrl() 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
'thumb' => $item->avatarUrl(),
'local' => (bool) !$item->domain
] ]
]; ];
}); });
@ -162,4 +165,5 @@ class SearchController extends Controller
return view('search.results'); return view('search.results');
} }
} }