';
if (($oauth_token == "") || ($oauth_token_secret == "")) {
$s .= '
';
} else {
$s .= '
';
@@ -360,26 +361,60 @@ function pumpio_settings_post(App $a, array &$b)
$host = trim($host);
$host = str_replace(["https://", "http://"], ["", ""], $host);
- PConfig::set(local_user(), 'pumpio', 'post' , intval($_POST['pumpio']));
- PConfig::set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import']);
+ PConfig::set(local_user(), 'pumpio', 'post' , defaults($_POST, 'pumpio', false));
+ PConfig::set(local_user(), 'pumpio', 'import' , defaults($_POST, 'pumpio_import', false));
PConfig::set(local_user(), 'pumpio', 'host' , $host);
PConfig::set(local_user(), 'pumpio', 'user' , $user);
- PConfig::set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public']);
- PConfig::set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror']);
- PConfig::set(local_user(), 'pumpio', 'post_by_default', intval($_POST['pumpio_bydefault']));
+ PConfig::set(local_user(), 'pumpio', 'public' , defaults($_POST, 'pumpio_public', false));
+ PConfig::set(local_user(), 'pumpio', 'mirror' , defaults($_POST, 'pumpio_mirror', false));
+ PConfig::set(local_user(), 'pumpio', 'post_by_default', defaults($_POST, 'pumpio_bydefault', false));
- if (!$_POST['pumpio_mirror']) {
+ if (!empty($_POST['pumpio_mirror'])) {
PConfig::delete(local_user(), 'pumpio', 'lastdate');
}
-
- //header("Location: ".$a->get_baseurl()."/pumpio/connect");
}
}
}
-function pumpio_load_config(App $a)
+function pumpio_load_config(App $a, ConfigFileLoader $loader)
{
- $a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
+ $a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
+}
+
+function pumpio_hook_fork(App $a, array &$b)
+{
+ if ($b['name'] != 'notifier_normal') {
+ return;
+ }
+
+ $post = $b['data'];
+
+ // Deleting and editing is not supported by the addon (deleting could, but isn't by now)
+ if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
+ $b['execute'] = false;
+ return;
+ }
+
+ // if post comes from pump.io don't send it back
+ if ($post['app'] == "pump.io") {
+ $b['execute'] = false;
+ return;
+ }
+
+ if (PConfig::get($post['uid'], 'pumpio', 'import')) {
+ // Don't fork if it isn't a reply to a pump.io post
+ if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
+ Logger::log('No pump.io parent found for item ' . $post['id']);
+ $b['execute'] = false;
+ return;
+ }
+ } else {
+ // Comments are never exported when we don't import the pumpio timeline
+ if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
+ $b['execute'] = false;
+ return;
+ }
+ }
}
function pumpio_post_local(App $a, array &$b)
@@ -413,15 +448,15 @@ function pumpio_send(App $a, array &$b)
return;
}
- logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
+ Logger::log("pumpio_send: parameter ".print_r($b, true), Logger::DATA);
if ($b['parent'] != $b['id']) {
// Looking if its a reply to a pumpio post
- $condition = ['id' => $b['parent'], 'network' => NETWORK_PUMPIO];
+ $condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO];
$orig_post = Item::selectFirst([], $condition);
if (!DBA::isResult($orig_post)) {
- logger("pumpio_send: no pumpio post ".$b["parent"]);
+ Logger::log("pumpio_send: no pumpio post ".$b["parent"]);
return;
} else {
$iscomment = true;
@@ -431,7 +466,7 @@ function pumpio_send(App $a, array &$b)
$receiver = pumpio_getreceiver($a, $b);
- logger("pumpio_send: receiver ".print_r($receiver, true));
+ Logger::log("pumpio_send: receiver ".print_r($receiver, true));
if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
return;
@@ -563,23 +598,14 @@ function pumpio_send(App $a, array &$b)
}
$post_id = $user->object->id;
- logger('pumpio_send '.$username.': success '.$post_id);
+ Logger::log('pumpio_send '.$username.': success '.$post_id);
if ($post_id && $iscomment) {
- logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
+ Logger::log('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
Item::update(['extid' => $post_id], ['id' => $b['id']]);
}
} else {
- 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 (DBA::isResult($r)) {
- $a->contact = $r[0]["id"];
- }
-
- $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]);
-
- Queue::add($a->contact, NETWORK_PUMPIO, $s);
- notice(L10n::t('Pump.io post failed. Queued for retry.').EOL);
+ Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
+ Worker::defer();
}
}
}
@@ -644,19 +670,10 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "")
}
if ($success) {
- logger('pumpio_action '.$username.' '.$action.': success '.$uri);
+ Logger::log('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 (DBA::isResult($r)) {
- $a->contact = $r[0]["id"];
- }
-
- $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]);
-
- Queue::add($a->contact, NETWORK_PUMPIO, $s);
- notice(L10n::t('Pump.io like failed. Queued for retry.').EOL);
+ Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
+ Worker::defer();
}
}
@@ -675,16 +692,16 @@ function pumpio_sync(App $a)
if ($last) {
$next = $last + ($poll_interval * 60);
if ($next > time()) {
- logger('pumpio: poll intervall not reached');
+ Logger::log('pumpio: poll intervall not reached');
return;
}
}
- logger('pumpio: cron_start');
+ Logger::log('pumpio: cron_start');
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() ");
if (DBA::isResult($r)) {
foreach ($r as $rr) {
- logger('pumpio: mirroring user '.$rr['uid']);
+ Logger::log('pumpio: mirroring user '.$rr['uid']);
pumpio_fetchtimeline($a, $rr['uid']);
}
}
@@ -702,12 +719,12 @@ function pumpio_sync(App $a)
if ($abandon_days != 0) {
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
if (!DBA::isResult($user)) {
- logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+ Logger::log('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
continue;
}
}
- logger('pumpio: importing timeline from user '.$rr['uid']);
+ Logger::log('pumpio: importing timeline from user '.$rr['uid']);
pumpio_fetchinbox($a, $rr['uid']);
// check for new contacts once a day
@@ -725,7 +742,7 @@ function pumpio_sync(App $a)
}
}
- logger('pumpio: cron_end');
+ Logger::log('pumpio: cron_end');
Config::set('pumpio', 'last_poll', time());
}
@@ -753,7 +770,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$application_name = Config::get('pumpio', 'application_name');
}
if ($application_name == "") {
- $application_name = $a->get_hostname();
+ $application_name = $a->getHostName();
}
$first_time = ($lastdate == "");
@@ -770,7 +787,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major';
- logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
+ Logger::log('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
$useraddr = $username.'@'.$hostname;
@@ -778,10 +795,11 @@ function pumpio_fetchtimeline(App $a, $uid)
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
} else {
$success = false;
+ $user = [];
}
if (!$success) {
- logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
+ Logger::log('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
return;
}
@@ -830,7 +848,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$_REQUEST["source"] = "pump.io";
if (isset($post->object->id)) {
- $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id;
+ $_REQUEST['message_id'] = Protocol::PUMPIO.":".$post->object->id;
}
if ($post->object->displayName != "") {
@@ -850,12 +868,12 @@ function pumpio_fetchtimeline(App $a, $uid)
}
}
- logger('pumpio: posting for user '.$uid);
+ Logger::log('pumpio: posting for user '.$uid);
require_once('mod/item.php');
item_post($a);
- logger('pumpio: posting done - user '.$uid);
+ Logger::log('pumpio: posting done - user '.$uid);
}
}
}
@@ -879,11 +897,11 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
$contactid = 0;
- if (link_compare($post->actor->url, $own_id)) {
+ if (Strings::compareLink($post->actor->url, $own_id)) {
$contactid = $self[0]['id'];
} else {
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- DBA::escape(normalise_link($post->actor->url)),
+ DBA::escape(Strings::normaliseLink($post->actor->url)),
intval($uid)
);
@@ -899,9 +917,9 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
Item::delete(['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
if (DBA::isResult($r)) {
- logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+ Logger::log("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']);
+ Logger::log("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
}
@@ -910,7 +928,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
require_once('include/items.php');
if (empty($post->object->id)) {
- logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
+ Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG);
return;
}
@@ -931,14 +949,14 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
$contactid = 0;
- if (link_compare($post->actor->url, $own_id)) {
+ if (Strings::compareLink($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",
- DBA::escape(normalise_link($post->actor->url)),
+ DBA::escape(Strings::normaliseLink($post->actor->url)),
intval($uid)
);
@@ -952,8 +970,8 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
}
$condition = ['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
- if (DBA::exists('item', $condition)) {
- logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+ if (Item::exists($condition)) {
+ Logger::log("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
return;
}
@@ -963,7 +981,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
$likedata['gravity'] = GRAVITY_ACTIVITY;
$likedata['uid'] = $uid;
$likedata['wall'] = 0;
- $likedata['network'] = NETWORK_PUMPIO;
+ $likedata['network'] = Protocol::PUMPIO;
$likedata['uri'] = Item::newURI($uid);
$likedata['parent-uri'] = $orig_post["uri"];
$likedata['contact-id'] = $contactid;
@@ -983,33 +1001,15 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
$likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
$likedata['object'] = '';
+ '' . $orig_post['uri'] . '' . XML::escape('') . '
' . $orig_post['title'] . '' . $orig_post['body'] . '';
$ret = Item::insert($likedata);
- logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+ Logger::log("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
function pumpio_get_contact($uid, $contact, $no_insert = false)
{
- $gcontact = ["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
- "name" => $contact->displayName, "hide" => true,
- "nick" => $contact->preferredUsername,
- "addr" => str_replace("acct:", "", $contact->id)];
-
- if (!empty($contact->location->displayName)) {
- $gcontact["location"] = $contact->location->displayName;
- }
-
- if (!empty($contact->summary)) {
- $gcontact["about"] = $contact->summary;
- }
-
- if (!empty($contact->image->url)) {
- $gcontact["photo"] = $contact->image->url;
- }
-
- GContact::update($gcontact);
$cid = Contact::getIdForURL($contact->url, $uid);
if ($no_insert) {
@@ -1017,7 +1017,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
}
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
- intval($uid), DBA::escape(normalise_link($contact->url)));
+ intval($uid), DBA::escape(Strings::normaliseLink($contact->url)));
if (!DBA::isResult($r)) {
// create contact record
@@ -1028,7 +1028,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
intval($uid),
DBA::escape(DateTimeFormat::utcNow()),
DBA::escape($contact->url),
- DBA::escape(normalise_link($contact->url)),
+ DBA::escape(Strings::normaliseLink($contact->url)),
DBA::escape(str_replace("acct:", "", $contact->id)),
DBA::escape(''),
DBA::escape($contact->id), // What is it for?
@@ -1036,7 +1036,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
DBA::escape($contact->displayName),
DBA::escape($contact->preferredUsername),
DBA::escape($contact->image->url),
- DBA::escape(NETWORK_PUMPIO),
+ DBA::escape(Protocol::PUMPIO),
intval(Contact::FRIEND),
intval(1),
DBA::escape($contact->location->displayName),
@@ -1045,7 +1045,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
);
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape(normalise_link($contact->url)),
+ DBA::escape(Strings::normaliseLink($contact->url)),
intval($uid)
);
@@ -1081,13 +1081,13 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
{
// Two queries for speed issues
$condition = ['uri' => $post->object->id, 'uid' => $uid];
- if (DBA::exists('item', $condition)) {
+ if (Item::exists($condition)) {
Item::delete($condition);
return true;
}
$condition = ['extid' => $post->object->id, 'uid' => $uid];
- if (DBA::exists('item', $condition)) {
+ if (Item::exists($condition)) {
Item::delete($condition);
return true;
}
@@ -1112,10 +1112,10 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
if ($post->verb != "update") {
// Two queries for speed issues
- if (DBA::exists('item', ['uri' => $post->object->id, 'uid' => $uid])) {
+ if (Item::exists(['uri' => $post->object->id, 'uid' => $uid])) {
return false;
}
- if (DBA::exists('item', ['extid' => $post->object->id, 'uid' => $uid])) {
+ if (Item::exists(['extid' => $post->object->id, 'uid' => $uid])) {
return false;
}
}
@@ -1143,7 +1143,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
}
$postarray = [];
- $postarray['network'] = NETWORK_PUMPIO;
+ $postarray['network'] = Protocol::PUMPIO;
$postarray['uid'] = $uid;
$postarray['wall'] = 0;
$postarray['uri'] = $post->object->id;
@@ -1165,7 +1165,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
} else {
$contact_id = pumpio_get_contact($uid, $post->actor, true);
- if (link_compare($post->actor->url, $own_id)) {
+ if (Strings::compareLink($post->actor->url, $own_id)) {
$contact_id = $self[0]['id'];
$post->actor->displayName = $self[0]['name'];
$post->actor->url = $self[0]['url'];
@@ -1173,7 +1173,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
} 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 `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- DBA::escape(normalise_link($post->actor->url)),
+ DBA::escape(Strings::normaliseLink($post->actor->url)),
intval($uid)
);
@@ -1181,7 +1181,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$contact_id = $r[0]['id'];
} else {
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- DBA::escape(normalise_link($post->actor->url)),
+ DBA::escape(Strings::normaliseLink($post->actor->url)),
intval($uid)
);
@@ -1200,7 +1200,10 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$reply->cc = $post->cc;
}
- $reply->to = $post->to;
+ if (isset($post->to)) {
+ $reply->to = $post->to;
+ }
+
$reply->object = new stdClass;
$reply->object->objectType = $post->object->inReplyTo->objectType;
$reply->object->content = $post->object->inReplyTo->content;
@@ -1217,6 +1220,11 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$postarray['parent-uri'] = $post->object->inReplyTo->id;
}
+ // When there is no content there is no need to continue
+ if (empty($post->object->content)) {
+ return false;
+ }
+
if (!empty($post->object->pump_io->proxyURL)) {
$postarray['extid'] = $post->object->pump_io->proxyURL;
}
@@ -1263,10 +1271,15 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$share_author = $post->object->author->url;
}
+ if (isset($post->object->created)) {
+ $created = DateTimeFormat::utc($post->object->created);
+ } else {
+ $created = '';
+ }
+
$postarray['body'] = share_header($share_author, $post->object->author->url,
$post->object->author->image->url, "",
- DateTimeFormat::utc($post->object->created),
- $post->links->self->href).
+ $created, $post->links->self->href).
$postarray['body']."[/share]";
}
@@ -1309,7 +1322,7 @@ function pumpio_fetchinbox(App $a, $uid)
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",
- DBA::escape(NETWORK_PUMPIO),
+ DBA::escape(Protocol::PUMPIO),
intval($uid)
);
@@ -1341,7 +1354,7 @@ function pumpio_fetchinbox(App $a, $uid)
return;
}
- if ($user->items) {
+ if (!empty($user->items)) {
$posts = array_reverse($user->items);
if (count($posts)) {
@@ -1386,6 +1399,10 @@ function pumpio_getallusers(App &$a, $uid)
$success = false;
}
+ if (empty($users)) {
+ return;
+ }
+
if ($users->totalItems > count($users->items)) {
$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
@@ -1403,90 +1420,6 @@ function pumpio_getallusers(App &$a, $uid)
}
}
-function pumpio_queue_hook(App $a, array &$b)
-{
- $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
- DBA::escape(NETWORK_PUMPIO)
- );
-
- if (!DBA::isResult($qi)) {
- return;
- }
-
- 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 (!DBA::isResult($r)) {
- continue;
- }
-
- $userdata = $r[0];
-
- //logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
-
- $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = PConfig::get($userdata['uid'], "pumpio", "consumer_key");
- $consumer_secret = PConfig::get($userdata['uid'], "pumpio", "consumer_secret");
-
- $host = PConfig::get($userdata['uid'], "pumpio", "host");
- $user = PConfig::get($userdata['uid'], "pumpio", "user");
-
- $success = false;
-
- if ($oauth_token && $oauth_token_secret &&
- $consumer_key && $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'], ['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 && $iscomment) {
- logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
- Item::update(['extid' => $post_id], ['id' => $z['item']]);
- }
- Queue::removeItem($x['id']);
- } else {
- logger('pumpio_queue: send '.$username.': '.$z['url'].' general error: ' . print_r($user, true));
- }
- } else {
- logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
- }
-
- if (!$success) {
- logger('pumpio_queue: delayed');
- Queue::updateTime($x['id']);
- }
- }
-}
-
function pumpio_getreceiver(App $a, array $b)
{
$receiver = [];
@@ -1513,7 +1446,7 @@ function pumpio_getreceiver(App $a, array $b)
$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"]),
- DBA::escape(NETWORK_PUMPIO)
+ DBA::escape(Protocol::PUMPIO)
);
if (DBA::isResult($r)) {
@@ -1531,7 +1464,7 @@ function pumpio_getreceiver(App $a, array $b)
"FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ".
"AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'",
intval($gid),
- DBA::escape(NETWORK_PUMPIO)
+ DBA::escape(Protocol::PUMPIO)
);
foreach ($r AS $row)
@@ -1556,7 +1489,7 @@ function pumpio_getreceiver(App $a, array $b)
$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"]),
- DBA::escape(NETWORK_PUMPIO)
+ DBA::escape(Protocol::PUMPIO)
);
if (DBA::isResult($r)) {
@@ -1581,7 +1514,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
$hostname = PConfig::get($uid, 'pumpio', 'host');
$username = PConfig::get($uid, "pumpio", "user");
- logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
+ Logger::log("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
$own_id = "https://".$hostname."/".$username;
@@ -1607,7 +1540,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
$client->access_token = $otoken;
$client->access_token_secret = $osecret;
- logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
+ Logger::log("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
if (pumpio_reachable($url)) {
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item);
@@ -1647,11 +1580,11 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
}
// Checking if the comment already exists - Two queries for speed issues
- if (DBA::exists('item', ['uri' => $item->id, 'uid' => $uid])) {
+ if (Item::exists(['uri' => $item->id, 'uid' => $uid])) {
continue;
}
- if (DBA::exists('item', ['extid' => $item->id, 'uid' => $uid])) {
+ if (Item::exists(['extid' => $item->id, 'uid' => $uid])) {
continue;
}
@@ -1670,15 +1603,14 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
$post->object = $item;
- logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true));
+ Logger::log("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 = Network::curl($url, false, $redirects, ['timeout'=>10]);
- return intval($data['return_code']) != 0;
+ return Network::curl($url, false, ['timeout' => 10])->isSuccess();
}
/*