/**
* 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);
$enabled = get_pconfig(local_user(),'pumpio','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
$def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */
- $s .= '<div class="settings-block">';
- $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+ $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+ $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+ $s .= '</span>';
+ $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
+ $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+ $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+ $s .= '</span>';
$s .= '<div id="pumpio-username-wrapper">';
$s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
$s .= '<div id="pumpio-authenticate-wrapper">';
$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Authenticate your pump.io connection").'</a>';
$s .= '</div><div class="clear"></div>';
-
- //$s .= t("You are not authenticated to pumpio");
} else {
$s .= '<div id="pumpio-import-wrapper">';
$s .= '<label id="pumpio-import-label" for="pumpio-import">' . t('Import the remote timeline') . '</label>';
$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . t('Check to delete this preset') . '</label>';
$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
$s .= '</div><div class="clear"></div>';
-
- //$s .= '<div id="pumpio-authenticate-wrapper">';
- //$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Reauthenticate your pump.io connection").'</a>';
- //$s .= '</div><div class="clear"></div>';
-
}
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}
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_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);
function pumpio_send(&$a,&$b) {
- logger("pumpio_send: parameter ".print_r($b, true));
- if($b['verb'] == ACTIVITY_LIKE) {
- if ($b['deleted'])
- pumpio_like($a, $b["uid"], $b["thr-parent"], "unlike");
- else
- pumpio_like($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['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
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;
if ($title != '')
$title = "<h4>".$title."</h4>";
- $content = bbcode($b['body'], false, false);
+ $content = bbcode($b['body'], false, false, 4);
// Enhance the way, videos are displayed
- $content = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
$URLSearchString = "^\[\]";
$content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
'objectType' => "note",
'content' => $title.$content);
- if ($public)
- $params["to"] = array(Array(
- "objectType" => "collection",
- "id" => "http://activityschema.org/collection/public"));
+ 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"];
+
} else {
$inReplyTo = array("id" => $orig_post["uri"],
"objectType" => "note");
$url = 'https://'.$host.'/api/user/'.$user.'/feed';
$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
- //$success = false;
if($success) {
$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'])
);
}
}
-function pumpio_like($a, $uid, $uri, $action) {
+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"];
$objectType = "image";
$params["verb"] = $action;
- $params["object"] = array('id' => $uri, "objectType" => $objectType);
+ $params["object"] = array('id' => $uri,
+ "objectType" => $objectType,
+ "content" => $content);
$client = new oauth_client_class;
$client->oauth_version = '1.0a';
$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
if($success)
- logger('pumpio_like '.$username.' '.$action.': success '.$uri);
+ logger('pumpio_action '.$username.' '.$action.': success '.$uri);
else {
- logger('pumpio_like '.$username.' '.$action.': general error: '.$uri.' '.print_r($user,true));
+ 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))
}
-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');
$_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_dounlike(&$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 (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)
+ );
-function pumpio_dolike(&$a, $uid, $self, $post) {
+ if (!count($r))
+ return;
+ else
+ $orig_post = $r[0];
+ }
-/*
- // If we posted the like locally, it will be found with our url, not the FB url.
+ $contactid = 0;
+
+ 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)
+ );
- $second_url = (($likes->id == $fb_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id);
+ if(count($r))
+ $contactid = $r[0]['id'];
- $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)
- );
+ if($contactid == 0)
+ $contactid = $orig_post['contact-id'];
+ }
- if(count($r))
- return;
-*/
+ $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) {
+
+ // Searching for the liked post
// Two queries for speed issues
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($post->object->id),
$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",
+ $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 `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("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'];
$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['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
'<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
- 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) {
+ $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)));
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid), dbesc($contact->url));
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),
`name-date` = '%s',
`uri-date` = '%s',
`avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
+ WHERE `id` = %d
",
dbesc($photos[0]),
dbesc($photos[1]),
`micro` = '%s',
`name-date` = '%s',
`uri-date` = '%s',
- `avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
+ `avatar-date` = '%s',
+ `name` = '%s',
+ `nick` = '%s'
+ WHERE `id` = %d
",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ dbesc($contact->displayName),
+ dbesc($contact->preferredUsername),
intval($r[0]['id'])
);
}
return($r[0]["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",
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 = false) {
require_once('include/items.php');
+ require_once('include/html2bbcode.php');
- if (($post->verb == "like") OR ($post->verb == "favorite")) {
- 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 == "unlike") OR ($post->verb == "unfavorite")) {
- pumpio_dounlike(&$a, $uid, $self, $post);
- 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);
- return;
- }
-
- // 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
);
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 false;
+
$receiptians = array();
if (@is_array($post->cc))
$receiptians = array_merge($receiptians, $post->cc);
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['gravity'] = 0;
$postarray['uid'] = $uid;
$postarray['uri'] = $post->object->id;
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;
} 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 = 0;
+
+ 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'];
+ } else {
+ // 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);
$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 ($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) {
}
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);
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');
$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));
$url .= '?since='.urlencode($last_id);
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
- $posts = array_reverse($user->items);
- if (count($posts))
- foreach ($posts as $post) {
- $last_id = $post->id;
- pumpio_dopost(&$a, $client, $uid, $self, $post);
- }
-
- set_pconfig($uid,'pumpio','last_id', $last_id);
-
- // Fetching the minor events
- $last_minor_id = get_pconfig($uid,'pumpio','last_minor_id');
-
- $url = 'https://'.$hostname.'/api/user/'.$username.'/inbox/minor';
-
- if ($last_minor_id != "")
- $url .= '?since='.urlencode($last_minor_id);
-
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
- $posts = array_reverse($user->items);
+ if ($user->items) {
+ $posts = array_reverse($user->items);
- if (count($posts))
- foreach ($posts as $post) {
- $last_minor_id = $post->id;
- pumpio_dopost(&$a, $client, $uid, $self, $post);
- }
+ if (count($posts))
+ foreach ($posts as $post) {
+ $last_id = $post->id;
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
+ }
+ }
- set_pconfig($uid,'pumpio','last_minor_id', $last_minor_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;
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'])
);
} 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');
}
}
-/*
-To-Do:
- - double likes?
- - importing unlike
+function pumpio_getreceiver(&$a, $b) {
+
+ $receiver = array();
+
+ if (!$b["private"]) {
-Could be hard to do:
- - Threads completion
- - edit own posts
- - delete own posts
+ 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;
-Problem:
- - refresh after post
+ $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;
+}
+
+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;
+ }
+
+ 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;
+
+ 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
*/
projects / friendica-addons.git / blobdiff