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

Add only_media support to /api/v1/timelines/tag/:id api endpoint

Browse source
This commit is contained in:
Daniel Supernault 2023-05-09 02:13:26 -06:00
parent ed35214161
commit b5fe956acf
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -3248,7 +3248,8 @@ class ApiV1Controller extends Controller
'page' => 'nullable|integer|max:40', 'page' => 'nullable|integer|max:40',
'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX, 'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX, 'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
'limit' => 'nullable|integer|max:100' 'limit' => 'nullable|integer|max:100',
'only_media' => 'sometimes|boolean'
]); ]);
if(config('database.default') === 'pgsql') { if(config('database.default') === 'pgsql') {
@ -3272,6 +3273,7 @@ class ApiV1Controller extends Controller
$min = $request->input('min_id'); $min = $request->input('min_id');
$max = $request->input('max_id'); $max = $request->input('max_id');
$limit = $request->input('limit', 20); $limit = $request->input('limit', 20);
$onlyMedia = $request->input('only_media', true);
if($min || $max) { if($min || $max) {
$minMax = SnowflakeService::byDate(now()->subMonths(6)); $minMax = SnowflakeService::byDate(now()->subMonths(6));
@ -3300,7 +3302,13 @@ class ApiV1Controller extends Controller
->map(function ($i) { ->map(function ($i) {
return StatusService::getMastodon($i); return StatusService::getMastodon($i);
}) })
->filter(function($i) { ->filter(function($i) use($onlyMedia) {
if(!$i) {
return false;
}
if($onlyMedia && !isset($i['media_attachments']) || !count($i['media_attachments'])) {
return false;
}
return $i && isset($i['account']); return $i && isset($i['account']);
}) })
->values() ->values()
@ -3873,6 +3881,12 @@ class ApiV1Controller extends Controller
abort_if(!$tag, 422, 'Unknown hashtag'); abort_if(!$tag, 422, 'Unknown hashtag');
abort_if(
HashtagFollow::whereProfileId($pid)->count() >= HashtagFollow::MAX_LIMIT,
422,
'You cannot follow more than ' . HashtagFollow::MAX_LIMIT . ' hashtags.'
);
$follows = HashtagFollow::updateOrCreate( $follows = HashtagFollow::updateOrCreate(
[ [
'profile_id' => $account['id'], 'profile_id' => $account['id'],
@ -3949,7 +3963,6 @@ class ApiV1Controller extends Controller
} }
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$account = AccountService::get($pid); $account = AccountService::get($pid);
$operator = config('database.default') == 'pgsql' ? 'ilike' : 'like'; $operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
$tag = Hashtag::where('name', $operator, $id) $tag = Hashtag::where('name', $operator, $id)
->orWhere('slug', $operator, $id) ->orWhere('slug', $operator, $id)