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

Update ApiV1Controller, fix hashtag feed to include private posts from accounts you follow or your own, and your own unlisted posts

Browse source
This commit is contained in:
Daniel Supernault 2024-03-05 05:39:47 -07:00
parent 1a811b1840
commit 3b5500b3a5
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3635,7 +3635,7 @@ class ApiV1Controller extends Controller
'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' => 'sometimes|integer|min:1', 'limit' => 'sometimes|integer|min:1',
'only_media' => 'sometimes|boolean', 'only_media' => 'sometimes',
'_pe' => 'sometimes', '_pe' => 'sometimes',
]); ]);
@ -3670,7 +3670,7 @@ class ApiV1Controller extends Controller
if ($limit > 40) { if ($limit > 40) {
$limit = 40; $limit = 40;
} }
$onlyMedia = $request->input('only_media', true); $onlyMedia = $request->boolean('only_media', true);
$pe = $request->has(self::PF_API_ENTITY_KEY); $pe = $request->has(self::PF_API_ENTITY_KEY);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -3696,20 +3696,32 @@ class ApiV1Controller extends Controller
} }
$res = StatusHashtag::whereHashtagId($tag->id) $res = StatusHashtag::whereHashtagId($tag->id)
->whereStatusVisibility('public') ->whereIn('status_visibility', ['public', 'private', 'unlisted'])
->where('status_id', $dir, $id) ->where('status_id', $dir, $id)
->orderBy('status_id', 'desc') ->orderBy('status_id', 'desc')
->limit(100) ->limit(100)
->pluck('status_id') ->pluck('status_id')
->map(function ($i) use ($pe) { ->map(function ($i) use ($pe) {
return $pe ? StatusService::get($i) : StatusService::getMastodon($i); return $pe ? StatusService::get($i, false) : StatusService::getMastodon($i, false);
}) })
->filter(function ($i) use ($onlyMedia) { ->filter(function ($i) use ($onlyMedia, $pid) {
if (! $i) { if (! $i || ! isset($i['account'], $i['account']['id'])) {
return false; return false;
} }
if ($onlyMedia && ! isset($i['media_attachments']) || ! count($i['media_attachments'])) { if ($i['visibility'] === 'unlisted') {
return false; if ((int) $i['account']['id'] !== $pid) {
return false;
}
}
if ($i['visibility'] === 'private') {
if ((int) $i['account']['id'] !== $pid) {
return FollowerService::follows($pid, $i['account']['id'], true);
}
}
if ($onlyMedia == true) {
if (! isset($i['media_attachments']) || ! count($i['media_attachments'])) {
return false;
}
} }
return $i && isset($i['account'], $i['url']); return $i && isset($i['account'], $i['url']);