/**
* Name: pump.io Post Connector
* Description: Post to pump.io
- * Version: 0.1
+ * Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
require('addon/pumpio/oauth/http.php');
return '';
}
+ if (function_exists("apc_delete")) {
+ $toDelete = new APCIterator('user', APC_ITER_VALUE);
+ apc_delete($toDelete);
+ }
+
if (isset($a->argv[1]))
switch ($a->argv[1]) {
case "connect":
return $o;
}
-function pumpio_registerclient($a, $host) {
+function pumpio_registerclient(&$a, $host) {
$url = "https://".$host."/api/client/register";
$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);
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();
$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";
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);
}
$o = 'Could not connect to pumpio. Refresh the page or try again later.';
if($success) {
+ logger("pumpio_connect: authenticated");
$o .= t("You are now authenticated to pumpio.");
$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
+ } else {
+ logger("pumpio_connect: could not connect");
+ $o = 'Could not connect to pumpio. Refresh the page or try again later.';
}
return($o);
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);
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));
if($b['parent'] != $b['id']) {
// Looking if its a reply to a pumpio post
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];
}
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;
}
}
-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');
$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"];
}
-function pumpio_cron($a,$b) {
+function pumpio_cron(&$a,$b) {
$last = get_config('pumpio','last_poll');
$poll_interval = intval(get_config('pumpio','poll_interval'));
foreach($r as $rr) {
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');
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),
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 = false) {
require_once('include/items.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
);
if (count($r))
- return;
+ return false;
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($post->object->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))
$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);
$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;
}
if (trim($postarray['body']) == "")
- return;
+ return false;
$top_item = item_store($postarray);
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']),
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');
}
}
}
+
+ 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');
if (count($posts))
foreach ($posts as $post) {
$last_id = $post->id;
- pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
}
set_pconfig($uid,'pumpio','last_id', $last_id);
}
-function pumpio_getallusers($a, $uid) {
+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');
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;
} 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');
}
}
-function pumpio_getreceiver($a, $b) {
+function pumpio_getreceiver(&$a, $b) {
$receiver = array();
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, " <>");
}
}
+ 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");
+
+ $own_id = "https://".$hostname."/".$username;
+
+ logger("pumpio_fetchallcomments: completing comment for user ".$uid." url ".$url);
+
+ $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+ intval($uid));
+
+ // Fetching the original post - Two queries for speed issues
+ $r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($url),
+ intval($uid)
+ );
+
+ if (!count($r)) {
+ $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($url),
+ intval($uid)
+ );
+
+ if (!count($r))
+ return false;
+ }
-Nice to have:
- - sending private messages
+ if ($r[0]["extid"])
+ $url = $r[0]["extid"];
+ else
+ $url = $id;
+
+ $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;
-Could be hard to do:
+ 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->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($url),
+ intval($uid)
+ );
+
+ if (count($r))
+ continue;
+
+ $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($url),
+ intval($uid)
+ );
+
+ if (count($r))
+ continue;
+
+ $post->verb = "post";
+ $post->actor = $item->author;
+ $post->published = $item->published;
+ $post->received = $item->updated;
+ $post->generator->displayName = "pumpio";
+
+ unset($item->author);
+ unset($item->published);
+ unset($item->updated);
+
+ $post->object = $item;
+
+ logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
+ }
+}
+
+/*
+Bugs:
+ - refresh after post doesn't always happen
+
+To-Do:
- edit own notes
- delete own notes
-Known issues:
- - refresh after post
-
*/
projects / friendica-addons.git / blobdiff