UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-30 16:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update SearchController

Browse source
This commit is contained in:
Daniel Supernault 2019-02-07 12:01:31 -07:00
parent 97bd7c7612
commit 25a33d717a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/Http/Controllers/SearchController.php
View file

@ -7,6 +7,7 @@ use App\Hashtag;
use App\Profile; use App\Profile;
use App\Status; use App\Status;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Util\ActivityPub\Helpers;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
class SearchController extends Controller class SearchController extends Controller
@ -24,6 +25,35 @@ class SearchController extends Controller
$hash = hash('sha256', $tag); $hash = hash('sha256', $tag);
$tokens = Cache::remember('api:search:tag:'.$hash, 5, function () use ($tag) { $tokens = Cache::remember('api:search:tag:'.$hash, 5, function () use ($tag) {
$tokens = collect([]); $tokens = collect([]);
if(Helpers::validateUrl($tag)) {
$remote = Helpers::fetchFromUrl($tag);
if(isset($remote['type']) && in_array($remote['type'], ['Create', 'Person']) == true) {
$type = $remote['type'];
if($type == 'Person') {
$item = Helpers::profileFirstOrNew($tag);
$tokens->push([[
'count' => 1,
'url' => $item->url(),
'type' => 'profile',
'value' => $item->username,
'tokens' => [$item->username],
'name' => $item->name,
]]);
} else if ($type == 'Create') {
$item = Helpers::statusFirstOrFetch($tag, false);
$tokens->push([[
'count' => 0,
'url' => $item->url(),
'type' => 'status',
'value' => "by {$item->profile->username} <span class='float-right'>{$item->created_at->diffForHumans(null, true, true)}</span>",
'tokens' => [$item->caption],
'name' => $item->caption,
'thumb' => $item->thumb(),
]]);
}
}
}
$hashtags = Hashtag::select('id', 'name', 'slug')->where('slug', 'like', '%'.$tag.'%')->limit(20)->get(); $hashtags = Hashtag::select('id', 'name', 'slug')->where('slug', 'like', '%'.$tag.'%')->limit(20)->get();
if($hashtags->count() > 0) { if($hashtags->count() > 0) {
$tags = $hashtags->map(function ($item, $key) { $tags = $hashtags->map(function ($item, $key) {
@ -41,6 +71,7 @@ class SearchController extends Controller
$users = Profile::select('username', 'name', 'id') $users = Profile::select('username', 'name', 'id')
->whereNull('status') ->whereNull('status')
->where('username', 'like', '%'.$tag.'%') ->where('username', 'like', '%'.$tag.'%')
->orWhere('remote_url', $tag)
->limit(20) ->limit(20)
->get(); ->get();
@ -66,6 +97,7 @@ class SearchController extends Controller
->whereNull('reblog_of_id') ->whereNull('reblog_of_id')
->whereProfileId(Auth::user()->profile->id) ->whereProfileId(Auth::user()->profile->id)
->where('caption', 'like', '%'.$tag.'%') ->where('caption', 'like', '%'.$tag.'%')
->orWhere('uri', $tag)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->get(); ->get();