github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 04:33:47 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Improve discussion page canonical URL (#2853)

Browse Source 
* Switch to ?page= discussion page canonical URL & fix no-JS pagination buttons
This commit is contained in:
David Sevilla Martín 2021-05-10 19:20:47 -04:00 committed by GitHub
parent 03e4f31bda
commit 6fd185e425
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
framework/core/src/Forum/Content/Discussion.php
View File

@ -50,12 +50,13 @@ class Discussion
{
$queryParams = $request->getQueryParams();
$id = Arr::get($queryParams, 'id');
$page = max(1, intval(Arr::get($queryParams, 'page')));
$near = intval(Arr::get($queryParams, 'near'));
$page = max(1, intval(Arr::get($queryParams, 'page')), 1 + intdiv($near, 20));
$params = [
'id' => $id,
'page' => [
'near' => Arr::get($queryParams, 'near'),
'near' => $near,
'offset' => ($page - 1) * 20,
'limit' => 20
]
@ -72,10 +73,16 @@ class Discussion
$url = function ($newQueryParams) use ($queryParams, $apiDocument) {
$newQueryParams = array_merge($queryParams, $newQueryParams);
unset($newQueryParams['id']);
unset($newQueryParams['near']);
if (Arr::get($newQueryParams, 'page') == 1) {
unset($newQueryParams['page']);
}
$queryString = http_build_query($newQueryParams);
return $this->url->to('forum')->route('discussion', ['id' => $apiDocument->data->attributes->slug]).
($queryString ? '?'.$queryString : '');
($queryString ? '?'.$queryString : '');
};
$posts = [];
@ -86,9 +93,12 @@ class Discussion
}
}
$hasPrevPage = $page > 1;
$hasNextPage = $page < 1 + intval($apiDocument->data->attributes->commentCount / 20);
$document->title = $apiDocument->data->attributes->title;
$document->canonicalUrl = $url([]);
$document->content = $this->view->make('flarum.forum::frontend.content.discussion', compact('apiDocument', 'page', 'getResource', 'posts', 'url'));
$document->canonicalUrl = $url(['page' => $page]);
$document->content = $this->view->make('flarum.forum::frontend.content.discussion', compact('apiDocument', 'page', 'hasPrevPage', 'hasNextPage', 'getResource', 'posts', 'url'));
$document->payload['apiDocument'] = $apiDocument;
return $document;

4
framework/core/views/frontend/content/discussion.blade.php
View File

@ -15,11 +15,11 @@
@endforeach
</div>
@if (isset($apiDocument->links->prev))
@if ($hasPrevPage)
<a href="{{ $url(['page' => $page - 1]) }}">&laquo; {{ $translator->trans('core.views.discussion.previous_page_button') }}</a>
@endif
@if (isset($apiDocument->links->next))
@if ($hasNextPage)
<a href="{{ $url(['page' => $page + 1]) }}">{{ $translator->trans('core.views.discussion.next_page_button') }} &raquo;</a>
@endif
</div>