From 1ce748332746b5c05da65199201fae32ac15ed3e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 9 May 2013 14:36:50 +0200 Subject: [PATCH] pumpio: Preparing mirroring --- pumpio/pumpio.css | 16 ++++++ pumpio/pumpio.php | 139 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 146 insertions(+), 9 deletions(-) create mode 100755 pumpio/pumpio.css diff --git a/pumpio/pumpio.css b/pumpio/pumpio.css new file mode 100755 index 00000000..271a57f3 --- /dev/null +++ b/pumpio/pumpio.css @@ -0,0 +1,16 @@ + +#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label { + float: left; + width: 200px; + margin-top: 10px; +} + +#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault { + float: left; + margin-top: 10px; +} + +#pumpio-submit { + margin-top: 15px; +} + diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index a8304a7f..52587e11 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -12,12 +12,15 @@ require('addon/pumpio/oauth/http.php'); 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'); } function pumpio_uninstall() { @@ -26,6 +29,7 @@ function pumpio_uninstall() { 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'); } function pumpio_module() {} @@ -52,18 +56,24 @@ function pumpio_content(&$a) { return $o; } -function pumpio_registerclient($host) { +function pumpio_registerclient($a, $host) { $url = "https://".$host."/api/client/register"; $params = array(); + $application_name = get_config('pumpio', 'application_name'); + + if ($application_name == "") + $application_name = $a->get_hostname(); + + $params["type"] = "client_associate"; - $params["contacts"] = "icarus@dabo.de"; + //$params["contacts"] = "icarus@dabo.de"; $params["application_type"] = "native"; - $params["application_name"] = "pirati.ca"; - $params["logo_url"] = "https://pirati.ca/images/friendica-256.png"; - $params["redirect_uris"] = "http://pirati.ca/addon/pumpio/pumpio.php"; + $params["application_name"] = $application_name; + //$params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png"; + //$params["redirect_uris"] = $a->get_baseurl()."a/addon/pumpio/pumpio.php"; $ch = curl_init($url); curl_setopt($ch, CURLOPT_HEADER, false); @@ -96,7 +106,7 @@ function pumpio_connect($a) { $hostname = get_pconfig(local_user(), 'pumpio','host'); if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) { - $clientdata = pumpio_registerclient($hostname); + $clientdata = pumpio_registerclient($a, $hostname); set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id); set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret); @@ -174,13 +184,14 @@ function pumpio_settings(&$a,&$s) { /* Get the current state of our config variables */ $enabled = get_pconfig(local_user(),'pumpio','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $public_enabled = get_pconfig(local_user(),'pumpio','public'); + $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); + $servername = get_pconfig(local_user(), "pumpio", "host"); $username = get_pconfig(local_user(), "pumpio", "user"); @@ -190,7 +201,7 @@ function pumpio_settings(&$a,&$s) { $s .= '

' . t('Pump.io Post Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; @@ -214,6 +225,11 @@ function pumpio_settings(&$a,&$s) { $s .= ''; $s .= '
'; + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); @@ -238,6 +254,7 @@ function pumpio_settings_post(&$a,&$b) { set_pconfig(local_user(),'pumpio','post',intval($_POST['pumpio'])); set_pconfig(local_user(),'pumpio','host',$_POST['pumpio_host']); set_pconfig(local_user(),'pumpio','user',$_POST['pumpio_user']); + set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']); set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault'])); } @@ -287,6 +304,10 @@ function pumpio_send(&$a,&$b) { if($b['parent'] != $b['id']) return; + // if post comes from pump.io don't send it back + if($b['app'] == "pump.io") + return; + $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token"); $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret"); $consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key"); @@ -294,6 +315,7 @@ function pumpio_send(&$a,&$b) { $host = get_pconfig($b['uid'], "pumpio", "host"); $user = get_pconfig($b['uid'], "pumpio", "user"); + $public = get_pconfig($b['uid'], "pumpio", "public"); if($oauth_token && $oauth_token_secret) { @@ -310,6 +332,11 @@ function pumpio_send(&$a,&$b) { 'objectType' => "note", 'content' => $title.bbcode($b['body'], false, false)); + if ($public) + $params->to = array(Array( + "objectType" => "collection", + "id" => "http://activityschema.org/collection/public")); + $client = new oauth_client_class; $client->oauth_version = '1.0a'; $client->url_parameters = false; @@ -331,3 +358,97 @@ function pumpio_send(&$a,&$b) { } } +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_posts' AND `v` = '1' ORDER BY RAND() "); + if(count($r)) { + foreach($r as $rr) { + logger('pumpio: fetching for user '.$rr['uid']); + pumpio_fetchtimeline($a, $rr['uid']); + } + } + + logger('pumpio: cron_end'); + + set_config('pumpio','last_poll', time()); +} + +function pumpio_fetchtimeline($a, $uid) { + $ckey = get_pconfig($uid, 'pumpio', 'consumerkey'); + $csecret = get_pconfig($uid, 'pumpio', 'consumersecret'); + $otoken = get_pconfig($uid, 'pumpio', 'oauthtoken'); + $osecret = get_pconfig($uid, 'pumpio', 'oauthsecret'); + $lastid = get_pconfig($uid, 'pumpio', 'lastid'); + $hostname = get_pconfig($uid, 'pumpio','host'); + $username = get_pconfig($uid, "pumpio", "user"); + + $application_name = get_config('pumpio', 'application_name'); + + if ($application_name == "") + $application_name = $a->get_hostname(); + + $first_time = ($lastid == ""); + + require('oauth/http.php'); + require('oauth/oauth_client.php'); + + $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 = $csekret; + $client->access_token = $otoken; + $client->access_token_secret = $osecret; + + $success = $client->CallAPI( + 'https://'.$hostname.'/api/user/'.$username.'/feed/major', + 'GET', array(), array('FailOnAccessError'=>true), $user); + + $posts = array_reverse($items); + + if (count($posts)) { + foreach ($posts as $post) { + if ($post->id_str > $lastid) // To-Do + $lastid = $post->id_str; // To-Do + + if ($first_time) + continue; + + if (!strpos($post->source, $application_name)) { + require_once('include/html2bbcode.php'); + + $_SESSION["authenticated"] = true; + $_SESSION["uid"] = $uid; + + $_REQUEST["type"] = "wall"; + $_REQUEST["api_source"] = true; + $_REQUEST["profile_uid"] = $uid; + $_REQUEST["source"] = "pump.io"; + + $_REQUEST["body"] = html2bbcode($post->object->content); + + logger('pumpio: posting for user '.$uid); + + require_once('mod/item.php'); + item_post($a); + } + } + } + +}