X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=b413f59e522387bdcf45ff4f95b79af463b6f95a;hb=c892e56a905062c83095fa852c5628a8cb08f26f;hp=78b738fab8dfb52618ddfe2fffe1e1afc6b3cff3;hpb=39c9eb8817d0f0e1cf435f75eca781c60d616825;p=friendica-addons.git
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
old mode 100755
new mode 100644
index 78b738fa..b413f59e
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -11,23 +11,23 @@ require('addon/pumpio/oauth/oauth_client.php');
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
function pumpio_install() {
- register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local');
- register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send');
- register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
- register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings');
- register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
- register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
- register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+ register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local');
+ register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send');
+ register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
+ register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings');
+ register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
+ register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+ register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
}
function pumpio_uninstall() {
- unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local');
- unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send');
- unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
- unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings');
- unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
- unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
- unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+ unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local');
+ unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send');
+ unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
+ unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings');
+ unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
+ unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+ unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
}
function pumpio_module() {}
@@ -61,37 +61,37 @@ 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";
+ $params["type"] = "client_associate";
+ $params["contacts"] = $a->config['admin_email'];
+ $params["application_type"] = "native";
+ $params["application_name"] = $application_name;
+ $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png";
+ $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect";
logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
- $ch = curl_init($url);
- curl_setopt($ch, CURLOPT_HEADER, false);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
- curl_setopt($ch, CURLOPT_POST,1);
- curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
- curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
+ $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);
+ $s = curl_exec($ch);
+ $curl_info = curl_getinfo($ch);
- if ($curl_info["http_code"] == "200") {
- $values = json_decode($s);
+ 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);
@@ -156,10 +156,10 @@ function pumpio_connect(&$a) {
}
$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").'';
@@ -172,118 +172,117 @@ function pumpio_connect(&$a) {
}
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 .= '
';
- $s .= '
';
- $s .= ''. t('Pump.io Import/Export/Mirror').'
';
- $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" ' : '');
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ $servername = get_pconfig(local_user(), "pumpio", "host");
+ $username = get_pconfig(local_user(), "pumpio", "user");
- if (($username != '') AND ($servername != '')) {
+ /* Add some HTML to the existing form */
- $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
+ $s .= '
';
+ $s .= ''. t('Pump.io Import/Export/Mirror').'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= ''. t('Pump.io Import/Export/Mirror').'
';
+ $s .= '';
- $s .= '
';
- if (($oauth_token == "") OR ($oauth_token_secret == "")) {
- $s .= '
';
- } else {
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ if (($username != '') AND ($servername != '')) {
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
+ $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
- $s .= '
';
- $s .= '';
- $s .= '';
- $s .= '
';
+ $s .= '
';
+ if (($oauth_token == "") OR ($oauth_token_secret == "")) {
+ $s .= '
';
+ } else {
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+ }
- $s .= '
';
- $s .= '';
- $s .= '';
$s .= '
';
}
- $s .= '
';
- }
-
- /* provide a submit button */
-
- $s .= '
';
+ /* provide a submit button */
+ $s .= '
';
}
@@ -434,9 +433,6 @@ function pumpio_send(&$a,&$b) {
$title = trim($b['title']);
- if ($title != '')
- $title = "
".$title."
";
-
$content = bbcode($b['body'], false, false, 4);
// Enhance the way, videos are displayed
@@ -455,7 +451,10 @@ function pumpio_send(&$a,&$b) {
if (!$iscomment) {
$params["object"] = array(
'objectType' => "note",
- 'content' => $title.$content);
+ 'content' => $content);
+
+ if ($title != "")
+ $params["object"]["displayName"] = $title;
if (count($receiver["to"]))
$params["to"] = $receiver["to"];
@@ -473,10 +472,16 @@ function pumpio_send(&$a,&$b) {
$inReplyTo = array("id" => $orig_post["uri"],
"objectType" => "note");
+ if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ $inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
+
$params["object"] = array(
'objectType' => "comment",
- 'content' => $title.$content,
+ 'content' => $content,
'inReplyTo' => $inReplyTo);
+
+ if ($title != "")
+ $params["object"]["displayName"] = $title;
}
$client = new oauth_client_class;
@@ -494,6 +499,10 @@ function pumpio_send(&$a,&$b) {
$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
if($success) {
+
+ if ($user->generator->displayName)
+ set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName);
+
$post_id = $user->object->id;
logger('pumpio_send '.$username.': success '.$post_id);
if($post_id AND $iscomment) {
@@ -519,7 +528,7 @@ function pumpio_send(&$a,&$b) {
}
}
-function pumpio_action(&$a, $uid, $uri, $action, $content) {
+function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
// Don't do likes and other stuff if you don't import the timeline
if (!get_pconfig($uid,'pumpio','import'))
@@ -547,7 +556,9 @@ function pumpio_action(&$a, $uid, $uri, $action, $content) {
else
$uri = $orig_post["uri"];
- if (strstr($uri, "/api/comment/"))
+ if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
+ $objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
+ elseif (strstr($uri, "/api/comment/"))
$objectType = "comment";
elseif (strstr($uri, "/api/note/"))
$objectType = "note";
@@ -591,32 +602,46 @@ function pumpio_action(&$a, $uid, $uri, $action, $content) {
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']);
- }
- }
+ $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']);
@@ -648,8 +673,12 @@ function pumpio_fetchtimeline(&$a, $uid) {
$hostname = get_pconfig($uid, 'pumpio','host');
$username = get_pconfig($uid, "pumpio", "user");
- $application_name = get_config('pumpio', 'application_name');
-
+ // get the application name for the pump.io app
+ // 1st try personal config, then system config and fallback to the
+ // hostname of the node if neither one is set.
+ $application_name = get_pconfig( $uid, 'pumpio', 'application_name');
+ if ($application_name == "")
+ $application_name = get_config('pumpio', 'application_name');
if ($application_name == "")
$application_name = $a->get_hostname();
@@ -707,7 +736,7 @@ function pumpio_fetchtimeline(&$a, $uid) {
if ($receiver->id == "http://activityschema.org/collection/public")
$public = true;
- if ($public AND !strstr($post->generator->displayName, $application_name)) {
+ if ($public AND !stristr($post->generator->displayName, $application_name)) {
require_once('include/html2bbcode.php');
$_SESSION["authenticated"] = true;
@@ -801,7 +830,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
-function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
+function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) {
+ require_once('include/items.php');
// Searching for the liked post
// Two queries for speed issues
@@ -824,6 +854,10 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
$orig_post = $r[0];
}
+ // thread completion
+ if ($threadcompletion)
+ pumpio_fetchallcomments($a, $uid, $post->object->id);
+
$contactid = 0;
if(link_compare($post->actor->url, $own_id)) {
@@ -866,7 +900,6 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
$likedata['parent-uri'] = $orig_post["uri"];
$likedata['contact-id'] = $contactid;
$likedata['app'] = $post->generator->displayName;
- $likedata['verb'] = ACTIVITY_LIKE;
$likedata['author-name'] = $post->actor->displayName;
$likedata['author-link'] = $post->actor->url;
$likedata['author-avatar'] = $post->actor->image->url;
@@ -905,6 +938,12 @@ function pumpio_get_contact($uid, $contact) {
dbesc($contact->image->url),
dbesc(normalise_link($contact->url)));
+ if (DB_UPDATE_VERSION >= "1177")
+ q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
+ dbesc($contact->location->displayName),
+ dbesc($contact->summary),
+ dbesc(normalise_link($contact->url)));
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid), dbesc($contact->url));
@@ -961,7 +1000,7 @@ function pumpio_get_contact($uid, $contact) {
`uri-date` = '%s',
`avatar-date` = '%s'
WHERE `id` = %d
- ",
+ ",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
@@ -970,10 +1009,19 @@ function pumpio_get_contact($uid, $contact) {
dbesc(datetime_convert()),
intval($contact_id)
);
+
+ if (DB_UPDATE_VERSION >= "1177")
+ q("UPDATE `contact` SET `location` = '%s',
+ `about` = '%s'
+ WHERE `id` = %d",
+ dbesc($contact->location->displayName),
+ dbesc($contact->summary),
+ intval($contact_id)
+ );
} else {
// update profile photos once every two weeks as we have no notification of when they change.
-
- $update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
+ //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
+ $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
// check that we have all the photos, this has been known to fail on occasion
@@ -983,15 +1031,15 @@ function pumpio_get_contact($uid, $contact) {
$photos = import_profile_photo($contact->image->url, $uid, $r[0]['id']);
q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s',
+ `thumb` = '%s',
+ `micro` = '%s',
+ `name-date` = '%s',
+ `uri-date` = '%s',
+ `avatar-date` = '%s',
`name` = '%s',
`nick` = '%s'
WHERE `id` = %d
- ",
+ ",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
@@ -1002,6 +1050,15 @@ function pumpio_get_contact($uid, $contact) {
dbesc($contact->preferredUsername),
intval($r[0]['id'])
);
+
+ if (DB_UPDATE_VERSION >= "1177")
+ q("UPDATE `contact` SET `location` = '%s',
+ `about` = '%s'
+ WHERE `id` = %d",
+ dbesc($contact->location->displayName),
+ dbesc($contact->summary),
+ intval($r[0]['id'])
+ );
}
}
@@ -1029,7 +1086,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
return drop_item($r[0]["id"], $false);
}
-function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
+function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) {
require_once('include/items.php');
require_once('include/html2bbcode.php');
@@ -1078,10 +1135,12 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$public = true;
$postarray = array();
+ $postarray['network'] = NETWORK_PUMPIO;
$postarray['gravity'] = 0;
$postarray['uid'] = $uid;
$postarray['wall'] = 0;
$postarray['uri'] = $post->object->id;
+ $postarray['object-type'] = NAMESPACE_ACTIVITY_SCHEMA.strtolower($post->object->objectType);
if ($post->object->objectType != "comment") {
$contact_id = pumpio_get_contact($uid, $post->actor);
@@ -1090,6 +1149,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$contact_id = $self[0]['id'];
$postarray['parent-uri'] = $post->object->id;
+
+ if (!$public) {
+ $postarray['private'] = 1;
+ $postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
+ }
} else {
$contact_id = 0;
@@ -1135,7 +1199,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$reply->published = $post->object->inReplyTo->published;
$reply->received = $post->object->inReplyTo->updated;
$reply->url = $post->object->inReplyTo->url;
- pumpio_dopost($a, $client, $uid, $self, $reply, $own_id);
+ pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false);
$postarray['parent-uri'] = $post->object->inReplyTo->id;
}
@@ -1163,17 +1227,13 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$postarray['created'] = datetime_convert('UTC','UTC',$post->published);
$postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
- if (!$public) {
- $postarray['private'] = 1;
- $postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
- }
if ($post->verb == "share") {
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]";
+ "' 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;
@@ -1239,7 +1299,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'],
'item' => $postarray,
- 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+ 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
@@ -1259,28 +1319,35 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
function pumpio_fetchinbox(&$a, $uid) {
- $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
- $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
- $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
- $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
- $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
- $hostname = get_pconfig($uid, 'pumpio','host');
- $username = get_pconfig($uid, "pumpio", "user");
+ $ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
+ $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
+ $otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
+ $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
+ $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
+ $hostname = get_pconfig($uid, 'pumpio','host');
+ $username = get_pconfig($uid, "pumpio", "user");
$own_id = "https://".$hostname."/".$username;
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid));
- $client = new oauth_client_class;
- $client->oauth_version = '1.0a';
- $client->authorization_header = true;
- $client->url_parameters = false;
+ $lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND
+ `extid` != '' AND `id` = `parent`
+ ORDER BY `commented` DESC LIMIT 10",
+ dbesc(NETWORK_PUMPIO),
+ intval($uid)
+ );
+
+ $client = new oauth_client_class;
+ $client->oauth_version = '1.0a';
+ $client->authorization_header = true;
+ $client->url_parameters = false;
- $client->client_id = $ckey;
- $client->client_secret = $csecret;
- $client->access_token = $otoken;
- $client->access_token_secret = $osecret;
+ $client->client_id = $ckey;
+ $client->client_secret = $csecret;
+ $client->access_token = $otoken;
+ $client->access_token_secret = $osecret;
$last_id = get_pconfig($uid,'pumpio','last_id');
@@ -1289,7 +1356,7 @@ function pumpio_fetchinbox(&$a, $uid) {
if ($last_id != "")
$url .= '?since='.urlencode($last_id);
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
if ($user->items) {
$posts = array_reverse($user->items);
@@ -1297,39 +1364,42 @@ function pumpio_fetchinbox(&$a, $uid) {
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, 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");
-
- $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;
+ $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->client_id = $ckey;
+ $client->client_secret = $csecret;
+ $client->access_token = $otoken;
+ $client->access_token_secret = $osecret;
$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
if ($users->totalItems > count($users->items)) {
$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
}
foreach ($users->items AS $user)
@@ -1426,7 +1496,7 @@ function pumpio_getreceiver(&$a, $b) {
$public = get_pconfig($b['uid'], "pumpio", "public");
- if ($public)
+ if ($public)
$receiver["to"][] = Array(
"objectType" => "collection",
"id" => "http://activityschema.org/collection/public");
@@ -1508,33 +1578,23 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
$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." post id ".$id);
- logger("pumpio_fetchallcomments: completing comment for user ".$uid." url ".$url);
+ $own_id = "https://".$hostname."/".$username;
$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),
+ // 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)) {
- $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($url),
- intval($uid)
- );
-
- if (!count($r))
- return false;
- }
+ if (!count($r))
+ return false;
- if ($r[0]["extid"])
- $url = $r[0]["extid"];
- else
- $url = $id;
+ $url = $r[0]["extid"];
$client = new oauth_client_class;
$client->oauth_version = '1.0a';
@@ -1553,6 +1613,22 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
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;
@@ -1562,7 +1638,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
// 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),
+ dbesc($item->id),
intval($uid)
);
@@ -1570,18 +1646,21 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
continue;
$r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($url),
+ 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);
@@ -1589,17 +1668,13 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
$post->object = $item;
- logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
+ logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true));
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
-
*/