require_once 'addon/diaspora/Diaspora_Connection.php';
+use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
-use Friendica\Model\Queue;
-
-function diaspora_install() {
- Addon::registerHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
- Addon::registerHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
- Addon::registerHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
- Addon::registerHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
- Addon::registerHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
- Addon::registerHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
+use Friendica\Database\DBA;
+use Friendica\Core\Worker;
+use Friendica\DI;
+
+function diaspora_install()
+{
+ Hook::register('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
+ Hook::register('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
+ Hook::register('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
+ Hook::register('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
+ Hook::register('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
+ Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
}
-function diaspora_uninstall() {
- Addon::unregisterHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
- Addon::unregisterHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
- Addon::unregisterHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
-}
-
-
-function diaspora_jot_nets(&$a,&$b) {
- if(! local_user())
- return;
-
- $diaspora_post = PConfig::get(local_user(),'diaspora','post');
- if(intval($diaspora_post) == 1) {
- $diaspora_defpost = PConfig::get(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" /> '
- . L10n::t('Post to Diaspora') . '</div>';
- }
-}
-
-function diaspora_queue_hook(&$a,&$b) {
- $hostname = $a->get_hostname();
- $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
- dbesc(NETWORK_DIASPORA2)
- );
- if(! count($qi))
+function diaspora_jot_nets(App $a, array &$jotnets_fields)
+{
+ if (!local_user()) {
return;
+ }
- 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];
-
- $handle = PConfig::get($userdata['uid'],'diaspora','handle');
- $password = PConfig::get($userdata['uid'],'diaspora','password');
- $aspect = PConfig::get($userdata['uid'],'diaspora','aspect');
-
- $success = false;
-
- if ($handle && $password) {
- logger('diaspora_queue: able to post for user '.$handle);
-
- $z = unserialize($x['content']);
-
- $post = $z['post'];
-
- logger('diaspora_queue: post: '.$post, LOGGER_DATA);
-
- try {
- logger('diaspora_queue: prepare', LOGGER_DEBUG);
- $conn = new Diaspora_Connection($handle, $password);
- logger('diaspora_queue: try to log in '.$handle, LOGGER_DEBUG);
- $conn->logIn();
- logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
- $conn->provider = $hostname;
- $conn->postStatusMessage($post, $aspect);
-
- logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
-
- $success = true;
-
- Queue::removeItem($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');
- Queue::updateTime($x['id']);
- }
+ if (DI::pConfig()->get(local_user(), 'diaspora', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'diaspora_enable',
+ DI::l10n()->t('Post to Diaspora'),
+ DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default')
+ ]
+ ];
}
}
-function diaspora_settings(&$a,&$s) {
-
- if(! local_user())
+function diaspora_settings(App $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 = PConfig::get(local_user(),'diaspora','post');
- $checked = (($enabled) ? ' checked="checked" ' : '');
- $css = (($enabled) ? '' : '-disabled');
-
- $def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
-
- $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
- $handle = PConfig::get(local_user(), 'diaspora', 'handle');
- $password = PConfig::get(local_user(), 'diaspora', 'password');
- $aspect = PConfig::get(local_user(),'diaspora','aspect');
+ $enabled = DI::pConfig()->get(local_user(),'diaspora','post');
+ $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default');
- $status = "";
+ $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle');
+ $password = DI::pConfig()->get(local_user(), 'diaspora', 'password');
+ $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect');
- $r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
- if (DBM::is_result($r)) {
- $status = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
- $status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
- $status .= L10n::t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
+ $info = '';
+ $error = '';
+ if (Session::get('my_address')) {
+ $info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ', Session::get('my_address'));
+ $info .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+ $info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.', Session::get('my_address'));
}
- $aspects = false;
-
+ $aspect_select = '';
if ($handle && $password) {
$conn = new Diaspora_Connection($handle, $password);
$conn->logIn();
- $aspects = $conn->getAspects();
- if (!$aspects) {
- $status = L10n::t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
+ $rawAspects = $conn->getAspects();
+ if ($rawAspects) {
+ $availableAspects = [
+ 'all_aspects' => DI::l10n()->t('All aspects'),
+ 'public' => DI::l10n()->t('Public'),
+ ];
+ foreach ($rawAspects as $rawAspect) {
+ $availableAspects[$rawAspect->id] = $rawAspect->name;
+ }
+
+ $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects];
+ $info = DI::l10n()->t('Connected with your Diaspora account <strong>%s</strong>', $handle);
+ } else {
+ $info = '';
+ $error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
}
}
- /* 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 .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</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 .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
- $s .= '</span>';
+ DI::page()->registerStylesheet('addon/diaspora/diaspora.css');
+
+ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/');
+ $s .= Renderer::replaceMacros($t, [
+ '$header' => DI::l10n()->t('Diaspora Export'),
+ '$info_header' => DI::l10n()->t('Information'),
+ '$error_header' => DI::l10n()->t('Error'),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$info' => $info,
+ '$error' => $error,
+ '$enabled' => $enabled,
+ '$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled],
+ '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'],
+ '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')],
+ '$aspect_select' => $aspect_select,
+ '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled],
+ ]);
+}
- 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">' . L10n::t('Enable Diaspora Post Addon') . '</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">' . L10n::t('Diaspora handle') . '</label>';
- $s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="diaspora-password-wrapper">';
- $s .= '<label id="diaspora-password-label" for="diaspora-password">' . L10n::t('Diaspora password') . '</label>';
- $s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
- $s .= '</div><div class="clear"></div>';
-
- if ($aspects) {
- $single_aspect = new stdClass();
- $single_aspect->id = 'all_aspects';
- $single_aspect->name = L10n::t('All aspects');
- $aspects[] = $single_aspect;
-
- $single_aspect = new stdClass();
- $single_aspect->id = 'public';
- $single_aspect->name = L10n::t('Public');
- $aspects[] = $single_aspect;
-
- $s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
- $s .= '<select name="aspect" id="diaspora-aspect">';
- foreach($aspects as $single_aspect) {
- if ($single_aspect->id == $aspect)
- $s .= "<option value='".$single_aspect->id."' selected>".$single_aspect->name."</option>";
- else
- $s .= "<option value='".$single_aspect->id."'>".$single_aspect->name."</option>";
+function diaspora_settings_post(App $a, &$b)
+{
+ if (!empty($_POST['diaspora-submit'])) {
+ DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['enabled']));
+ if (intval($_POST['enabled'])) {
+ if (isset($_POST['handle'])) {
+ DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle']));
+ DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password']));
+ }
+ if (!empty($_POST['aspect'])) {
+ DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect']));
+ DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['post_by_default']));
+ }
+ } else {
+ DI::pConfig()->delete(local_user(), 'diaspora', 'password');
}
-
- $s .= "</select>";
- $s .= '<div class="clear"></div>';
}
-
- $s .= '<div id="diaspora-bydefault-wrapper">';
- $s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . L10n::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="' . L10n::t('Save Settings') . '" /></div></div>';
-
}
+function diaspora_hook_fork(&$a, &$b)
+{
+ if ($b['name'] != 'notifier_normal') {
+ return;
+ }
-function diaspora_settings_post(&$a,&$b) {
-
- if(x($_POST,'diaspora-submit')) {
+ $post = $b['data'];
- PConfig::set(local_user(),'diaspora','post',intval($_POST['diaspora']));
- PConfig::set(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault']));
- PConfig::set(local_user(),'diaspora','handle',trim($_POST['handle']));
- PConfig::set(local_user(),'diaspora','password',trim($_POST['password']));
- PConfig::set(local_user(),'diaspora','aspect',trim($_POST['aspect']));
+ if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+ !strstr($post['postopts'], 'diaspora') || ($post['parent'] != $post['id'])) {
+ $b['execute'] = false;
+ return;
}
-
}
-function diaspora_post_local(&$a,&$b) {
-
+function diaspora_post_local(App $a, array &$b)
+{
if ($b['edit']) {
return;
}
return;
}
- $diaspora_post = intval(PConfig::get(local_user(),'diaspora','post'));
+ $diaspora_post = intval(DI::pConfig()->get(local_user(),'diaspora','post'));
- $diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
+ $diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
- if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'diaspora','post_by_default'))) {
$diaspora_enable = 1;
}
$b['postopts'] .= 'diaspora';
}
+function diaspora_send(App $a, array &$b)
+{
+ $hostname = DI::baseUrl()->getHostname();
+ Logger::log('diaspora_send: invoked');
-
-function diaspora_send(&$a,&$b) {
- $hostname = $a->get_hostname();
-
- logger('diaspora_send: invoked');
-
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+ if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
}
- if(! strstr($b['postopts'],'diaspora')) {
+ if (!strstr($b['postopts'],'diaspora')) {
return;
}
- if($b['parent'] != $b['id']) {
+ if ($b['parent'] != $b['id']) {
return;
}
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
- $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+ $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+
if ($b['contact-id'] != $self['id']) {
return;
}
- logger('diaspora_send: prepare posting', LOGGER_DEBUG);
+ Logger::log('diaspora_send: prepare posting', Logger::DEBUG);
- $handle = PConfig::get($b['uid'],'diaspora','handle');
- $password = PConfig::get($b['uid'],'diaspora','password');
- $aspect = PConfig::get($b['uid'],'diaspora','aspect');
+ $handle = DI::pConfig()->get($b['uid'],'diaspora','handle');
+ $password = DI::pConfig()->get($b['uid'],'diaspora','password');
+ $aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect');
if ($handle && $password) {
- logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
-
- $tag_arr = [];
- $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);
+ Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
$title = $b['title'];
$body = $b['body'];
// remove multiple newlines
do {
$oldbody = $body;
- $body = str_replace("\n\n\n", "\n\n", $body);
- } while ($oldbody != $body);
+ $body = str_replace("\n\n\n", "\n\n", $body);
+ } while ($oldbody != $body);
// convert to markdown
$body = BBCode::toMarkdown($body);
// Adding the title
- if(strlen($title))
+ if (strlen($title)) {
$body = "## ".html_entity_decode($title)."\n\n".$body;
+ }
- require_once("addon/diaspora/diasphp.php");
+ require_once "addon/diaspora/diasphp.php";
try {
- logger('diaspora_send: prepare', LOGGER_DEBUG);
+ Logger::log('diaspora_send: prepare', Logger::DEBUG);
$conn = new Diaspora_Connection($handle, $password);
- logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
+ Logger::log('diaspora_send: try to log in '.$handle, Logger::DEBUG);
$conn->logIn();
- logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
+ Logger::log('diaspora_send: try to send '.$body, Logger::DEBUG);
$conn->provider = $hostname;
$conn->postStatusMessage($body, $aspect);
- logger('diaspora_send: success');
+ Logger::log('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"];
+ Logger::log("diaspora_send: Error submitting the post: " . $e->getMessage());
- $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]);
+ Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG);
- Queue::add($a->contact, NETWORK_DIASPORA2, $s);
- notice(L10n::t('Diaspora post failed. Queued for retry.').EOL);
+ Worker::defer();
}
}
}
https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff