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

Update DiscoverController, cache public tag feed and only include local posts for unauthenticated users

Browse source
This commit is contained in:
Daniel Supernault 2022-03-31 01:04:15 -06:00
parent bc4647aa99
commit 0541aed510
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/Http/Controllers/DiscoverController.php
View file

@ -63,12 +63,12 @@ class DiscoverController extends Controller
public function getHashtags(Request $request) public function getHashtags(Request $request)
{ {
$auth = Auth::check(); $user = $request->user();
abort_if(!config('instance.discover.tags.is_public') && !$auth, 403); abort_if(!config('instance.discover.tags.is_public') && !$user, 403);
$this->validate($request, [ $this->validate($request, [
'hashtag' => 'required|string|min:1|max:124', 'hashtag' => 'required|string|min:1|max:124',
'page' => 'nullable|integer|min:1|max:' . ($auth ? 29 : 10) 'page' => 'nullable|integer|min:1|max:' . ($user ? 29 : 10)
]); ]);
$page = $request->input('page') ?? '1'; $page = $request->input('page') ?? '1';
@ -76,8 +76,8 @@ class DiscoverController extends Controller
$tag = $request->input('hashtag'); $tag = $request->input('hashtag');
$hashtag = Hashtag::whereName($tag)->firstOrFail(); $hashtag = Hashtag::whereName($tag)->firstOrFail();
if($page == 1) { if($user && $page == 1) {
$res['follows'] = HashtagFollow::whereUserId(Auth::id()) $res['follows'] = HashtagFollow::whereUserId($user->id)
->whereHashtagId($hashtag->id) ->whereHashtagId($hashtag->id)
->exists(); ->exists();
} }
@ -85,7 +85,37 @@ class DiscoverController extends Controller
'name' => $hashtag->name, 'name' => $hashtag->name,
'url' => $hashtag->url() 'url' => $hashtag->url()
]; ];
$res['tags'] = StatusHashtagService::get($hashtag->id, $page, $end); if($user) {
$tags = StatusHashtagService::get($hashtag->id, $page, $end);
$res['tags'] = collect($tags)
->filter(function($tag) {
if(!StatusService::get($tag['status']['id'])) {
return false;
}
return true;
})
->values();
} else {
$key = 'discover:tags:public_feed:' . $hashtag->id . ':page:' . $page;
$tags = Cache::remember($key, 900, function() use($hashtag, $page, $end) {
return collect(StatusHashtagService::get($hashtag->id, $page, $end))
->filter(function($tag) {
if(!$tag['status']['local']) {
return false;
}
return true;
})
->values();
});
$res['tags'] = collect($tags)
->filter(function($tag) {
if(!StatusService::get($tag['status']['id'])) {
return false;
}
return true;
})
->values();
}
return $res; return $res;
} }

1
app/Media.php
View file

@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use App\Util\Media\License; use App\Util\Media\License;
use Storage; use Storage;
use Illuminate\Support\Str;
class Media extends Model class Media extends Model
{ {