forked from mirror/pixelfed
commit
a3eacfde50
2 changed files with 6 additions and 5 deletions
|
@ -58,6 +58,7 @@
|
|||
- Updated Nodeinfo util, use last_active_at for monthly active user count. ([d200c12c](https://github.com/pixelfed/pixelfed/commit/d200c12c))
|
||||
- Updated PhotoPresenter, add width and height to images. ([3f8202e2](https://github.com/pixelfed/pixelfed/commit/3f8202e2))
|
||||
- Updated Compose Apis, refactor rate limits. ([42375b3d](https://github.com/pixelfed/pixelfed/commit/42375b3d))
|
||||
- Updated PublicApiController, show unlisted comments. ([e1c6297e](https://github.com/pixelfed/pixelfed/commit/e1c6297e))
|
||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||
|
||||
## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)
|
||||
|
|
|
@ -154,10 +154,10 @@ class PublicApiController extends Controller
|
|||
->whereFilterableType('App\Profile')
|
||||
->whereIn('filter_type', ['mute', 'block'])
|
||||
->pluck('filterable_id')->toArray();
|
||||
$scope = $p->id == $status->profile_id ? ['public', 'private'] : ['public'];
|
||||
$scope = $p->id == $status->profile_id ? ['public', 'private', 'unlisted'] : ['public','unlisted'];
|
||||
} else {
|
||||
$filtered = [];
|
||||
$scope = ['public'];
|
||||
$scope = ['public', 'unlisted'];
|
||||
}
|
||||
|
||||
if($request->filled('min_id') || $request->filled('max_id')) {
|
||||
|
@ -166,7 +166,7 @@ class PublicApiController extends Controller
|
|||
->whereNull('reblog_of_id')
|
||||
->whereIn('scope', $scope)
|
||||
->whereNotIn('profile_id', $filtered)
|
||||
->select('id', 'caption', 'local', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->where('id', '>=', $request->min_id)
|
||||
->orderBy('id', 'desc')
|
||||
->paginate($limit);
|
||||
|
@ -176,7 +176,7 @@ class PublicApiController extends Controller
|
|||
->whereNull('reblog_of_id')
|
||||
->whereIn('scope', $scope)
|
||||
->whereNotIn('profile_id', $filtered)
|
||||
->select('id', 'caption', 'local', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->where('id', '<=', $request->max_id)
|
||||
->orderBy('id', 'desc')
|
||||
->paginate($limit);
|
||||
|
@ -186,7 +186,7 @@ class PublicApiController extends Controller
|
|||
->whereNull('reblog_of_id')
|
||||
->whereIn('scope', $scope)
|
||||
->whereNotIn('profile_id', $filtered)
|
||||
->select('id', 'caption', 'local', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
|
||||
->orderBy('id', 'desc')
|
||||
->paginate($limit);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue