Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New query for community page

Browse source
This commit is contained in:
Michael 2020-03-02 14:59:16 +00:00
parent 31f912b78e
commit d3c6f6de2a
1 changed files with 17 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Module/Conversation/Community.php
View file

@ -280,42 +280,20 @@ class Community extends BaseModule
$r = false; $r = false;
if (self::$content == 'local') { if (self::$content == 'local') {
$values = [];
$sql_accounttype = '';
$sql_boundaries = '';
if (!is_null(self::$accounttype)) { if (!is_null(self::$accounttype)) {
$sql_accounttype = " AND `user`.`account-type` = ?"; $condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accounttype];
$values[] = [self::$accounttype]; } else {
$condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC];
} }
if (isset($since_id)) {
$sql_boundaries .= " AND `thread`.`commented` > ?";
$values[] = $since_id;
}
if (isset($max_id)) {
$sql_boundaries .= " AND `thread`.`commented` < ?";
$values[] = $max_id;
}
$values[] = $itemspage;
$r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link`, `thread`.`commented` FROM `thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
AND `thread`.`private` = ? AND `thread`.`wall` AND `thread`.`origin`
$sql_accounttype
$sql_boundaries
ORDER BY `thread`.`commented` DESC
LIMIT ?", Item::PUBLIC, $values);
} elseif (self::$content == 'global') { } elseif (self::$content == 'global') {
if (!is_null(self::$accounttype)) { if (!is_null(self::$accounttype)) {
$condition = ["`uid` = ? AND `private` = ? AND `owner`.`contact-type` = ?", 0, Item::PUBLIC, self::$accounttype]; $condition = ["`uid` = ? AND `private` = ? AND `owner`.`contact-type` = ?", 0, Item::PUBLIC, self::$accounttype];
} else { } else {
$condition = ["`uid` = ? AND `private` = ?", 0, Item::PUBLIC]; $condition = ["`uid` = ? AND `private` = ?", 0, Item::PUBLIC];
} }
} else {
return [];
}
if (isset($max_id)) { if (isset($max_id)) {
$condition[0] .= " AND `commented` < ?"; $condition[0] .= " AND `commented` < ?";
@ -327,8 +305,7 @@ class Community extends BaseModule
$condition[] = $since_id; $condition[] = $since_id;
} }
$r = Item::selectThreadForUser(0, ['uri', 'commented'], $condition, ['order' => ['commented' => true], 'limit' => $itemspage]); $r = Item::selectThreadForUser(0, ['uri', 'commented', 'author-link'], $condition, ['order' => ['commented' => true], 'limit' => $itemspage]);
}
return DBA::toArray($r); return DBA::toArray($r);
} }