X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=830be6a1bad801e7e2dfaed57417a10490967de7;hb=21605a52c975074df20710b23d72e553e067217a;hp=6aff6889e1abdad21e6a1d4f2dcc959b98682899;hpb=008216058a6eb5b03efd3a7a82b6a7e3d7e1096f;p=friendica-addons.git diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php old mode 100755 new mode 100644 index 6aff6889..69dd5d31 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1,31 +1,39 @@ */ require('addon/pumpio/oauth/http.php'); require('addon/pumpio/oauth/oauth_client.php'); +require_once('include/enotify.php'); +require_once('include/socgraph.php'); +require_once("include/Photo.php"); +require_once("mod/share.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('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('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } + 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('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('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_module() {} @@ -37,6 +45,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": @@ -52,42 +63,57 @@ function pumpio_content(&$a) { return $o; } -function pumpio_registerclient($a, $host) { +function pumpio_check_item_notification($a, &$notification_data) { + $hostname = get_pconfig($notification_data["uid"], 'pumpio','host'); + $username = get_pconfig($notification_data["uid"], "pumpio", "user"); + + $notification_data["profiles"][] = "https://".$hostname."/".$username; +} + + +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); + $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + + $params["type"] = "client_associate"; + $params["contacts"] = $adminlist[0]; + $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(); @@ -97,16 +123,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"; @@ -132,137 +165,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" ' : ''); - - $enabled = get_pconfig(local_user(),'pumpio','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); + if(! local_user()) + return; - $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + /* Add our stylesheet to the page so we can make our settings look nice */ - $public_enabled = get_pconfig(local_user(),'pumpio','public'); - $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); + $a->page['htmlhead'] .= '' . "\r\n"; - $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror'); - $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : ''); + /* Get the current state of our config variables */ - $servername = get_pconfig(local_user(), "pumpio", "host"); - $username = get_pconfig(local_user(), "pumpio", "user"); + $import_enabled = get_pconfig(local_user(),'pumpio','import'); + $import_checked = (($import_enabled) ? ' checked="checked" ' : ''); - /* Add some HTML to the existing form */ + $enabled = get_pconfig(local_user(),'pumpio','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); - $s .= '
'; - $s .= '

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

'; + $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; + $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" ' : ''); - if (($username != '') AND ($servername != '')) { + $servername = get_pconfig(local_user(), "pumpio", "host"); + $username = get_pconfig(local_user(), "pumpio", "user"); - $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); - $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); + /* Add some HTML to the existing form */ - $s .= '
'; - if (($oauth_token == "") OR ($oauth_token_secret == "")) { - $s .= '
'; + $s .= ''; + $s .= '

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

'; + $s .= ''; + $s .= ''; + /* provide a submit button */ + $s .= '
'; } @@ -272,12 +308,17 @@ 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); + set_pconfig(local_user(),'pumpio','last_id', ''); } else { // filtering the username if it is filled wrong $user = $_POST['pumpio_user']; @@ -299,23 +340,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) { - // This can probably be changed to allow editing by pointing to a different API endpoint - - 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); @@ -336,8 +374,13 @@ function pumpio_post_local(&$a,&$b) { function pumpio_send(&$a,&$b) { - if($b['deleted'] || ($b['created'] !== $b['edited'])) - return; + + if (!get_pconfig($b["uid"],'pumpio','import')) { + if($b['deleted'] || $b['private'] || ($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 @@ -346,26 +389,52 @@ 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]; } } else { $iscomment = false; - if(! strstr($b['postopts'],'pumpio')) - return; + $receiver = pumpio_getreceiver($a, $b); + + logger("pumpio_send: receiver ".print_r($receiver, true)); - if($b['private']) + if (!count($receiver) AND ($b['private'] OR !strstr($b['postopts'],'pumpio'))) 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"); $consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key"); @@ -381,19 +450,7 @@ function pumpio_send(&$a,&$b) { $title = trim($b['title']); - if ($title != '') - $title = "

".$title."

"; - - $content = bbcode($b['body'], false, false); - - // 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); - - $URLSearchString = "^\[\]"; - $content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content); + $content = bbcode($b['body'], false, false, 4); $params = array(); @@ -402,20 +459,37 @@ 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"]; + + if (count($receiver["bto"])) + $params["bto"] = $receiver["bto"]; + + if (count($receiver["cc"])) + $params["cc"] = $receiver["cc"]; + + if (count($receiver["bcc"])) + $params["bcc"] = $receiver["bcc"]; - if ($public) - $params["to"] = array(Array( - "objectType" => "collection", - "id" => "http://activityschema.org/collection/public")); } else { $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; @@ -430,20 +504,31 @@ function pumpio_send(&$a,&$b) { $username = $user.'@'.$host; $url = 'https://'.$host.'/api/user/'.$user.'/feed'; - $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + else + $success = false; 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']) ); } } else { - logger('pumpio_send '.$username.': general error: ' . print_r($user,true)); + logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user,true)); + + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); + if (count($r)) + $a->contact = $r[0]["id"]; $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params)); require_once('include/queue_fn.php'); @@ -454,47 +539,156 @@ function pumpio_send(&$a,&$b) { } } -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; - - 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']); - } - } +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'); + $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); + $hostname = get_pconfig($uid, 'pumpio','host'); + $username = get_pconfig($uid, "pumpio", "user"); + + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($uri), + intval($uid) + ); + + if (!count($r)) + return; + + $orig_post = $r[0]; + + if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/")) + $uri = $orig_post["extid"]; + else + $uri = $orig_post["uri"]; + + 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"; + elseif (strstr($uri, "/api/image/")) + $objectType = "image"; + + $params["verb"] = $action; + $params["object"] = array('id' => $uri, + "objectType" => $objectType, + "content" => $content); + + $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; + + $url = 'https://'.$hostname.'/api/user/'.$username.'/feed'; + + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + else + $success = false; + + if($success) + logger('pumpio_action '.$username.' '.$action.': success '.$uri); + else { + logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user,true)); + + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); + if (count($r)) + $a->contact = $r[0]["id"]; + + $s = serialize(array('url' => $url, 'item' => $orig_post["id"], 'post' => $params)); + require_once('include/queue_fn.php'); + add_to_queue($a->contact,NETWORK_PUMPIO,$s); + notice(t('Pump.io like failed. Queued for retry.').EOL); + } +} + +function pumpio_sync(&$a) { + $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'", + $plugin); + + if (!count($r)) + return; + + $last = get_config('pumpio','last_poll'); + + $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'); + + $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_cron(&$a,$b) { + //pumpio_sync($a); + proc_run("php","addon/pumpio/pumpio_sync.php"); +} + +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'); @@ -503,8 +697,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(); @@ -526,7 +724,10 @@ function pumpio_fetchtimeline($a, $uid) { $username = $user.'@'.$host; - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + else + $success = false; if (!$success) { logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true)); @@ -540,11 +741,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; @@ -562,7 +763,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; @@ -574,6 +775,10 @@ function pumpio_fetchtimeline($a, $uid) { $_REQUEST["profile_uid"] = $uid; $_REQUEST["source"] = "pump.io"; + if (isset($post->object->id)) { + $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id; + } + if ($post->object->displayName != "") $_REQUEST["title"] = html2bbcode($post->object->displayName); else @@ -581,60 +786,104 @@ 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); require_once('mod/item.php'); - //print_r($_REQUEST); + item_post($a); logger('pumpio: posting done - user '.$uid); } } } - //$lastdate = '2013-05-16T20:22:12Z'; - if ($lastdate != 0) set_pconfig($uid,'pumpio','lastdate', $lastdate); } -function pumpio_dolike(&$a, $uid, $self, $post) { +function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { + // Searching for the unliked post + // Two queries for speed issues + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($post->object->id), + intval($uid) + ); -/* - // If we posted the like locally, it will be found with our url, not the FB url. + if (count($r)) + $orig_post = $r[0]; + else { + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($post->object->id), + intval($uid) + ); - $second_url = (($likes->id == $fb_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id); + if (!count($r)) + return; + else + $orig_post = $r[0]; + } - $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' - AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1", - dbesc($orig_post['uri']), - intval($uid), - dbesc(ACTIVITY_LIKE), - dbesc('http://facebook.com/profile.php?id=' . $likes->id), - dbesc($second_url) - ); + $contactid = 0; - if(count($r)) - return; -*/ + if(link_compare($post->actor->url, $own_id)) { + $contactid = $self[0]['id']; + } else { + $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc($post->actor->url), + intval($uid) + ); + + if(count($r)) + $contactid = $r[0]['id']; + + if($contactid == 0) + $contactid = $orig_post['contact-id']; + } + + $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'", + dbesc(datetime_convert()), + dbesc(ACTIVITY_LIKE), + intval($uid), + intval($contactid), + dbesc($orig_post['uri']) + ); - // To-Do - $own_id = "123455678"; + if(count($r)) + logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); + else + logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); +} +function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) { + require_once('include/items.php'); + + if ($post->object->id == "") { + logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG); + return; + } + + // Searching for the liked post // Two queries for speed issues - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1", dbesc($post->object->id), - intval($uid) + intval($uid), + dbesc(NETWORK_PUMPIO) ); if (count($r)) $orig_post = $r[0]; else { - $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1", dbesc($post->object->id), - intval($uid) + intval($uid), + dbesc(NETWORK_PUMPIO) ); if (!count($r)) @@ -643,15 +892,41 @@ function pumpio_dolike(&$a, $uid, $self, $post) { $orig_post = $r[0]; } - $r = q("SELECT parent FROM `item` WHERE `verb` = '%s' AND `uid` = %d AND `author-link` = '%s' AND parent = %d LIMIT 1", + // thread completion + if ($threadcompletion) + pumpio_fetchallcomments($a, $uid, $post->object->id); + + $contactid = 0; + + if(link_compare($post->actor->url, $own_id)) { + $contactid = $self[0]['id']; + $post->actor->displayName = $self[0]['name']; + $post->actor->url = $self[0]['url']; + $post->actor->image->url = $self[0]['photo']; + } else { + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), + intval($uid) + ); + + if(count($r)) + $contactid = $r[0]['id']; + + if($contactid == 0) + $contactid = $orig_post['contact-id']; + } + + $r = q("SELECT parent FROM `item` WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s' LIMIT 1", dbesc(ACTIVITY_LIKE), intval($uid), - dbesc($post->actor->url), - intval($orig_post['id']) + intval($contactid), + dbesc($orig_post['uri']) ); - if(count($r)) + if(count($r)) { + logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); return; + } $likedata = array(); $likedata['parent'] = $orig_post['id']; @@ -661,23 +936,8 @@ function pumpio_dolike(&$a, $uid, $self, $post) { $likedata['wall'] = 0; $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid); $likedata['parent-uri'] = $orig_post["uri"]; - - if($likes->id == $own_id) - $likedata['contact-id'] = $self[0]['id']; - else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), - intval($uid) - ); - - if(count($r)) - $likedata['contact-id'] = $r[0]['id']; - } - if(! x($likedata,'contact-id')) - $likedata['contact-id'] = $orig_post['contact-id']; - + $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; @@ -693,10 +953,49 @@ function pumpio_dolike(&$a, $uid, $self, $post) { $likedata['object'] = '' . ACTIVITY_OBJ_NOTE . '1' . '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; - item_store($likedata); + $ret = item_store($likedata); + + logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } -function pumpio_get_contact($uid, $contact) { +function pumpio_get_contact($uid, $contact, $no_insert = false) { + + if (function_exists("update_gcontact")) { + update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, + "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, + "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id))); + + $cid = get_contact($contact->url, $uid); + } else { + // Old Code + $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))); + + $cid = 0; + } + + if ($no_insert) + return($cid); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", intval($uid), dbesc($contact->url)); @@ -713,8 +1012,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), @@ -743,62 +1042,35 @@ function pumpio_get_contact($uid, $contact) { group_add_member($uid,'',$contact_id,$g[0]['def_gid']); } - require_once("Photo.php"); - - $photos = import_profile_photo($contact->image->url,$uid,$contact_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 - ", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - 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); - - // check that we have all the photos, this has been known to fail on occasion - - if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) { - require_once("Photo.php"); - - $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 - ", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - 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($contact_id) ); - } - + } else { + $contact_id = $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']) + ); + */ } - return($r[0]["id"]); + if (function_exists("update_contact_avatar")) + update_contact_avatar($contact->image->url, $uid, $contact_id); + + return($contact_id); } -function pumpio_dodelete(&$a, $client, $uid, $self, $post) { +function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { // Two queries for speed issues $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", @@ -806,38 +1078,30 @@ function pumpio_dodelete(&$a, $client, $uid, $self, $post) { 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) { +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") { - pumpio_dolike(&$a, $uid, $self, $post); - return; - } + if (($post->verb == "like") OR ($post->verb == "favorite")) + return pumpio_dolike($a, $uid, $self, $post, $own_id); - if ($post->verb == "delete") { - pumpio_dodelete(&$a, $uid, $self, $post); - return; - } + if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) + return pumpio_dounlike($a, $uid, $self, $post, $own_id); - // Only handle these three types - if (!strstr("post|share|update", $post->verb)) - return; + if ($post->verb == "delete") + return pumpio_dodelete($a, $uid, $self, $post, $own_id); if ($post->verb != "update") { // Two queries for speed issues @@ -847,7 +1111,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { ); if (count($r)) - return; + return false; $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), @@ -855,9 +1119,13 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { ); if (count($r)) - return; + return false; } + // Only handle these three types + if (!strstr("post|share|update", $post->verb)) + return false; + $receiptians = array(); if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -870,54 +1138,79 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - $contact_id = pumpio_get_contact($uid, $post->actor); - - if (!$contact_id) - $contact_id = $self[0]['id']; - $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); + + if (!$contact_id) + $contact_id = $self[0]['id']; + $postarray['parent-uri'] = $post->object->id; + + if (!$public) { + $postarray['private'] = 1; + $postarray['allow_cid'] = '<' . $self[0]['id'] . '>'; + } } else { - //echo($post->object->inReplyTo->url."\n"); - //print_r($post->object->inReplyTo); - //echo $post->object->inReplyTo->likes->url."\n"; - //$replies = $post->object->inReplyTo->replies->url; - //$replies = $post->object->likes->pump_io->proxyURL; - //$replies = $post->object->replies->pump_io->proxyURL; - - /* - //$replies = $post->object->replies->pump_io->proxyURL; - - if ($replies != "") { - $success = $client->CallAPI($replies, 'GET', array(), array('FailOnAccessError'=>true), $replydata); - print_r($replydata); - } else - print_r($post); - */ + $contact_id = pumpio_get_contact($uid, $post->actor, true); + + if (link_compare($post->actor->url, $own_id)) { + $contact_id = $self[0]['id']; + $post->actor->displayName = $self[0]['name']; + $post->actor->url = $self[0]['url']; + $post->actor->image->url = $self[0]['photo']; + } elseif ($contact_id == 0) { + // Take an existing contact, the contact of the note or - as a fallback - the id of the user + $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc($post->actor->url), + intval($uid) + ); + + if(count($r)) + $contact_id = $r[0]['id']; + else { + $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc($post->actor->url), + intval($uid) + ); + + if(count($r)) + $contact_id = $r[0]['id']; + else + $contact_id = $self[0]['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); + 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; @@ -929,6 +1222,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { $postarray['plink'] = $post->object->url; $postarray['app'] = $post->generator->displayName; $postarray['body'] = html2bbcode($post->object->content); + $postarray['object'] = json_encode($post); if ($post->object->fullImage->url != "") $postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"]; @@ -936,25 +1230,49 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { if ($post->object->displayName != "") $postarray['title'] = $post->object->displayName; - //$postarray['location'] = "" $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 (isset($post->updated)) + $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated); + elseif (isset($post->received)) + $postarray['edited'] = datetime_convert('UTC','UTC',$post->received); + else + $postarray['edited'] = $postarray['created']; 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'))) { + if (isset($post->object->author->displayName) AND ($post->object->author->displayName != "")) + $share_author = $post->object->author->displayName; + elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != "")) + $share_author = $post->object->author->preferredUsername; + else + $share_author = $post->object->author->url; + + $postarray['body'] = share_header($share_author, $post->object->author->url, + $post->object->author->image->url, "", + datetime_convert('UTC','UTC',$post->object->created), + $post->links->self->href). + $postarray['body']."[/share]"; + + /* + $postarray['body'] = "[share author='".$share_author. + "' profile='".$post->object->author->url. + "' avatar='".$post->object->author->image->url. + "' posted='".datetime_convert('UTC','UTC',$post->object->created). + "' 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); + $postarray["id"] = $top_item; if (($top_item == 0) AND ($post->verb == "update")) { $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", @@ -968,86 +1286,98 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post) { 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; - - $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']), - intval($uid) - ); - - if(count($myconv)) { - - foreach($myconv as $conv) { - // now if we find a match, it means we're in this conversation + if (link_compare($own_id, $postarray['author-link'])) + return $top_item; - if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$foreign_url)) - continue; - - require_once('include/enotify.php'); - - $conv_parent = $conv['parent']; - - notification(array( - 'type' => NOTIFY_COMMENT, - 'notify_flags' => $user[0]['notify-flags'], - 'language' => $user[0]['language'], - 'to_name' => $user[0]['username'], - 'to_email' => $user[0]['email'], - 'uid' => $user[0]['uid'], - 'item' => $cmntdata, - 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, - 'source_name' => $postarray['author-name'], - 'source_link' => $postarray['author-link'], - 'source_photo' => $postarray['author-avatar'], - 'verb' => ACTIVITY_POST, - 'otype' => 'item', - 'parent' => $conv_parent, - )); - - // only send one notification - break; + if (!function_exists("check_item_notification")) { + $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']), + intval($uid) + ); + + if(count($myconv)) { + + 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'],$own_id)) + continue; + + require_once('include/enotify.php'); + + $conv_parent = $conv['parent']; + + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $user[0]['notify-flags'], + 'language' => $user[0]['language'], + 'to_name' => $user[0]['username'], + 'to_email' => $user[0]['email'], + 'uid' => $user[0]['uid'], + 'item' => $postarray, + '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'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $conv_parent, + )); + + // only send one notification + break; + } } } } + + 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 `thread` + INNER JOIN `item` ON `item`.`id` = `thread`.`iid` + WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != '' + ORDER BY `thread`.`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'); @@ -1056,62 +1386,346 @@ 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); + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + else + $success = false; - if (count($posts)) - foreach ($posts as $post) { - $last_id = $post->id; - pumpio_dopost(&$a, $client, $uid, $self, $post); - } + 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); + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + else + $success = false; 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); + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + else + $success = false; } foreach ($users->items AS $user) - echo pumpio_get_contact($uid, $user)."\n"; + pumpio_get_contact($uid, $user); } +function pumpio_queue_hook(&$a,&$b) { -/* -To-Do: - - Queues - - unlike + $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", + dbesc(NETWORK_PUMPIO) + ); + if(! count($qi)) + return; + + require_once('include/queue_fn.php'); + + foreach($qi as $x) { + if($x['network'] !== NETWORK_PUMPIO) + continue; + + logger('pumpio_queue: run'); + + $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` + WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", + intval($x['cid']) + ); + if(! count($r)) + continue; + + $userdata = $r[0]; + + //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); + + $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; + + if ($oauth_token AND $oauth_token_secret AND + $consumer_key AND $consumer_secret) { + $username = $user.'@'.$host; + + logger('pumpio_queue: able to post for user '.$username); + + $z = unserialize($x['content']); + + $client = new oauth_client_class; + $client->oauth_version = '1.0a'; + $client->url_parameters = false; + $client->authorization_header = true; + $client->access_token = $oauth_token; + $client->access_token_secret = $oauth_token_secret; + $client->client_id = $consumer_key; + $client->client_secret = $consumer_secret; + + if (pumpio_reachable($z['url'])) + $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + else + $success = false; + + if($success) { + $post_id = $user->object->id; + 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", + dbesc($post_id), + intval($z['item']) + ); + } + remove_queue_item($x['id']); + } else + logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true)); + } else + logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']); + + if (!$success) { + logger('pumpio_queue: delayed'); + update_queue_time($x['id']); + } + } +} + +function pumpio_getreceiver(&$a, $b) { + + $receiver = array(); + + if (!$b["private"]) { + + if(! strstr($b['postopts'],'pumpio')) + return $receiver; + + $public = get_pconfig($b['uid'], "pumpio", "public"); + + if ($public) + $receiver["to"][] = Array( + "objectType" => "collection", + "id" => "http://activityschema.org/collection/public"); + } else { + $cids = explode("><", $b["allow_cid"]); + $gids = explode("><", $b["allow_gid"]); + + foreach ($cids AS $cid) { + $cid = trim($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["bcc"][] = Array( + "displayName" => $r[0]["name"], + "objectType" => "person", + "preferredUsername" => $r[0]["nick"], + "url" => $r[0]["url"]); + } + } + foreach ($gids AS $gid) { + $gid = trim($gid, " <>"); + + $r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ". + "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ". + "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'", + intval($gid), + intval($b["uid"]), + dbesc(NETWORK_PUMPIO) + ); + + foreach ($r AS $row) + $receiver["bcc"][] = Array( + "displayName" => $row["name"], + "objectType" => "person", + "preferredUsername" => $row["nick"], + "url" => $row["url"]); + } + } + + 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; +} -Aufwand: - - eigene Inhalte editieren - - eigene Inhalte löschen +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"); + + logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); + + $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; -Problem: - - vervollständigen der Threads - - Aktualisieren nach Antworten + $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); + + if (pumpio_reachable($url)) + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item); + else + $success = false; + + 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); + } + } + + 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); + } +} + + +function pumpio_reachable($url) { + $data = z_fetch_url($url, false, $redirects, array('timeout'=>10)); + return(intval($data['return_code']) != 0); +} + +/* +To-Do: + - edit own notes + - delete own notes */