<?php
/**
* Name: pump.io Post Connector
- * Description: Post to pump.io
+ * Description: Bidirectional (posting, relaying and reading) connector for pump.io.
* Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/
require('addon/pumpio/oauth/http.php');
require('addon/pumpio/oauth/oauth_client.php');
+require_once('include/enotify.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');
+ register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
}
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');
+ unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
}
function pumpio_module() {}
return '';
}
- if (function_exists("apc_delete")) {
- $toDelete = new APCIterator('user', APC_ITER_VALUE);
- apc_delete($toDelete);
- }
+ require_once("mod/settings.php");
+ settings_init($a);
if (isset($a->argv[1]))
switch ($a->argv[1]) {
return $o;
}
+function pumpio_check_item_notification($a, &$notification_data) {
+ $hostname = get_pconfig($notification_data["uid"], 'pumpio','host');
+ $username = get_pconfig($notification_data["uid"], "pumpio", "user");
+
+ $notification_data["profiles"][] = "https://".$hostname."/".$username;
+}
+
+
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";
+ $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+
+ $params["type"] = "client_associate";
+ $params["contacts"] = $adminlist[0];
+ $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);
}
$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 .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</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 .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
- . t('Post to pumpio') . '</div>';
- }
+ 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 .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
+ . t('Post to pumpio') . '</div>';
+ }
}
function pumpio_settings(&$a,&$s) {
- if(! local_user())
- return;
-
- /* Add our stylesheet to the page so we can make our settings look nice */
-
- $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
-
- /* Get the current state of our config variables */
+ if(! local_user())
+ return;
- $import_enabled = get_pconfig(local_user(),'pumpio','import');
- $import_checked = (($import_enabled) ? ' checked="checked" ' : '');
+ /* Add our stylesheet to the page so we can make our settings look nice */
- $enabled = get_pconfig(local_user(),'pumpio','post');
- $checked = (($enabled) ? ' checked="checked" ' : '');
+ $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
- $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
- $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+ /* Get the current state of our config variables */
- $public_enabled = get_pconfig(local_user(),'pumpio','public');
- $public_checked = (($public_enabled) ? ' checked="checked" ' : '');
+ $import_enabled = get_pconfig(local_user(),'pumpio','import');
+ $import_checked = (($import_enabled) ? ' checked="checked" ' : '');
- $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror');
- $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
+ $enabled = get_pconfig(local_user(),'pumpio','post');
+ $checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
- $servername = get_pconfig(local_user(), "pumpio", "host");
- $username = get_pconfig(local_user(), "pumpio", "user");
+ $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
+ $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- /* Add some HTML to the existing form */
+ $public_enabled = get_pconfig(local_user(),'pumpio','public');
+ $public_checked = (($public_enabled) ? ' checked="checked" ' : '');
- $s .= '<div class="settings-block">';
- $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+ $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror');
+ $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
- $s .= '<div id="pumpio-username-wrapper">';
- $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
- $s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
- $s .= '</div><div class="clear"></div>';
+ $servername = get_pconfig(local_user(), "pumpio", "host");
+ $username = get_pconfig(local_user(), "pumpio", "user");
- $s .= '<div id="pumpio-servername-wrapper">';
- $s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.t('pump.io servername (without "http://" or "https://" )').'</label>';
- $s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
- $s .= '</div><div class="clear"></div>';
+ /* Add some HTML to the existing form */
- if (($username != '') AND ($servername != '')) {
+ $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>';
- $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
+ $s .= '<div id="pumpio-username-wrapper">';
+ $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
+ $s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
+ $s .= '</div><div class="clear"></div>';
- $s .= '<div id="pumpio-password-wrapper">';
- if (($oauth_token == "") OR ($oauth_token_secret == "")) {
- $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>';
- } else {
- $s .= '<div id="pumpio-import-wrapper">';
- $s .= '<label id="pumpio-import-label" for="pumpio-import">' . t('Import the remote timeline') . '</label>';
- $s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
- $s .= '</div><div class="clear"></div>';
+ $s .= '<div id="pumpio-servername-wrapper">';
+ $s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.t('pump.io servername (without "http://" or "https://" )').'</label>';
+ $s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
+ $s .= '</div><div class="clear"></div>';
- $s .= '<div id="pumpio-enable-wrapper">';
- $s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>';
- $s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
- $s .= '</div><div class="clear"></div>';
+ if (($username != '') AND ($servername != '')) {
- $s .= '<div id="pumpio-bydefault-wrapper">';
- $s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . t('Post to pump.io by default') . '</label>';
- $s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
- $s .= '</div><div class="clear"></div>';
+ $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
+ $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
- $s .= '<div id="pumpio-public-wrapper">';
- $s .= '<label id="pumpio-public-label" for="pumpio-public">' . t('Should posts be public?') . '</label>';
- $s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="pumpio-mirror-wrapper">';
- $s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . t('Mirror all public posts') . '</label>';
- $s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
- $s .= '</div><div class="clear"></div>';
+ $s .= '<div id="pumpio-password-wrapper">';
+ if (($oauth_token == "") OR ($oauth_token_secret == "")) {
+ $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>';
+ } else {
+ $s .= '<div id="pumpio-import-wrapper">';
+ $s .= '<label id="pumpio-import-label" for="pumpio-import">' . t('Import the remote timeline') . '</label>';
+ $s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
+ $s .= '</div><div class="clear"></div>';
+
+ $s .= '<div id="pumpio-enable-wrapper">';
+ $s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>';
+ $s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
+ $s .= '</div><div class="clear"></div>';
+
+ $s .= '<div id="pumpio-bydefault-wrapper">';
+ $s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . t('Post to pump.io by default') . '</label>';
+ $s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
+ $s .= '</div><div class="clear"></div>';
+
+ $s .= '<div id="pumpio-public-wrapper">';
+ $s .= '<label id="pumpio-public-label" for="pumpio-public">' . t('Should posts be public?') . '</label>';
+ $s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
+ $s .= '</div><div class="clear"></div>';
+
+ $s .= '<div id="pumpio-mirror-wrapper">';
+ $s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . t('Mirror all public posts') . '</label>';
+ $s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
+ $s .= '</div><div class="clear"></div>';
+
+ $s .= '<div id="pumpio-delete-wrapper">';
+ $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-delete-wrapper">';
- $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><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>';
+ /* provide a submit button */
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}
if(x($_POST,'pumpio_delete')) {
set_pconfig(local_user(),'pumpio','consumer_key','');
set_pconfig(local_user(),'pumpio','consumer_secret','');
- set_pconfig(local_user(),'pumpio','host','');
set_pconfig(local_user(),'pumpio','oauth_token','');
set_pconfig(local_user(),'pumpio','oauth_token_secret','');
set_pconfig(local_user(),'pumpio','post',false);
- set_pconfig(local_user(),'pumpio','post_by_default',false);
+ set_pconfig(local_user(),'pumpio','import',false);
+ set_pconfig(local_user(),'pumpio','host','');
set_pconfig(local_user(),'pumpio','user','');
+ set_pconfig(local_user(),'pumpio','public',false);
+ set_pconfig(local_user(),'pumpio','mirror',false);
+ set_pconfig(local_user(),'pumpio','post_by_default',false);
+ set_pconfig(local_user(),'pumpio','lastdate', 0);
+ set_pconfig(local_user(),'pumpio','last_id', '');
} else {
// filtering the username if it is filled wrong
$user = $_POST['pumpio_user'];
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");
+ if (!$_POST['pumpio_mirror'])
+ del_pconfig(local_user(),'pumpio','lastdate');
+
+ //header("Location: ".$a->get_baseurl()."/pumpio/connect");
}
}
}
if($b['app'] == "pump.io")
return;
+ // To-Do;
+ // Support for native shares
+ // http://<hostname>/api/<type>/shares?id=<the-object-id>
$oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token");
$oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret");
$title = trim($b['title']);
- 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);
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"];
$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;
$username = $user.'@'.$host;
$url = 'https://'.$host.'/api/user/'.$user.'/feed';
- $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+ else
+ $success = false;
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) {
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_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'))
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";
$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
- $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+ else
+ $success = false;
if($success)
logger('pumpio_action '.$username.' '.$action.': success '.$uri);
}
}
+function pumpio_sync(&$a) {
+ $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'",
+ $plugin);
-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']);
- }
- }
+ if (!count($r))
+ return;
+
+ $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']);
set_config('pumpio','last_poll', time());
}
+function pumpio_cron(&$a,$b) {
+ //pumpio_sync($a);
+ proc_run("php","addon/pumpio/pumpio_sync.php");
+}
+
function pumpio_fetchtimeline(&$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");
- $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();
$username = $user.'@'.$host;
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+ else
+ $success = false;
if (!$success) {
logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
if (count($posts)) {
foreach ($posts as $post) {
- if ($post->generator->published <= $initiallastdate)
+ if ($post->published <= $initiallastdate)
continue;
- if ($lastdate < $post->generator->published)
- $lastdate = $post->generator->published;
+ if ($lastdate < $post->published)
+ $lastdate = $post->published;
if ($first_time)
continue;
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;
$_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);
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
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
dbesc($post->object->id),
- intval($uid)
+ intval($uid),
+ dbesc(NETWORK_PUMPIO)
);
if (count($r))
$orig_post = $r[0];
else {
- $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
dbesc($post->object->id),
- intval($uid)
+ intval($uid),
+ dbesc(NETWORK_PUMPIO)
);
if (!count($r))
$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)) {
$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;
function pumpio_get_contact($uid, $contact) {
+ if (function_exists("update_gcontact"))
+ update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+ "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
+ "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
+ "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
+ else {
+ // Old Code
+ $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)));
+
+ 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));
`name-date` = '%s',
`uri-date` = '%s',
`avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
- ",
+ WHERE `id` = %d
+ ",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
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
$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'
- WHERE `id` = %d LIMIT 1
- ",
+ `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]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ dbesc($contact->displayName),
+ 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'])
+ );
}
}
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');
if (($post->verb == "like") OR ($post->verb == "favorite"))
return pumpio_dolike($a, $uid, $self, $post, $own_id);
$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);
$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;
$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;
}
$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") {
- $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.
+ "' posted='".datetime_convert('UTC','UTC',$post->object->created).
+ "' 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 false;
$top_item = item_store($postarray);
+ $postarray["id"] = $top_item;
if (($top_item == 0) AND ($post->verb == "update")) {
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
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']),
- intval($uid)
- );
-
- if(count($myconv)) {
-
- 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'],$own_id))
- continue;
+ if (!function_exists("check_item_notification")) {
+ $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']),
+ intval($uid)
+ );
- require_once('include/enotify.php');
-
- $conv_parent = $conv['parent'];
-
- notification(array(
- 'type' => NOTIFY_COMMENT,
- 'notify_flags' => $user[0]['notify-flags'],
- 'language' => $user[0]['language'],
- 'to_name' => $user[0]['username'],
- 'to_email' => $user[0]['email'],
- 'uid' => $user[0]['uid'],
- 'item' => $postarray,
- 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
- 'source_name' => $postarray['author-name'],
- 'source_link' => $postarray['author-link'],
- 'source_photo' => $postarray['author-avatar'],
- 'verb' => ACTIVITY_POST,
- 'otype' => 'item',
- 'parent' => $conv_parent,
- ));
-
- // only send one notification
- break;
+ if(count($myconv)) {
+
+ 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'],$own_id))
+ continue;
+
+ require_once('include/enotify.php');
+
+ $conv_parent = $conv['parent'];
+
+ notification(array(
+ 'type' => NOTIFY_COMMENT,
+ 'notify_flags' => $user[0]['notify-flags'],
+ 'language' => $user[0]['language'],
+ 'to_name' => $user[0]['username'],
+ 'to_email' => $user[0]['email'],
+ 'uid' => $user[0]['uid'],
+ 'item' => $postarray,
+ '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'],
+ 'verb' => ACTIVITY_POST,
+ 'otype' => 'item',
+ 'parent' => $conv_parent,
+ ));
+
+ // only send one notification
+ break;
+ }
}
}
}
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');
if ($last_id != "")
$url .= '?since='.urlencode($last_id);
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+ else
+ $success = false;
if ($user->items) {
$posts = array_reverse($user->items);
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);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+ else
+ $success = false;
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);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+ else
+ $success = false;
}
foreach ($users->items AS $user)
- echo pumpio_get_contact($uid, $user)."\n";
+ pumpio_get_contact($uid, $user);
}
function pumpio_queue_hook(&$a,&$b) {
$client->client_id = $consumer_key;
$client->client_secret = $consumer_secret;
- $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+ if (pumpio_reachable($z['url']))
+ $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('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 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'])
);
$public = get_pconfig($b['uid'], "pumpio", "public");
- if ($public)
+ if ($public)
$receiver["to"][] = Array(
"objectType" => "collection",
"id" => "http://activityschema.org/collection/public");
$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';
logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
- $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+ if (pumpio_reachable($url))
+ $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+ else
+ $success = false;
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;
// 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)
);
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);
$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
+function pumpio_reachable($url) {
+ $data = z_fetch_url($url, false, $redirects, array('timeout'=>10));
+ return(intval($data['return_code']) != 0);
+}
+
+/*
To-Do:
- edit own notes
- delete own notes
-
*/
projects / friendica-addons.git / blobdiff