From 4757bf5331851400c482fd62de0315e2717cf533 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 21 Dec 2014 10:55:15 +0100 Subject: [PATCH 1/5] Applied a change to the community query that was already done in another branch. --- mod/community.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/community.php b/mod/community.php index 30eb6ebb0..4d1e84cba 100644 --- a/mod/community.php +++ b/mod/community.php @@ -129,7 +129,7 @@ function community_getitems($start, $itemspage) { AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND (`contact`.`self` OR `contact`.`remote_self`) + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` WHERE `thread`.`visible` = 1 AND `thread`.`deleted` = 0 and `thread`.`moderated` = 0 AND `thread`.`private` = 0 AND `thread`.`wall` = 1 ORDER BY `thread`.`received` DESC LIMIT %d, %d ", From d054ac8d9c12d022382359a7eb3dc1086d63d523 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 21 Dec 2014 11:02:31 +0100 Subject: [PATCH 2/5] redone the changes I accidentally overwrote ... Me and GIT will never be in love ... --- include/threads.php | 109 ++++++++++++++++++++++++++++++++++++++++---- mod/community.php | 23 ++++++++++ 2 files changed, 123 insertions(+), 9 deletions(-) diff --git a/include/threads.php b/include/threads.php index 6b1c4342f..0ad1d396d 100644 --- a/include/threads.php +++ b/include/threads.php @@ -13,9 +13,51 @@ function add_thread($itemid) { .implode("`, `", array_keys($item)) ."`) VALUES ('" .implode("', '", array_values($item)) - ."')" ); + ."')"); logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); + + // Store a shadow copy of public items for displaying a global community page? + if (!get_config('system', 'global_community')) + return; + + // is it already a copy? + if (($itemid == 0) OR ($item['uid'] == 0)) + return; + + // Check, if hide-friends is activated - then don't do a shadow entry + $r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`", + $item['uid']); + if (!count($r)) + return; + + // Only add a shadow, if the profile isn't hidden + $r = q("SELECT `uid` FROM `user` where `uid` = %d AND NOT `hidewall`", $item['uid']); + if (!count($r)) + return; + + $item = q("SELECT * FROM `item` WHERE `id` = %d", + intval($itemid)); + + if (count($item) AND ($item[0]["visible"] == 1) AND ($item[0]["deleted"] == 0) AND + (($item[0]["id"] == $item[0]["parent"]) OR ($item[0]["parent"] == 0)) AND + ($item[0]["moderated"] == 0) AND ($item[0]["allow_cid"] == '') AND ($item[0]["allow_gid"] == '') AND + ($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '') AND ($item[0]["private"] == 0)) { + + $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", + dbesc($item['uri'])); + + if (!$r) { + // Preparing public shadow (removing user specific data) + require_once("include/items.php"); + unset($item[0]['id']); + $item[0]['uid'] = 0; + $item[0]['contact-id'] = 0; + + $public_shadow = item_store($item[0],false); + logger("add_thread: Stored public shadow for post ".$itemid." under id ".$public_shadow, LOGGER_DEBUG); + } + } } function update_thread_uri($itemuri, $uid) { @@ -27,7 +69,7 @@ function update_thread_uri($itemuri, $uid) { } function update_thread($itemid, $setmention = false) { - $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, + $items = q("SELECT `uid`, `uri`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `deleted`, `origin`, `forum_mode`, `network` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid)); if (!$items) @@ -40,16 +82,50 @@ function update_thread($itemid, $setmention = false) { $sql = ""; - foreach ($item AS $field => $data) { - if ($sql != "") - $sql .= ", "; + foreach ($item AS $field => $data) + if ($field != "uri") { + if ($sql != "") + $sql .= ", "; - $sql .= "`".$field."` = '".$data."'"; - } + $sql .= "`".$field."` = '".dbesc($data)."'"; + } - $result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", $itemid); + $result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", intval($itemid)); logger("update_thread: Update thread for item ".$itemid." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG); + + // Updating a shadow item entry + $items = q("SELECT `id`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, + `moderated`, `visible`, `spam`, `starred`, `bookmark`, `deleted`, `origin`, `forum_mode`, `network` + FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["uri"])); + + if (!$items) + return; + + $item = $items[0]; + + $result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `network` = '%s' WHERE `id` = %d", + dbesc($item["title"]), + dbesc($item["body"]), + dbesc($item["network"]), + intval($item["id"]) + ); + logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG); + + /* + $sql = ""; + + foreach ($item AS $field => $data) + if ($field != "id") { + if ($sql != "") + $sql .= ", "; + + $sql .= "`".$field."` = '".dbesc($data)."'"; + } + //logger("update_thread: Updating public shadow for post ".$item["id"]." SQL: ".$sql, LOGGER_DEBUG); + $result = q("UPDATE `item` SET ".$sql." WHERE `id` = %d", intval($item["id"])); + logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG); + */ } function delete_thread_uri($itemuri, $uid) { @@ -61,13 +137,28 @@ function delete_thread_uri($itemuri, $uid) { } function delete_thread($itemid) { + $item = q("SELECT `uri`, `uid` FROM `thread` WHERE `iid` = %d", intval($itemid)); + $result = q("DELETE FROM `thread` WHERE `iid` = %d", intval($itemid)); logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); + + if (count($item)) { + $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))", + dbesc($item["uri"]), + intval($item["uid"]) + ); + if (!count($r)) { + $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0)", + dbesc($item["uri"]) + ); + logger("delete_thread: Deleted shadow for item ".$item["uri"]." - ".print_r($result, true), LOGGER_DEBUG); + } + } } function update_threads() { - global $db; + global $db; logger("update_threads: start"); diff --git a/mod/community.php b/mod/community.php index 8d23c4af2..4d1e84cba 100644 --- a/mod/community.php +++ b/mod/community.php @@ -114,6 +114,10 @@ function community_content(&$a, $update = 0) { } function community_getitems($start, $itemspage) { + // Work in progress + if (get_config('system', 'global_community')) + return(community_getpublicitems($start, $itemspage)); + $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, @@ -136,3 +140,22 @@ function community_getitems($start, $itemspage) { return($r); } + +function community_getpublicitems($start, $itemspage) { + $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, + `author-name` AS `name`, `owner-avatar` AS `photo`, + `owner-link` AS `url`, `owner-avatar` AS `thumb` + FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s') + AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' + ORDER BY `item`.`received` DESC LIMIT %d, %d", + dbesc(NETWORK_DFRN), + dbesc(NETWORK_DIASPORA), + dbesc(NETWORK_OSTATUS), + intval($start), + intval($itemspage) + ); + + return($r); + +} From 043c406091492a61f256a73086c2f8448d93993f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 21 Dec 2014 21:19:37 +0100 Subject: [PATCH 3/5] Update function for creating the shadow entries. --- include/items.php | 6 ++-- include/shadowupdate.php | 22 +++++++++++++++ include/tags.php | 18 ++++++------ include/threads.php | 60 +++++++++++++++++++++++++++++----------- mod/community.php | 5 +--- 5 files changed, 80 insertions(+), 31 deletions(-) create mode 100644 include/shadowupdate.php diff --git a/include/items.php b/include/items.php index 22ae2f60a..ed91fc7e4 100644 --- a/include/items.php +++ b/include/items.php @@ -1044,7 +1044,7 @@ function encode_rel_links($links) { -function item_store($arr,$force_parent = false, $notify = false) { +function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { // If it is a posting where users should get notifications, then define it as wall posting if ($notify) { @@ -1469,7 +1469,7 @@ function item_store($arr,$force_parent = false, $notify = false) { // current post can be deleted if is for a communuty page and no mention are // in it. - if (!$deleted) { + if (!$deleted AND !$dontcache) { // Store the fresh generated item into the cache $cachefile = get_cachefile(urlencode($arr["guid"])."-".hash("md5", $arr['body'])); @@ -1491,7 +1491,7 @@ function item_store($arr,$force_parent = false, $notify = false) { } } - create_tags_from_item($current_post); + create_tags_from_item($current_post, $dontcache); create_files_from_item($current_post); if ($notify) diff --git a/include/shadowupdate.php b/include/shadowupdate.php new file mode 100644 index 000000000..74c2a43eb --- /dev/null +++ b/include/shadowupdate.php @@ -0,0 +1,22 @@ + diff --git a/include/tags.php b/include/tags.php index ea7eed84c..05e11b47e 100644 --- a/include/tags.php +++ b/include/tags.php @@ -1,5 +1,5 @@ get_baseurl(); @@ -26,14 +26,16 @@ function create_tags_from_item($itemid) { if ($message["deleted"]) return; - $cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body'])); + if (!$dontcache) { + $cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body'])); - if (($cachefile != '') AND !file_exists($cachefile)) { - $s = prepare_text($message['body']); - $stamp1 = microtime(true); - file_put_contents($cachefile, $s); - $a->save_timestamp($stamp1, "file"); - logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile); + if (($cachefile != '') AND !file_exists($cachefile)) { + $s = prepare_text($message['body']); + $stamp1 = microtime(true); + file_put_contents($cachefile, $s); + $a->save_timestamp($stamp1, "file"); + logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile); + } } $taglist = explode(",", $message["tag"]); diff --git a/include/threads.php b/include/threads.php index 0ad1d396d..0db858635 100644 --- a/include/threads.php +++ b/include/threads.php @@ -1,5 +1,5 @@ q(sprintf("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', '%s', '%s', '%s', '%s') + AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`", + NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS), true); + + logger("fetched messages: ".count($messages)); + while ($message = $db->qfetch()) + add_thread($message["iid"], true); + + $db->qclose(); +} ?> diff --git a/mod/community.php b/mod/community.php index 4d1e84cba..e23115157 100644 --- a/mod/community.php +++ b/mod/community.php @@ -145,13 +145,10 @@ function community_getpublicitems($start, $itemspage) { $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, `author-name` AS `name`, `owner-avatar` AS `photo`, `owner-link` AS `url`, `owner-avatar` AS `thumb` - FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s') + FROM `item` WHERE `item`.`uid` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' ORDER BY `item`.`received` DESC LIMIT %d, %d", - dbesc(NETWORK_DFRN), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS), intval($start), intval($itemspage) ); From 2ab38de59c15d949b27563a261ac858d7ac4266e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 21 Dec 2014 23:47:19 +0100 Subject: [PATCH 4/5] Additional check if the duplicated entry isn't from a hidden or blocked contact. --- include/threads.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/threads.php b/include/threads.php index 0db858635..f80212fad 100644 --- a/include/threads.php +++ b/include/threads.php @@ -35,13 +35,18 @@ function add_thread($itemid, $onlyshadow = false) { if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED, ""))) return; - // Check, if hide-friends is activated - then don't do a shadow entry - // Only do this check if the post isn't a wall post + // Only do these checks if the post isn't a wall post if (!$item["wall"]) { + // Check, if hide-friends is activated - then don't do a shadow entry $r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`", $item['uid']); if (!count($r)) return; + // Check if the contact is hidden or blocked + $r = q("SELECT `id` FROM `contact` WHERE NOT `hidden` AND NOT `blocked` AND `id` = %d", + $item['contact-id']); + if (!count($r)) + return; } // Only add a shadow, if the profile isn't hidden From 41014735f1b71d47556852b15acbd477ef588d53 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 22 Dec 2014 07:32:04 +0100 Subject: [PATCH 5/5] Feeds are never public so the posts can never be duplicated. --- include/threads.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/threads.php b/include/threads.php index f80212fad..28bf87f4d 100644 --- a/include/threads.php +++ b/include/threads.php @@ -32,7 +32,7 @@ function add_thread($itemid, $onlyshadow = false) { return; // is it an entry from a connector? Only add an entry for natively connected networks - if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED, ""))) + if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) return; // Only do these checks if the post isn't a wall post @@ -210,9 +210,9 @@ function update_shadow_copy() { logger("start"); - $messages = $db->q(sprintf("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', '%s', '%s', '%s', '%s') + $messages = $db->q(sprintf("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', '%s', '%s', '%s') AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`", - NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS), true); + NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS), true); logger("fetched messages: ".count($messages)); while ($message = $db->qfetch())