bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

"item" is replaced by "post-view" / postupdate check added

Browse source
This commit is contained in:
Michael 2021-01-17 20:32:13 +00:00
commit 4157db5473
28 changed files with 104 additions and 782 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Content/ForumManager.php
View file

@ -209,14 +209,14 @@ class ForumManager
public static function countUnseenItems()
{
$stmtContacts = DBA::p(
"SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
"SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `post-view`
INNER JOIN `contact` ON `post-view`.`contact-id` = `contact`.`id`
WHERE `post-view`.`uid` = ? AND `post-view`.`visible` AND NOT `post-view`.`deleted` AND `post-view`.`unseen`
AND `contact`.`network` IN (?, ?) AND `contact`.`contact-type` = ?
AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
AND NOT `contact`.`pending` AND NOT `contact`.`archive`
GROUP BY `contact`.`id` ",
local_user()
GROUP BY `contact`.`id`",
local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY
);
return DBA::toArray($stmtContacts);

8
src/Content/Widget/TagCloud.php
View file

@ -92,19 +92,19 @@ class TagCloud
if ($flags) {
if ($flags === 'wall') {
$sql_options .= ' AND `item`.`wall` ';
$sql_options .= ' AND `post-view`.`wall` ';
}
}
if ($owner_id) {
$sql_options .= ' AND `item`.`owner-id` = ' . intval($owner_id) . ' ';
$sql_options .= ' AND `post-view`.`owner-id` = ' . intval($owner_id) . ' ';
}
// Fetch tags
$tag_stmt = DBA::p("SELECT `name`, COUNT(`name`) AS `total` FROM `tag-search-view`
LEFT JOIN `item` ON `tag-search-view`.`uri-id` = `item`.`uri-id`
LEFT JOIN `post-view` ON `tag-search-view`.`uri-id` = `post-view`.`uri-id`
WHERE `tag-search-view`.`uid` = ?
AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `post-view`.`visible` AND NOT `post-view`.`deleted` AND NOT `post-view`.`moderated`
$sql_options
GROUP BY `name` ORDER BY `total` DESC $limit",
$uid