Merge pull request #175 from annando/master
diaspora: New posting connector for Diasporapull/176/head
tobiasd
commit
834966b583
|
|
@ -0,0 +1,102 @@
|
|||
<?php
|
||||
/**
|
||||
* Ein fies zusammengehackter PHP-Diaspory-Client, der direkt von diesem abgeschaut ist:
|
||||
* https://github.com/Javafant/diaspy/blob/master/client.py
|
||||
*/
|
||||
|
||||
class Diasphp {
|
||||
function __construct($pod) {
|
||||
$this->token_regex = '/content="(.*?)" name="csrf-token/';
|
||||
|
||||
$this->pod = $pod;
|
||||
$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies');
|
||||
}
|
||||
|
||||
function _fetch_token() {
|
||||
$ch = curl_init();
|
||||
|
||||
curl_setopt ($ch, CURLOPT_URL, $this->pod . "/stream");
|
||||
curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, true);
|
||||
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
|
||||
$output = curl_exec ($ch);
|
||||
curl_close($ch);
|
||||
|
||||
// Token holen und zurückgeben
|
||||
preg_match($this->token_regex, $output, $matches);
|
||||
return $matches[1];
|
||||
}
|
||||
|
||||
function login($username, $password) {
|
||||
$datatopost = array(
|
||||
'user[username]' => $username,
|
||||
'user[password]' => $password,
|
||||
'authenticity_token' => $this->_fetch_token()
|
||||
);
|
||||
|
||||
$poststr = http_build_query($datatopost);
|
||||
|
||||
// Adresse per cURL abrufen
|
||||
$ch = curl_init();
|
||||
|
||||
curl_setopt ($ch, CURLOPT_URL, $this->pod . "/users/sign_in");
|
||||
curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, false);
|
||||
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt ($ch, CURLOPT_POST, true);
|
||||
curl_setopt ($ch, CURLOPT_POSTFIELDS, $poststr);
|
||||
|
||||
curl_exec ($ch);
|
||||
$info = curl_getinfo($ch);
|
||||
curl_close($ch);
|
||||
|
||||
if($info['http_code'] != 302) {
|
||||
throw new Exception('Login error '.print_r($info, true));
|
||||
}
|
||||
|
||||
// Das Objekt zurückgeben, damit man Aurufe verketten kann.
|
||||
return $this;
|
||||
}
|
||||
|
||||
function post($text) {
|
||||
// post-daten vorbereiten
|
||||
$datatopost = json_encode(array(
|
||||
'aspect_ids' => 'public',
|
||||
'status_message' => array('text' => $text)
|
||||
));
|
||||
|
||||
// header vorbereiten
|
||||
$headers = array(
|
||||
'Content-Type: application/json',
|
||||
'accept: application/json',
|
||||
'x-csrf-token: '.$this->_fetch_token()
|
||||
);
|
||||
|
||||
// Adresse per cURL abrufen
|
||||
$ch = curl_init();
|
||||
|
||||
curl_setopt ($ch, CURLOPT_URL, $this->pod . "/status_messages");
|
||||
curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
|
||||
curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, false);
|
||||
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt ($ch, CURLOPT_POST, true);
|
||||
curl_setopt ($ch, CURLOPT_POSTFIELDS, $datatopost);
|
||||
curl_setopt ($ch, CURLOPT_HTTPHEADER, $headers);
|
||||
|
||||
curl_exec ($ch);
|
||||
$info = curl_getinfo($ch);
|
||||
curl_close($ch);
|
||||
|
||||
if($info['http_code'] != 201) {
|
||||
throw new Exception('Post error '.print_r($info, true));
|
||||
}
|
||||
|
||||
// Ende der möglichen Kette, gib mal "true" zurück.
|
||||
return true;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
|
||||
#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-url-label, #diaspora-bydefault-label {
|
||||
float: left;
|
||||
width: 200px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-url, #diaspora-bydefault {
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#diaspora-submit {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,324 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Name: Diaspora Post Connector
|
||||
* Description: Post to Diaspora
|
||||
* Version: 0.1
|
||||
* Author: Michael Vogel <heluecht@pirati.ca>
|
||||
*/
|
||||
|
||||
function diaspora_install() {
|
||||
register_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
|
||||
register_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
|
||||
register_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
|
||||
register_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
|
||||
register_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
|
||||
register_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
|
||||
}
|
||||
function diaspora_uninstall() {
|
||||
unregister_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
|
||||
unregister_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
|
||||
unregister_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
|
||||
unregister_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
|
||||
unregister_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
|
||||
unregister_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
|
||||
}
|
||||
|
||||
|
||||
function diaspora_jot_nets(&$a,&$b) {
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
$diaspora_post = get_pconfig(local_user(),'diaspora','post');
|
||||
if(intval($diaspora_post) == 1) {
|
||||
$diaspora_defpost = get_pconfig(local_user(),'diaspora','post_by_default');
|
||||
$selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : '');
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
|
||||
. t('Post to Diaspora') . '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
function diaspora_queue_hook(&$a,&$b) {
|
||||
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
||||
dbesc(NETWORK_DIASPORA2)
|
||||
);
|
||||
if(! count($qi))
|
||||
return;
|
||||
|
||||
require_once('include/queue_fn.php');
|
||||
|
||||
foreach($qi as $x) {
|
||||
if($x['network'] !== NETWORK_DIASPORA2)
|
||||
continue;
|
||||
|
||||
logger('diaspora_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(! count($r))
|
||||
continue;
|
||||
|
||||
$userdata = $r[0];
|
||||
|
||||
$diaspora_username = get_pconfig($userdata['uid'],'diaspora','diaspora_username');
|
||||
$diaspora_password = get_pconfig($userdata['uid'],'diaspora','diaspora_password');
|
||||
$diaspora_url = get_pconfig($userdata['uid'],'diaspora','diaspora_url');
|
||||
|
||||
$success = false;
|
||||
|
||||
if($diaspora_url && $diaspora_username && $diaspora_password) {
|
||||
require_once("addon/diaspora/diasphp.php");
|
||||
|
||||
logger('diaspora_queue: able to post for user '.$diaspora_username);
|
||||
|
||||
$z = unserialize($x['content']);
|
||||
|
||||
$post = $z['post'];
|
||||
|
||||
logger('diaspora_queue: post: '.$post, LOGGER_DATA);
|
||||
|
||||
try {
|
||||
logger('diaspora_queue: prepare', LOGGER_DEBUG);
|
||||
$conn = new Diasphp($diaspora_url);
|
||||
logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG);
|
||||
$conn->login($diaspora_username, $diaspora_password);
|
||||
logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
|
||||
$conn->post($post);
|
||||
|
||||
logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
|
||||
|
||||
$success = true;
|
||||
|
||||
remove_queue_item($x['id']);
|
||||
} catch (Exception $e) {
|
||||
logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG);
|
||||
}
|
||||
} else
|
||||
logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
|
||||
|
||||
if (!$success) {
|
||||
logger('diaspora_queue: delayed');
|
||||
update_queue_time($x['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function diaspora_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/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
|
||||
|
||||
/* Get the current state of our config variables */
|
||||
|
||||
$enabled = get_pconfig(local_user(),'diaspora','post');
|
||||
|
||||
$checked = (($enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$def_enabled = get_pconfig(local_user(),'diaspora','post_by_default');
|
||||
|
||||
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$diaspora_username = get_pconfig(local_user(), 'diaspora', 'diaspora_username');
|
||||
$diaspora_password = get_pconfig(local_user(), 'diaspora', 'diaspora_password');
|
||||
$diaspora_url = get_pconfig(local_user(), 'diaspora', 'diaspora_url');
|
||||
|
||||
$status = "";
|
||||
|
||||
if ($diaspora_username AND $diaspora_password AND $diaspora_url) {
|
||||
try {
|
||||
require_once("addon/diaspora/diasphp.php");
|
||||
|
||||
$conn = new Diasphp($diaspora_url);
|
||||
$conn->login($diaspora_username, $diaspora_password);
|
||||
} catch (Exception $e) {
|
||||
$status = t("Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)");
|
||||
}
|
||||
}
|
||||
|
||||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
|
||||
$s .= '<h3>' . t('Diaspora') . '</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
|
||||
$s .= '<h3>' . t('Diaspora') . '</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
if ($status) {
|
||||
$s .= '<div id="diaspora-status-wrapper"><strong>';
|
||||
$s .= $status;
|
||||
$s .= '</strong></div><div class="clear"></div>';
|
||||
}
|
||||
|
||||
$s .= '<div id="diaspora-enable-wrapper">';
|
||||
$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . t('Enable Diaspora Post Plugin') . '</label>';
|
||||
$s .= '<input id="diaspora-checkbox" type="checkbox" name="diaspora" value="1" ' . $checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="diaspora-username-wrapper">';
|
||||
$s .= '<label id="diaspora-username-label" for="diaspora-username">' . t('Diaspora username') . '</label>';
|
||||
$s .= '<input id="diaspora-username" type="text" name="diaspora_username" value="' . $diaspora_username . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="diaspora-password-wrapper">';
|
||||
$s .= '<label id="diaspora-password-label" for="diaspora-password">' . t('Diaspora password') . '</label>';
|
||||
$s .= '<input id="diaspora-password" type="password" name="diaspora_password" value="' . $diaspora_password . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="diaspora-url-wrapper">';
|
||||
$s .= '<label id="diaspora-url-label" for="diaspora-url">' . t('Diaspora site URL') . '</label>';
|
||||
$s .= '<input id="diaspora-url" type="text" name="diaspora_url" value="' . $diaspora_url . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="diaspora-bydefault-wrapper">';
|
||||
$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . t('Post to Diaspora by default') . '</label>';
|
||||
$s .= '<input id="diaspora-bydefault" type="checkbox" name="diaspora_bydefault" value="1" ' . $def_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
function diaspora_settings_post(&$a,&$b) {
|
||||
|
||||
if(x($_POST,'diaspora-submit')) {
|
||||
|
||||
set_pconfig(local_user(),'diaspora','post',intval($_POST['diaspora']));
|
||||
set_pconfig(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault']));
|
||||
set_pconfig(local_user(),'diaspora','diaspora_username',trim($_POST['diaspora_username']));
|
||||
set_pconfig(local_user(),'diaspora','diaspora_password',trim($_POST['diaspora_password']));
|
||||
set_pconfig(local_user(),'diaspora','diaspora_url',trim($_POST['diaspora_url']));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function diaspora_post_local(&$a,&$b) {
|
||||
|
||||
if($b['edit'])
|
||||
return;
|
||||
|
||||
if((! local_user()) || (local_user() != $b['uid']))
|
||||
return;
|
||||
|
||||
if($b['private'] || $b['parent'])
|
||||
return;
|
||||
|
||||
$diaspora_post = intval(get_pconfig(local_user(),'diaspora','post'));
|
||||
|
||||
$diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
|
||||
|
||||
if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'diaspora','post_by_default')))
|
||||
$diaspora_enable = 1;
|
||||
|
||||
if(! $diaspora_enable)
|
||||
return;
|
||||
|
||||
if(strlen($b['postopts']))
|
||||
$b['postopts'] .= ',';
|
||||
$b['postopts'] .= 'diaspora';
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function diaspora_send(&$a,&$b) {
|
||||
|
||||
logger('diaspora_send: invoked');
|
||||
|
||||
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
|
||||
return;
|
||||
|
||||
if(! strstr($b['postopts'],'diaspora'))
|
||||
return;
|
||||
|
||||
if($b['parent'] != $b['id'])
|
||||
return;
|
||||
|
||||
logger('diaspora_send: prepare posting', LOGGER_DEBUG);
|
||||
|
||||
$diaspora_username = get_pconfig($b['uid'],'diaspora','diaspora_username');
|
||||
$diaspora_password = get_pconfig($b['uid'],'diaspora','diaspora_password');
|
||||
$diaspora_url = get_pconfig($b['uid'],'diaspora','diaspora_url');
|
||||
|
||||
if($diaspora_url && $diaspora_username && $diaspora_password) {
|
||||
|
||||
logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
|
||||
|
||||
require_once('include/bb2diaspora.php');
|
||||
$tag_arr = array();
|
||||
$tags = '';
|
||||
$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
|
||||
|
||||
if($x) {
|
||||
foreach($matches as $mtch) {
|
||||
$tag_arr[] = $mtch[2];
|
||||
}
|
||||
}
|
||||
if(count($tag_arr))
|
||||
$tags = implode(',',$tag_arr);
|
||||
|
||||
$title = $b['title'];
|
||||
$body = $b['body'];
|
||||
// Insert a newline before and after a quote
|
||||
$body = str_ireplace("[quote", "\n\n[quote", $body);
|
||||
$body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
|
||||
|
||||
// Removal of tags and mentions
|
||||
// #-tags
|
||||
$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
|
||||
// @-mentions
|
||||
$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
|
||||
|
||||
// remove multiple newlines
|
||||
do {
|
||||
$oldbody = $body;
|
||||
$body = str_replace("\n\n\n", "\n\n", $body);
|
||||
} while ($oldbody != $body);
|
||||
|
||||
// convert to markdown
|
||||
$body = bb2diaspora($body, false, true);
|
||||
|
||||
// Adding the title
|
||||
if(strlen($title))
|
||||
$body = "## ".html_entity_decode($title)."\n\n".$body;
|
||||
|
||||
require_once("addon/diaspora/diasphp.php");
|
||||
|
||||
try {
|
||||
logger('diaspora_send: prepare', LOGGER_DEBUG);
|
||||
$conn = new Diasphp($diaspora_url);
|
||||
logger('diaspora_send: try to log in '.$diaspora_username, LOGGER_DEBUG);
|
||||
$conn->login($diaspora_username, $diaspora_password);
|
||||
logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
|
||||
|
||||
//throw new Exception('Test');
|
||||
$conn->post($body);
|
||||
|
||||
logger('diaspora_send: success');
|
||||
} catch (Exception $e) {
|
||||
logger("diaspora_send: Error submitting the post: " . $e->getMessage());
|
||||
|
||||
logger('diaspora_send: requeueing '.$b['uid'], LOGGER_DEBUG);
|
||||
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
|
||||
if (count($r))
|
||||
$a->contact = $r[0]["id"];
|
||||
|
||||
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body));
|
||||
require_once('include/queue_fn.php');
|
||||
add_to_queue($a->contact,NETWORK_DIASPORA2,$s);
|
||||
notice(t('Diaspora post failed. Queued for retry.').EOL);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue