From 485f97b3d8937f219e2b9f3c662ee0e1966130eb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 15 Nov 2011 20:30:34 -0800 Subject: tgroup relays --- include/items.php | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index b8e258d3f..7ab7eeaa4 100644 --- a/include/items.php +++ b/include/items.php @@ -893,6 +893,8 @@ function item_store($arr,$force_parent = false) { ); } + tgroup_deliver($arr['uid'],$current_post); + return $current_post; } @@ -909,6 +911,64 @@ function get_item_contact($item,$contacts) { } +function tgroup_deliver($uid,$item_id) { + + $a = get_app(); + + $deliver_to_tgroup = false; + + $u = q("select * from user where uid = %d and `page-flags` = %d limit 1", + intval($uid), + intval(PAGE_COMMUNITY) + ); + if(! count($u)) + return; + + // We will only forward public tgroup posts, as this opens a second delivery chain + // and privacy can only be controlled by the first chain. + + $i = q("select * from item where id = %d and uid = %d and private = 0 limit 1", + intval($item_id), + intval($uid) + ); + if(! count($i)) + return; + + $item = $i[0]; + + // prevent delivery looping - only proceed + // if the message originated elsewhere + + if(($item['wall']) || ($item['origin'])) + return; + + + $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']); + + $cnt = preg_match_all('/\@\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + if(link_compare($link,$mtch[1])) { + $deliver_to_tgroup = true; + logger('tgroup_deliver: local group mention found: ' . $mtch[2]); + } + } + } + + if(! $deliver_to_tgroup) + return; + + // now deliver to all the tgroup members + + proc_run('php','include/notifier.php','tgroup',$item_id); + +} + + + + + + function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $a = get_app(); @@ -1962,18 +2022,31 @@ function local_delivery($importer,$data) { if($is_reply) { + $community = false; + + if($importer['page-flags'] == PAGE_COMMUNITY) { + $sql_extra = ''; + $community = true; + logger('local_delivery: community reply'); + } + else + $sql_extra = " and contact.self = 1 and item.wall = 1 "; + // was the top-level post for this reply written by somebody on this site? // Specifically, the recipient? - +dbg(1); $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `contact`.`self` = 1 AND `item`.`wall` = 1 AND `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s' - AND `item`.`uid` = %d LIMIT 1", + WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s' + AND `item`.`uid` = %d + $sql_extra + LIMIT 1", dbesc($parent_uri), dbesc($parent_uri), intval($importer['importer_uid']) ); +dbg(0); if($r && count($r)) { logger('local_delivery: received remote comment'); @@ -1981,7 +2054,7 @@ function local_delivery($importer,$data) { // remote reply to our post. Import and then notify everybody else. $datarray = get_atom_elements($feed,$item); - if(! link_compare($datarray['author-link'],$importer['url'])) { + if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); // they won't know what to do so don't report an error. Just quietly die. return 0; @@ -2028,6 +2101,16 @@ function local_delivery($importer,$data) { } } + if($community) { + $newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]'; + if(! stristr($datarray['tag'],$newtag)) { + if(strlen($datarray['tag'])) + $datarray['tag'] .= ','; + $datarray['tag'] .= $newtag; + } + } + + $posted_id = item_store($datarray); $parent = 0; -- cgit v1.2.3 From 6893df991edfe971871a5db45055b40b871a7a4f Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Nov 2011 22:03:49 -0800 Subject: update user-agent string for remote http requests --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/network.php b/include/network.php index e89eb94da..78ed24074 100644 --- a/include/network.php +++ b/include/network.php @@ -22,7 +22,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_ } @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - @curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); + @curl_setopt($ch, CURLOPT_USERAGENT, "Friendica"); if(intval($timeout)) { @@ -105,7 +105,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); curl_setopt($ch, CURLOPT_POST,1); curl_setopt($ch, CURLOPT_POSTFIELDS,$params); - curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); + curl_setopt($ch, CURLOPT_USERAGENT, "Friendica"); if(intval($timeout)) { curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); -- cgit v1.2.3 From 64635438326e34710138e3e270cb3bbfc55d76a1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Nov 2011 22:20:08 -0800 Subject: new approach to secondary delivery fork --- include/items.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 72c1a8b32..381032629 100644 --- a/include/items.php +++ b/include/items.php @@ -913,6 +913,9 @@ function get_item_contact($item,$contacts) { function tgroup_deliver($uid,$item_id) { + + // setup a second delivery chain for forum/community posts if appropriate + $a = get_app(); $deliver_to_tgroup = false; @@ -937,9 +940,9 @@ function tgroup_deliver($uid,$item_id) { $item = $i[0]; // prevent delivery looping - only proceed - // if the message originated elsewhere + // if the message originated elsewhere and is a top-level post - if(($item['wall']) || ($item['origin'])) + if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) return; @@ -958,7 +961,12 @@ function tgroup_deliver($uid,$item_id) { if(! $deliver_to_tgroup) return; - // now deliver to all the tgroup members + // now change this post to a forum head message and deliver to all the tgroup members + + + q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", + intval($item_id) + ); proc_run('php','include/notifier.php','tgroup',$item_id); @@ -2025,17 +2033,18 @@ function local_delivery($importer,$data) { $community = false; - if($importer['page-flags'] == PAGE_COMMUNITY) { - $sql_extra = ''; - $community = true; - logger('local_delivery: community reply'); - } - else +// if($importer['page-flags'] == PAGE_COMMUNITY) { +// $sql_extra = ''; +// $community = true; +// logger('local_delivery: community reply'); +// } +// else + $sql_extra = " and contact.self = 1 and item.wall = 1 "; // was the top-level post for this reply written by somebody on this site? // Specifically, the recipient? -dbg(1); +//dbg(1); $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` @@ -2047,7 +2056,7 @@ dbg(1); dbesc($parent_uri), intval($importer['importer_uid']) ); -dbg(0); +//dbg(0); if($r && count($r)) { logger('local_delivery: received remote comment'); @@ -2055,11 +2064,11 @@ dbg(0); // remote reply to our post. Import and then notify everybody else. $datarray = get_atom_elements($feed,$item); - if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { - logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); +// if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { +// logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); // they won't know what to do so don't report an error. Just quietly die. - return 0; - } +// return 0; +// } $datarray['type'] = 'remote-comment'; $datarray['wall'] = 1; -- cgit v1.2.3 From 72dd6457b014e504c79dbe494ac6095cadd9b942 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 Nov 2011 03:06:15 -0800 Subject: first forum test --- include/items.php | 29 ++++++++++++++--------------- include/notifier.php | 12 ++++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 381032629..caf497345 100644 --- a/include/items.php +++ b/include/items.php @@ -2033,13 +2033,12 @@ function local_delivery($importer,$data) { $community = false; -// if($importer['page-flags'] == PAGE_COMMUNITY) { -// $sql_extra = ''; -// $community = true; -// logger('local_delivery: community reply'); -// } -// else - + if($importer['page-flags'] == PAGE_COMMUNITY) { + $sql_extra = ''; + $community = true; + logger('local_delivery: community reply'); + } + else $sql_extra = " and contact.self = 1 and item.wall = 1 "; // was the top-level post for this reply written by somebody on this site? @@ -2113,14 +2112,14 @@ function local_delivery($importer,$data) { } } - if($community) { - $newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]'; - if(! stristr($datarray['tag'],$newtag)) { - if(strlen($datarray['tag'])) - $datarray['tag'] .= ','; - $datarray['tag'] .= $newtag; - } - } +// if($community) { +// $newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]'; +// if(! stristr($datarray['tag'],$newtag)) { +// if(strlen($datarray['tag'])) +// $datarray['tag'] .= ','; +// $datarray['tag'] .= $newtag; +// } +// } $posted_id = item_store($datarray); diff --git a/include/notifier.php b/include/notifier.php index a4fe9b71e..c81ca2d15 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -218,6 +218,11 @@ function notifier_run($argv, $argc){ $relay_to_owner = true; } + + if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) { + $relay_to_owner = true; + } + // until the 'origin' flag has been in use for several months // we will just use it as a fallback test // later we will be able to use it as the primary test of whether or not to relay. @@ -259,6 +264,13 @@ function notifier_run($argv, $argc){ $deny_people = expand_acl($parent['deny_cid']); $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); + // if our parent is a forum, uplink to the origonal author causing + // a delivery fork + + if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) { + proc_run('php','include/notifier','uplink',$item_id); + } + $conversants = array(); foreach($items as $item) { -- cgit v1.2.3 From 191a9b048f3afa28b08a2e3cd2b277fc84956876 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 Nov 2011 03:13:46 -0800 Subject: forum cleanup --- include/items.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index caf497345..8ea43efeb 100644 --- a/include/items.php +++ b/include/items.php @@ -927,10 +927,7 @@ function tgroup_deliver($uid,$item_id) { if(! count($u)) return; - // We will only forward public tgroup posts, as this opens a second delivery chain - // and privacy can only be controlled by the first chain. - - $i = q("select * from item where id = %d and uid = %d and private = 0 limit 1", + $i = q("select * from item where id = %d and uid = %d limit 1", intval($item_id), intval($uid) ); @@ -961,7 +958,7 @@ function tgroup_deliver($uid,$item_id) { if(! $deliver_to_tgroup) return; - // now change this post to a forum head message and deliver to all the tgroup members + // now change this copy of the post to a forum head message and deliver to all the tgroup members q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", -- cgit v1.2.3 From aaedac8f574278fba89cd11d3d8f1adaeb6b030e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 Nov 2011 13:45:20 -0800 Subject: community forums cleanup --- include/items.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 8ea43efeb..4e5617627 100644 --- a/include/items.php +++ b/include/items.php @@ -2040,7 +2040,7 @@ function local_delivery($importer,$data) { // was the top-level post for this reply written by somebody on this site? // Specifically, the recipient? -//dbg(1); + $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` @@ -2052,7 +2052,7 @@ function local_delivery($importer,$data) { dbesc($parent_uri), intval($importer['importer_uid']) ); -//dbg(0); + if($r && count($r)) { logger('local_delivery: received remote comment'); @@ -2060,6 +2060,9 @@ function local_delivery($importer,$data) { // remote reply to our post. Import and then notify everybody else. $datarray = get_atom_elements($feed,$item); + + // TODO: make this next part work against both delivery threads of a community post + // if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { // logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); // they won't know what to do so don't report an error. Just quietly die. -- cgit v1.2.3