mirror
/
social
kopia lustrzana https://github.com/nextcloud/social
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Reorder limit calls to fix sqlite query 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/143/head
Julius Härtl 2018-12-05 18:21:46 +01:00
rodzic a58dbbc3d5
commit 554213c391
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4C614C6ED2CDE6DF
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
lib/Db/NotesRequest.php
Wyświetl plik

@ -201,10 +201,10 @@ class NotesRequest extends NotesRequestBuilder {
*/
public function getStreamAccount(string $actorId, int $since = 0, int $limit = 5): array {
$qb = $this->getNotesSelectSql();
$this->limitToRecipient($qb, ActivityService::TO_PUBLIC);
$this->limitPaginate($qb, $since, $limit);
$this->limitToAttributedTo($qb, $actorId);
$this->leftJoinCacheActors($qb, 'attributed_to');
$this->limitToRecipient($qb, ActivityService::TO_PUBLIC);
$notes = [];
$cursor = $qb->execute();
@ -230,9 +230,9 @@ class NotesRequest extends NotesRequestBuilder {
*/
public function getStreamDirect(string $actorId, int $since = 0, int $limit = 5): array {
$qb = $this->getNotesSelectSql();
$this->limitToRecipient($qb, $actorId, true);
$this->limitPaginate($qb, $since, $limit);
$this->leftJoinCacheActors($qb, 'attributed_to');
$this->limitToRecipient($qb, $actorId, true);
$notes = [];
$cursor = $qb->execute();
@ -258,12 +258,12 @@ class NotesRequest extends NotesRequestBuilder {
public function getStreamTimeline(int $since = 0, int $limit = 5, bool $localOnly = true
): array {
$qb = $this->getNotesSelectSql();
$this->limitToRecipient($qb, ActivityService::TO_PUBLIC);
$this->limitPaginate($qb, $since, $limit);
if ($localOnly) {
$this->limitToLocal($qb, true);
}
$this->leftJoinCacheActors($qb, 'attributed_to');
$this->limitToRecipient($qb, ActivityService::TO_PUBLIC);
$notes = [];
$cursor = $qb->execute();