X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=b413f59e522387bdcf45ff4f95b79af463b6f95a;hb=c892e56a905062c83095fa852c5628a8cb08f26f;hp=75669768515f7bbbaa653223bcb92634c0219cc3;hpb=f8f34cbbf32334c4f11e21f2be6e2f6664a2b4b9;p=friendica-addons.git diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php old mode 100755 new mode 100644 index 75669768..b413f59e --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -2,7 +2,7 @@ /** * Name: pump.io Post Connector * Description: Post to pump.io - * Version: 0.1 + * Version: 0.2 * Author: Michael Vogel */ require('addon/pumpio/oauth/http.php'); @@ -11,23 +11,23 @@ require('addon/pumpio/oauth/oauth_client.php'); define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes function pumpio_install() { - register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); } function pumpio_uninstall() { - unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); } function pumpio_module() {} @@ -39,6 +39,9 @@ function pumpio_content(&$a) { return ''; } + require_once("mod/settings.php"); + settings_init($a); + if (isset($a->argv[1])) switch ($a->argv[1]) { case "connect": @@ -54,42 +57,47 @@ function pumpio_content(&$a) { return $o; } -function pumpio_registerclient($a, $host) { +function pumpio_registerclient(&$a, $host) { $url = "https://".$host."/api/client/register"; - $params = array(); + $params = array(); $application_name = get_config('pumpio', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname(); - $params["type"] = "client_associate"; - $params["contacts"] = $a->config['admin_email']; - $params["application_type"] = "native"; - $params["application_name"] = $application_name; - $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png"; - $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect"; - - $ch = curl_init($url); - curl_setopt($ch, CURLOPT_HEADER, false); - curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - curl_setopt($ch, CURLOPT_POST,1); - curl_setopt($ch, CURLOPT_POSTFIELDS,$params); - curl_setopt($ch, CURLOPT_USERAGENT, "Friendica"); - - $s = curl_exec($ch); - $curl_info = curl_getinfo($ch); - - if ($curl_info["http_code"] == "200") { - $values = json_decode($s); + $params["type"] = "client_associate"; + $params["contacts"] = $a->config['admin_email']; + $params["application_type"] = "native"; + $params["application_name"] = $application_name; + $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png"; + $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect"; + + logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG); + + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_HEADER, false); + curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); + curl_setopt($ch, CURLOPT_POST,1); + curl_setopt($ch, CURLOPT_POSTFIELDS,$params); + curl_setopt($ch, CURLOPT_USERAGENT, "Friendica"); + + $s = curl_exec($ch); + $curl_info = curl_getinfo($ch); + + if ($curl_info["http_code"] == "200") { + $values = json_decode($s); + logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG); return($values); - } + } + logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG); return(false); + } -function pumpio_connect($a) { +function pumpio_connect(&$a) { // Start a session. This is necessary to hold on to a few keys the callback script will also need session_start(); @@ -99,16 +107,23 @@ function pumpio_connect($a) { $hostname = get_pconfig(local_user(), 'pumpio','host'); if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) { + logger("pumpio_connect: register client"); $clientdata = pumpio_registerclient($a, $hostname); set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id); set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret); $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key'); $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret'); + + logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG); } - if (($consumer_key == "") OR ($consumer_secret == "")) - return; + if (($consumer_key == "") OR ($consumer_secret == "")) { + logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname)); + + $o .= sprintf(t("Unable to register the client at the pump.io server '%s'."), $hostname); + return($o); + } // The callback URL is the script that gets called after the user authenticates with pumpio $callback_url = $a->get_baseurl()."/pumpio/connect"; @@ -134,130 +149,140 @@ function pumpio_connect($a) { if (($success = $client->Initialize())) { if (($success = $client->Process())) { if (strlen($client->access_token)) { + logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG); set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token); set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); } } $success = $client->Finalize($success); } - if($client->exit) - $o = 'Could not connect to pumpio. Refresh the page or try again later.'; + if($client->exit) + $o = 'Could not connect to pumpio. Refresh the page or try again later.'; - if($success) { + if($success) { + logger("pumpio_connect: authenticated"); $o .= t("You are now authenticated to pumpio."); $o .= '
'.t("return to the connector page").''; + } else { + logger("pumpio_connect: could not connect"); + $o = 'Could not connect to pumpio. Refresh the page or try again later.'; } return($o); } function pumpio_jot_nets(&$a,&$b) { - if(! local_user()) - return; - - $pumpio_post = get_pconfig(local_user(),'pumpio','post'); - if(intval($pumpio_post) == 1) { - $pumpio_defpost = get_pconfig(local_user(),'pumpio','post_by_default'); - $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . t('Post to pumpio') . '
'; - } + if(! local_user()) + return; + + $pumpio_post = get_pconfig(local_user(),'pumpio','post'); + if(intval($pumpio_post) == 1) { + $pumpio_defpost = get_pconfig(local_user(),'pumpio','post_by_default'); + $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : ''); + $b .= '
' + . t('Post to pumpio') . '
'; + } } function pumpio_settings(&$a,&$s) { - if(! local_user()) - return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - $a->page['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $import_enabled = get_pconfig(local_user(),'pumpio','import'); - $import_checked = (($import_enabled) ? ' checked="checked" ' : ''); + if(! local_user()) + return; - $enabled = get_pconfig(local_user(),'pumpio','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); + /* Add our stylesheet to the page so we can make our settings look nice */ - $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $a->page['htmlhead'] .= '' . "\r\n"; - $public_enabled = get_pconfig(local_user(),'pumpio','public'); - $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); + /* Get the current state of our config variables */ - $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror'); - $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : ''); + $import_enabled = get_pconfig(local_user(),'pumpio','import'); + $import_checked = (($import_enabled) ? ' checked="checked" ' : ''); - $servername = get_pconfig(local_user(), "pumpio", "host"); - $username = get_pconfig(local_user(), "pumpio", "user"); + $enabled = get_pconfig(local_user(),'pumpio','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); - /* Add some HTML to the existing form */ + $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $s .= '
'; - $s .= '

' . t('Pump.io Post Settings') . '

'; + $public_enabled = get_pconfig(local_user(),'pumpio','public'); + $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; + $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror'); + $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : ''); - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; + $servername = get_pconfig(local_user(), "pumpio", "host"); + $username = get_pconfig(local_user(), "pumpio", "user"); - if (($username != '') AND ($servername != '')) { + /* Add some HTML to the existing form */ - $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); - $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); + $s .= ''; + $s .= '

'. t('Pump.io Import/Export/Mirror').'

'; + $s .= ''; + $s .= ''; } @@ -267,12 +292,16 @@ function pumpio_settings_post(&$a,&$b) { if(x($_POST,'pumpio_delete')) { set_pconfig(local_user(),'pumpio','consumer_key',''); set_pconfig(local_user(),'pumpio','consumer_secret',''); - set_pconfig(local_user(),'pumpio','host',''); set_pconfig(local_user(),'pumpio','oauth_token',''); set_pconfig(local_user(),'pumpio','oauth_token_secret',''); set_pconfig(local_user(),'pumpio','post',false); - set_pconfig(local_user(),'pumpio','post_by_default',false); + set_pconfig(local_user(),'pumpio','import',false); + set_pconfig(local_user(),'pumpio','host',''); set_pconfig(local_user(),'pumpio','user',''); + set_pconfig(local_user(),'pumpio','public',false); + set_pconfig(local_user(),'pumpio','mirror',false); + set_pconfig(local_user(),'pumpio','post_by_default',false); + set_pconfig(local_user(),'pumpio','lastdate', 0); } else { // filtering the username if it is filled wrong $user = $_POST['pumpio_user']; @@ -294,21 +323,20 @@ function pumpio_settings_post(&$a,&$b) { set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']); set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']); set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault'])); + + if (!$_POST['pumpio_mirror']) + del_pconfig(local_user(),'pumpio','lastdate'); + + //header("Location: ".$a->get_baseurl()."/pumpio/connect"); } } } function pumpio_post_local(&$a,&$b) { - if($b['edit']) - return; - if((! local_user()) || (local_user() != $b['uid'])) return; - if($b['private'] || $b['parent']) - return; - $pumpio_post = intval(get_pconfig(local_user(),'pumpio','post')); $pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0); @@ -329,27 +357,13 @@ function pumpio_post_local(&$a,&$b) { function pumpio_send(&$a,&$b) { - logger("pumpio_send: parameter ".print_r($b, true)); - if($b['verb'] == ACTIVITY_LIKE) { - if ($b['deleted']) - pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike"); - else - pumpio_action($a, $b["uid"], $b["thr-parent"], "like"); - return; + if (!get_pconfig($b["uid"],'pumpio','import')) { + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + return; } - if($b['verb'] == ACTIVITY_DISLIKE) - return; - - if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted']) - pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]); - - if (($b['verb'] == ACTIVITY_POST) AND $b['deleted']) - pumpio_action($a, $b["uid"], $b["uri"], "delete"); - - if($b['deleted'] || ($b['created'] !== $b['edited'])) - return; + logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA); if($b['parent'] != $b['id']) { // Looking if its a reply to a pumpio post @@ -358,9 +372,10 @@ function pumpio_send(&$a,&$b) { intval($b["uid"]), dbesc(NETWORK_PUMPIO)); - if(!count($r)) + if(!count($r)) { + logger("pumpio_send: no pumpio post ".$b["parent"]); return; - else { + } else { $iscomment = true; $orig_post = $r[0]; } @@ -375,10 +390,33 @@ function pumpio_send(&$a,&$b) { return; } + if($b['verb'] == ACTIVITY_LIKE) { + if ($b['deleted']) + pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike"); + else + pumpio_action($a, $b["uid"], $b["thr-parent"], "like"); + return; + } + + if($b['verb'] == ACTIVITY_DISLIKE) + return; + + if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted']) + pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]); + + if (($b['verb'] == ACTIVITY_POST) AND $b['deleted']) + pumpio_action($a, $b["uid"], $b["uri"], "delete"); + + if($b['deleted'] || ($b['created'] !== $b['edited'])) + return; + // if post comes from pump.io don't send it back if($b['app'] == "pump.io") return; + // To-Do; + // Support for native shares + // http:///api//shares?id= $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token"); $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret"); @@ -395,16 +433,13 @@ function pumpio_send(&$a,&$b) { $title = trim($b['title']); - if ($title != '') - $title = "

".$title."

"; - - $content = bbcode($b['body'], false, false); + $content = bbcode($b['body'], false, false, 4); // Enhance the way, videos are displayed - $content = preg_replace('/(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content); - $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); - $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); - $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); + $content = preg_replace('/(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content); + $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); + $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); + $content = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$content); $URLSearchString = "^\[\]"; $content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content); @@ -416,7 +451,10 @@ function pumpio_send(&$a,&$b) { if (!$iscomment) { $params["object"] = array( 'objectType' => "note", - 'content' => $title.$content); + 'content' => $content); + + if ($title != "") + $params["object"]["displayName"] = $title; if (count($receiver["to"])) $params["to"] = $receiver["to"]; @@ -434,10 +472,16 @@ function pumpio_send(&$a,&$b) { $inReplyTo = array("id" => $orig_post["uri"], "objectType" => "note"); + if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + $inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); + $params["object"] = array( 'objectType' => "comment", - 'content' => $title.$content, + 'content' => $content, 'inReplyTo' => $inReplyTo); + + if ($title != "") + $params["object"]["displayName"] = $title; } $client = new oauth_client_class; @@ -455,11 +499,15 @@ function pumpio_send(&$a,&$b) { $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); if($success) { + + if ($user->generator->displayName) + set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName); + $post_id = $user->object->id; logger('pumpio_send '.$username.': success '.$post_id); if($post_id AND $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", dbesc($post_id), intval($b['id']) ); @@ -480,7 +528,12 @@ function pumpio_send(&$a,&$b) { } } -function pumpio_action($a, $uid, $uri, $action, $content) { +function pumpio_action(&$a, $uid, $uri, $action, $content = "") { + + // Don't do likes and other stuff if you don't import the timeline + if (!get_pconfig($uid,'pumpio','import')) + return; + $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); @@ -498,12 +551,14 @@ function pumpio_action($a, $uid, $uri, $action, $content) { $orig_post = $r[0]; - if ($orig_post["extid"]) + if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/")) $uri = $orig_post["extid"]; else $uri = $orig_post["uri"]; - if (strstr($uri, "/api/comment/")) + if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + $objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); + elseif (strstr($uri, "/api/comment/")) $objectType = "comment"; elseif (strstr($uri, "/api/note/")) $objectType = "note"; @@ -546,47 +601,70 @@ function pumpio_action($a, $uid, $uri, $action, $content) { } -function pumpio_cron($a,$b) { - $last = get_config('pumpio','last_poll'); +function pumpio_cron(&$a,$b) { + $last = get_config('pumpio','last_poll'); - $poll_interval = intval(get_config('pumpio','poll_interval')); - if(! $poll_interval) - $poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL; + $poll_interval = intval(get_config('pumpio','poll_interval')); + if(! $poll_interval) + $poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL; - if($last) { - $next = $last + ($poll_interval * 60); - if($next > time()) { - logger('pumpio: poll intervall not reached'); - return; - } - } - logger('pumpio: cron_start'); + if($last) { + $next = $last + ($poll_interval * 60); + if($next > time()) { + logger('pumpio: poll intervall not reached'); + return; + } + } + logger('pumpio: cron_start'); - $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() "); - if(count($r)) { - foreach($r as $rr) { - logger('pumpio: mirroring user '.$rr['uid']); - pumpio_fetchtimeline($a, $rr['uid']); - } - } + $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() "); + if(count($r)) { + foreach($r as $rr) { + logger('pumpio: mirroring user '.$rr['uid']); + pumpio_fetchtimeline($a, $rr['uid']); + } + } + + $abandon_days = intval(get_config('system','account_abandon_days')); + if ($abandon_days < 1) + $abandon_days = 0; + + $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() "); if(count($r)) { foreach($r as $rr) { + if ($abandon_days != 0) { + $user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit); + if (!count($user)) { + logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported'); + continue; + } + } + logger('pumpio: importing timeline from user '.$rr['uid']); pumpio_fetchinbox($a, $rr['uid']); + + // check for new contacts once a day + $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check'); + if($last_contact_check) + $next_contact_check = $last_contact_check + 86400; + else + $next_contact_check = 0; + + if($next_contact_check <= time()) { + pumpio_getallusers($a, $rr["uid"]); + set_pconfig($rr['uid'],'pumpio','contact_check',time()); + } } } - // To-Do: - //pumpio_getallusers($a, $uid); - logger('pumpio: cron_end'); set_config('pumpio','last_poll', time()); } -function pumpio_fetchtimeline($a, $uid) { +function pumpio_fetchtimeline(&$a, $uid) { $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); @@ -595,8 +673,12 @@ function pumpio_fetchtimeline($a, $uid) { $hostname = get_pconfig($uid, 'pumpio','host'); $username = get_pconfig($uid, "pumpio", "user"); - $application_name = get_config('pumpio', 'application_name'); - + // get the application name for the pump.io app + // 1st try personal config, then system config and fallback to the + // hostname of the node if neither one is set. + $application_name = get_pconfig( $uid, 'pumpio', 'application_name'); + if ($application_name == "") + $application_name = get_config('pumpio', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname(); @@ -632,11 +714,11 @@ function pumpio_fetchtimeline($a, $uid) { if (count($posts)) { foreach ($posts as $post) { - if ($post->generator->published <= $initiallastdate) + if ($post->published <= $initiallastdate) continue; - if ($lastdate < $post->generator->published) - $lastdate = $post->generator->published; + if ($lastdate < $post->published) + $lastdate = $post->published; if ($first_time) continue; @@ -654,7 +736,7 @@ function pumpio_fetchtimeline($a, $uid) { if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - if ($public AND !strstr($post->generator->displayName, $application_name)) { + if ($public AND !stristr($post->generator->displayName, $application_name)) { require_once('include/html2bbcode.php'); $_SESSION["authenticated"] = true; @@ -673,8 +755,13 @@ function pumpio_fetchtimeline($a, $uid) { $_REQUEST["body"] = html2bbcode($post->object->content); - if ($post->object->fullImage->url != "") - $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"]; + // To-Do: Picture has to be cached and stored locally + if ($post->object->fullImage->url != "") { + if ($post->object->fullImage->pump_io->proxyURL != "") + $_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"]; + else + $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"]; + } logger('pumpio: posting for user '.$uid); @@ -743,7 +830,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } -function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { +function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) { + require_once('include/items.php'); // Searching for the liked post // Two queries for speed issues @@ -766,6 +854,10 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { $orig_post = $r[0]; } + // thread completion + if ($threadcompletion) + pumpio_fetchallcomments($a, $uid, $post->object->id); + $contactid = 0; if(link_compare($post->actor->url, $own_id)) { @@ -808,7 +900,6 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { $likedata['parent-uri'] = $orig_post["uri"]; $likedata['contact-id'] = $contactid; $likedata['app'] = $post->generator->displayName; - $likedata['verb'] = ACTIVITY_LIKE; $likedata['author-name'] = $post->actor->displayName; $likedata['author-link'] = $post->actor->url; $likedata['author-avatar'] = $post->actor->image->url; @@ -831,6 +922,28 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { function pumpio_get_contact($uid, $contact) { + $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", + dbesc(normalise_link($contact->url))); + + if (count($r) == 0) + q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", + dbesc(normalise_link($contact->url)), + dbesc($contact->displayName), + dbesc($contact->preferredUsername), + dbesc($contact->image->url)); + else + q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", + dbesc($contact->displayName), + dbesc($contact->preferredUsername), + dbesc($contact->image->url), + dbesc(normalise_link($contact->url))); + + if (DB_UPDATE_VERSION >= "1177") + q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", + dbesc($contact->location->displayName), + dbesc($contact->summary), + dbesc(normalise_link($contact->url))); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", intval($uid), dbesc($contact->url)); @@ -846,8 +959,8 @@ function pumpio_get_contact($uid, $contact) { dbesc(normalise_link($contact->url)), dbesc(str_replace("acct:", "", $contact->id)), dbesc(''), - dbesc($contact->id), // To-Do? - dbesc('pump.io ' . $contact->id), // To-Do? + dbesc($contact->id), // What is it for? + dbesc('pump.io ' . $contact->id), // What is it for? dbesc($contact->displayName), dbesc($contact->preferredUsername), dbesc($contact->image->url), @@ -886,8 +999,8 @@ function pumpio_get_contact($uid, $contact) { `name-date` = '%s', `uri-date` = '%s', `avatar-date` = '%s' - WHERE `id` = %d LIMIT 1 - ", + WHERE `id` = %d + ", dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]), @@ -896,10 +1009,19 @@ function pumpio_get_contact($uid, $contact) { dbesc(datetime_convert()), intval($contact_id) ); + + if (DB_UPDATE_VERSION >= "1177") + q("UPDATE `contact` SET `location` = '%s', + `about` = '%s' + WHERE `id` = %d", + dbesc($contact->location->displayName), + dbesc($contact->summary), + intval($contact_id) + ); } else { // update profile photos once every two weeks as we have no notification of when they change. - - $update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false); + //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false); + $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours')); // check that we have all the photos, this has been known to fail on occasion @@ -909,21 +1031,34 @@ function pumpio_get_contact($uid, $contact) { $photos = import_profile_photo($contact->image->url, $uid, $r[0]['id']); q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s' - WHERE `id` = %d LIMIT 1 - ", + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `name` = '%s', + `nick` = '%s' + WHERE `id` = %d + ", dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), + dbesc($contact->displayName), + dbesc($contact->preferredUsername), intval($r[0]['id']) ); + + if (DB_UPDATE_VERSION >= "1177") + q("UPDATE `contact` SET `location` = '%s', + `about` = '%s' + WHERE `id` = %d", + dbesc($contact->location->displayName), + dbesc($contact->summary), + intval($r[0]['id']) + ); } } @@ -939,39 +1074,30 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { intval($uid) ); - if (count($r)) { - drop_item($r[0]["id"], $false); - return; - } + if (count($r)) + return drop_item($r[0]["id"], $false); $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), intval($uid) ); - if (count($r)) { - drop_item($r[0]["id"], $false); - return; - } + if (count($r)) + return drop_item($r[0]["id"], $false); } -function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { +function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { require_once('include/items.php'); + require_once('include/html2bbcode.php'); - if (($post->verb == "like") OR ($post->verb == "favorite")) { - pumpio_dolike(&$a, $uid, $self, $post, $own_id); - return; - } + if (($post->verb == "like") OR ($post->verb == "favorite")) + return pumpio_dolike($a, $uid, $self, $post, $own_id); - if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) { - pumpio_dounlike(&$a, $uid, $self, $post, $own_id); - return; - } + if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) + return pumpio_dounlike($a, $uid, $self, $post, $own_id); - if ($post->verb == "delete") { - pumpio_dodelete(&$a, $uid, $self, $post, $own_id); - return; - } + if ($post->verb == "delete") + return pumpio_dodelete($a, $uid, $self, $post, $own_id); if ($post->verb != "update") { // Two queries for speed issues @@ -981,7 +1107,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { ); if (count($r)) - return; + return false; $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), @@ -989,12 +1115,12 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { ); if (count($r)) - return; + return false; } // Only handle these three types if (!strstr("post|share|update", $post->verb)) - return; + return false; $receiptians = array(); if (@is_array($post->cc)) @@ -1009,10 +1135,12 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { $public = true; $postarray = array(); + $postarray['network'] = NETWORK_PUMPIO; $postarray['gravity'] = 0; $postarray['uid'] = $uid; $postarray['wall'] = 0; $postarray['uri'] = $post->object->id; + $postarray['object-type'] = NAMESPACE_ACTIVITY_SCHEMA.strtolower($post->object->objectType); if ($post->object->objectType != "comment") { $contact_id = pumpio_get_contact($uid, $post->actor); @@ -1021,6 +1149,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { $contact_id = $self[0]['id']; $postarray['parent-uri'] = $post->object->id; + + if (!$public) { + $postarray['private'] = 1; + $postarray['allow_cid'] = '<' . $self[0]['id'] . '>'; + } } else { $contact_id = 0; @@ -1051,23 +1184,29 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { } } + $reply = new stdClass; $reply->verb = "note"; $reply->cc = $post->cc; $reply->to = $post->to; + $reply->object = new stdClass; $reply->object->objectType = $post->object->inReplyTo->objectType; $reply->object->content = $post->object->inReplyTo->content; $reply->object->id = $post->object->inReplyTo->id; $reply->actor = $post->object->inReplyTo->author; $reply->url = $post->object->inReplyTo->url; + $reply->generator = new stdClass; $reply->generator->displayName = "pumpio"; $reply->published = $post->object->inReplyTo->published; $reply->received = $post->object->inReplyTo->updated; $reply->url = $post->object->inReplyTo->url; - pumpio_dopost(&$a, $client, $uid, $self, $reply, $own_id); + pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false); $postarray['parent-uri'] = $post->object->inReplyTo->id; } + if ($post->object->pump_io->proxyURL) + $postarray['extid'] = $post->object->pump_io->proxyURL; + $postarray['contact-id'] = $contact_id; $postarray['verb'] = ACTIVITY_POST; $postarray['owner-name'] = $post->actor->displayName; @@ -1088,20 +1227,23 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { $postarray['created'] = datetime_convert('UTC','UTC',$post->published); $postarray['edited'] = datetime_convert('UTC','UTC',$post->received); - if (!$public) { - $postarray['private'] = 1; - $postarray['allow_cid'] = '<' . $self[0]['id'] . '>'; - } if ($post->verb == "share") { - $postarray['body'] = "[share author='".$post->object->author->displayName. - "' profile='".$post->object->author->url. - "' avatar='".$post->object->author->image->url. - "' link='".$post->links->self->href."']".$postarray['body']."[/share]"; + if (!intval(get_config('system','wall-to-wall_share'))) { + $postarray['body'] = "[share author='".$post->object->author->displayName. + "' profile='".$post->object->author->url. + "' avatar='".$post->object->author->image->url. + "' link='".$post->links->self->href."']".$postarray['body']."[/share]"; + } else { + // Let shares look like wall-to-wall posts + $postarray['author-name'] = $post->object->author->displayName; + $postarray['author-link'] = $post->object->author->url; + $postarray['author-avatar'] = $post->object->author->image->url; + } } if (trim($postarray['body']) == "") - return; + return false; $top_item = item_store($postarray); @@ -1117,22 +1259,20 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { if ($post->object->objectType == "comment") { - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); - - $foreign_url = "https://".$hostname."/".$username; + if ($threadcompletion) + pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']); $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1", intval($uid) ); if(!count($user)) - return; + return $top_item; $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; - if (link_compare($foreign_url, $postarray['author-link'])) - return; + if (link_compare($own_id, $postarray['author-link'])) + return $top_item; $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0", dbesc($postarray['parent-uri']), @@ -1144,7 +1284,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { foreach($myconv as $conv) { // now if we find a match, it means we're in this conversation - if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$foreign_url)) + if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id)) continue; require_once('include/enotify.php'); @@ -1159,7 +1299,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], @@ -1173,32 +1313,41 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { } } } + + return $top_item; } -function pumpio_fetchinbox($a, $uid) { +function pumpio_fetchinbox(&$a, $uid) { - $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); - $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); - $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $lastdate = get_pconfig($uid, 'pumpio', 'lastdate'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); + $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); + $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); + $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); + $lastdate = get_pconfig($uid, 'pumpio', 'lastdate'); + $hostname = get_pconfig($uid, 'pumpio','host'); + $username = get_pconfig($uid, "pumpio", "user"); $own_id = "https://".$hostname."/".$username; $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid)); - $client = new oauth_client_class; - $client->oauth_version = '1.0a'; - $client->authorization_header = true; - $client->url_parameters = false; + $lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND + `extid` != '' AND `id` = `parent` + ORDER BY `commented` DESC LIMIT 10", + dbesc(NETWORK_PUMPIO), + intval($uid) + ); + + $client = new oauth_client_class; + $client->oauth_version = '1.0a'; + $client->authorization_header = true; + $client->url_parameters = false; - $client->client_id = $ckey; - $client->client_secret = $csecret; - $client->access_token = $otoken; - $client->access_token_secret = $osecret; + $client->client_id = $ckey; + $client->client_secret = $csecret; + $client->access_token = $otoken; + $client->access_token_secret = $osecret; $last_id = get_pconfig($uid,'pumpio','last_id'); @@ -1207,48 +1356,54 @@ function pumpio_fetchinbox($a, $uid) { if ($last_id != "") $url .= '?since='.urlencode($last_id); - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); - $posts = array_reverse($user->items); + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); - if (count($posts)) - foreach ($posts as $post) { - $last_id = $post->id; - pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id); - } + if ($user->items) { + $posts = array_reverse($user->items); + + if (count($posts)) + foreach ($posts as $post) { + $last_id = $post->id; + pumpio_dopost($a, $client, $uid, $self, $post, $own_id, true); + } + } + + foreach ($lastitems AS $item) + pumpio_fetchallcomments($a, $uid, $item["uri"]); set_pconfig($uid,'pumpio','last_id', $last_id); } -function pumpio_getallusers($a, $uid) { - $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); - $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); - $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); +function pumpio_getallusers(&$a, $uid) { + $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); + $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); + $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); + $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); + $hostname = get_pconfig($uid, 'pumpio','host'); + $username = get_pconfig($uid, "pumpio", "user"); - $client = new oauth_client_class; - $client->oauth_version = '1.0a'; - $client->authorization_header = true; - $client->url_parameters = false; + $client = new oauth_client_class; + $client->oauth_version = '1.0a'; + $client->authorization_header = true; + $client->url_parameters = false; - $client->client_id = $ckey; - $client->client_secret = $csecret; - $client->access_token = $otoken; - $client->access_token_secret = $osecret; + $client->client_id = $ckey; + $client->client_secret = $csecret; + $client->access_token = $otoken; + $client->access_token_secret = $osecret; $url = 'https://'.$hostname.'/api/user/'.$username.'/following'; - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); if ($users->totalItems > count($users->items)) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems; - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); } foreach ($users->items AS $user) - echo pumpio_get_contact($uid, $user)."\n"; + pumpio_get_contact($uid, $user); } function pumpio_queue_hook(&$a,&$b) { @@ -1274,15 +1429,17 @@ function pumpio_queue_hook(&$a,&$b) { if(! count($r)) continue; - $user = $r[0]; + $userdata = $r[0]; - $oauth_token = get_pconfig($user['uid'], "pumpio", "oauth_token"); - $oauth_token_secret = get_pconfig($user['uid'], "pumpio", "oauth_token_secret"); - $consumer_key = get_pconfig($user['uid'], "pumpio","consumer_key"); - $consumer_secret = get_pconfig($user['uid'], "pumpio","consumer_secret"); + //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); - $host = get_pconfig($user['uid'], "pumpio", "host"); - $user = get_pconfig($user['uid'], "pumpio", "user"); + $oauth_token = get_pconfig($userdata['uid'], "pumpio", "oauth_token"); + $oauth_token_secret = get_pconfig($userdata['uid'], "pumpio", "oauth_token_secret"); + $consumer_key = get_pconfig($userdata['uid'], "pumpio","consumer_key"); + $consumer_secret = get_pconfig($userdata['uid'], "pumpio","consumer_secret"); + + $host = get_pconfig($userdata['uid'], "pumpio", "host"); + $user = get_pconfig($userdata['uid'], "pumpio", "user"); $success = false; @@ -1310,7 +1467,7 @@ function pumpio_queue_hook(&$a,&$b) { logger('pumpio_queue: send '.$username.': success '.$post_id); if($post_id AND $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", dbesc($post_id), intval($z['item']) ); @@ -1319,7 +1476,7 @@ function pumpio_queue_hook(&$a,&$b) { } else logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true)); } else - logger("pumpio_queue: Error getting tokens for user ".$user['uid']); + logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']); if (!$success) { logger('pumpio_queue: delayed'); @@ -1328,7 +1485,7 @@ function pumpio_queue_hook(&$a,&$b) { } } -function pumpio_getreceiver($a, $b) { +function pumpio_getreceiver(&$a, $b) { $receiver = array(); @@ -1339,7 +1496,7 @@ function pumpio_getreceiver($a, $b) { $public = get_pconfig($b['uid'], "pumpio", "public"); - if ($public) + if ($public) $receiver["to"][] = Array( "objectType" => "collection", "id" => "http://activityschema.org/collection/public"); @@ -1356,13 +1513,13 @@ function pumpio_getreceiver($a, $b) { dbesc(NETWORK_PUMPIO) ); - if (count($r)) { + if (count($r)) { $receiver["bcc"][] = Array( "displayName" => $r[0]["name"], "objectType" => "person", "preferredUsername" => $r[0]["nick"], "url" => $r[0]["url"]); - } + } } foreach ($gids AS $gid) { $gid = trim($gid, " <>"); @@ -1384,23 +1541,140 @@ function pumpio_getreceiver($a, $b) { } } + if ($b["inform"] != "") { + + $inform = explode(",", $b["inform"]); + + foreach ($inform AS $cid) { + if (substr($cid, 0, 4) != "cid:") + continue; + + $cid = str_replace("cid:", "", $cid); + + $r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + intval($cid), + intval($b["uid"]), + dbesc(NETWORK_PUMPIO) + ); + + if (count($r)) { + $receiver["to"][] = Array( + "displayName" => $r[0]["name"], + "objectType" => "person", + "preferredUsername" => $r[0]["nick"], + "url" => $r[0]["url"]); + } + } + } + return $receiver; } -/* -To-Do: - - only send likes, edits and comments when they are related to a pumpio posting - - Notification for own imported posts - - Thread completion +function pumpio_fetchallcomments(&$a, $uid, $id) { + $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); + $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); + $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); + $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); + $hostname = get_pconfig($uid, 'pumpio','host'); + $username = get_pconfig($uid, "pumpio", "user"); -Nice to have: - - sending private messages + logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); -Could be hard to do: - - edit own notes - - delete own notes + $own_id = "https://".$hostname."/".$username; + + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid)); + + // Fetching the original post + $r = q("SELECT `extid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `extid` != '' LIMIT 1", + dbesc($id), + intval($uid) + ); + + if (!count($r)) + return false; + + $url = $r[0]["extid"]; + + $client = new oauth_client_class; + $client->oauth_version = '1.0a'; + $client->authorization_header = true; + $client->url_parameters = false; + + $client->client_id = $ckey; + $client->client_secret = $csecret; + $client->access_token = $otoken; + $client->access_token_secret = $osecret; + + logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url); + + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item); + + if (!$success) + return; + + if ($item->likes->totalItems != 0) { + foreach ($item->likes->items AS $post) { + $like = new stdClass; + $like->object = new stdClass; + $like->object->id = $item->id; + $like->actor = new stdClass; + $like->actor->displayName = $item->displayName; + $like->actor->preferredUsername = $item->preferredUsername; + $like->actor->url = $item->url; + $like->actor->image = $item->image; + $like->generator = new stdClass; + $like->generator->displayName = "pumpio"; + pumpio_dolike($a, $uid, $self, $post, $own_id, false); + } + } -Known issues: - - refresh after post + if ($item->replies->totalItems == 0) + return; + foreach ($item->replies->items AS $item) { + if ($item->id == $id) + continue; + + // Checking if the comment already exists - Two queries for speed issues + $r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($item->id), + intval($uid) + ); + + if (count($r)) + continue; + + $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($item->id), + intval($uid) + ); + + if (count($r)) + continue; + + $post = new stdClass; + $post->verb = "post"; + $post->actor = $item->author; + $post->published = $item->published; + $post->received = $item->updated; + $post->generator = new stdClass; + $post->generator->displayName = "pumpio"; + // To-Do: Check for public post + + unset($item->author); + unset($item->published); + unset($item->updated); + + $post->object = $item; + + logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true)); + pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false); + } +} + +/* +To-Do: + - edit own notes + - delete own notes */