/**
* 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");
+
+ header("Location: ".$a->get_baseurl()."/settings/connectors");
+
$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);
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']));
+
+ header("Location: ".$a->get_baseurl()."/pumpio/connect");
}
}
}
}
}
-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'))
}
-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),
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"))
- return pumpio_dolike(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dolike($a, $uid, $self, $post, $own_id);
if (($post->verb == "unlike") OR ($post->verb == "unfavorite"))
- return pumpio_dounlike(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dounlike($a, $uid, $self, $post, $own_id);
if ($post->verb == "delete")
- return pumpio_dodelete(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dodelete($a, $uid, $self, $post, $own_id);
if ($post->verb != "update") {
// Two queries for speed issues
$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->objectType == "comment") {
- pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
+ 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)
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];
+
+ //logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
- $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");
+ $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($user['uid'], "pumpio", "host");
- $user = get_pconfig($user['uid'], "pumpio", "user");
+ $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();
return $receiver;
}
-function pumpio_fetchallcomments($a, $uid, $id) {
+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');
$post->object = $item;
logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
- pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
}
}
/*
Bugs:
+ - refresh after post doesn't always happen
To-Do:
-
-Could be hard to do:
- edit own notes
- delete own notes
-Known issues:
- - refresh after post
-
*/
https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff