eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[COMPONENT][Collection][CONTROLLER][Collection] Add utility method to call Feed::query in Collection, which handles getting and passing the page

Browse Source
This commit is contained in:
Hugo Sales
2022-01-02 23:59:23 +00:00
parent 07b65584ff
commit 141c5f6785
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/Feed/Controller/Feeds.php
View File

@@ -38,7 +38,6 @@ namespace Component\Feed\Controller;
use function App\Core\I18n\_m;
use App\Util\Common;
use Component\Collection\Util\Controller\FeedController;
use Component\Feed\Feed;
use Symfony\Component\HttpFoundation\Request;
class Feeds extends FeedController
@@ -48,9 +47,8 @@ class Feeds extends FeedController
*/
public function public(Request $request): array
{
$data = Feed::query(
$data = $this->query(
query: 'note-local:true',
page: $this->int('p'),
language: Common::actor()?->getTopLanguage()?->getLocale(),
);
return [
@@ -67,9 +65,8 @@ class Feeds extends FeedController
{
$user = Common::ensureLoggedIn();
$actor = $user->getActor();
$data = Feed::query(
$data = $this->query(
query: 'note-from:subscribed-person,subscribed-group,subscribed-organization,subscribed-business',
page: $this->int('p'),
language: $actor->getTopLanguage()->getLocale(),
actor: $actor,
);