X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=0d847b1447a6a53e3516d67ad191d1a297e515ba;hb=261efba5102ab1d3abdf070c4e4a0846e691f787;hp=18df37bba6c6641144dcaed2e54d5cd410c221a0;hpb=280e835481506a47bf50f3c153ca70e8d2f3ad24;p=friendica-addons.git
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 18df37bb..0d847b14 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -11,119 +11,49 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Database\DBA;
-use Friendica\Model\Queue;
+use Friendica\Core\Worker;
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');
+ 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');
+ Hook::unregister('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
+ Hook::unregister('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
+ Hook::unregister('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
+ Hook::unregister('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
+ Hook::unregister('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
+ Hook::unregister('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
}
-function diaspora_jot_nets(App $a, &$b)
+function diaspora_jot_nets(App $a, array &$jotnets_fields)
{
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 .= ' '
- . L10n::t('Post to Diaspora') . '
';
- }
-}
-
-function diaspora_queue_hook(App $a, &$b) {
- $hostname = $a->get_hostname();
-
- $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
- DBA::escape(NETWORK_DIASPORA2)
- );
-
- if (!DBA:isResult($qi)) {
- 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 (!DBA:isResult($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 (PConfig::get(local_user(), 'diaspora', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'diaspora_enable',
+ L10n::t('Post to Diaspora'),
+ PConfig::get(local_user(), 'diaspora', 'post_by_default')
+ ]
+ ];
}
}
@@ -135,7 +65,7 @@ function diaspora_settings(App $a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
@@ -251,6 +181,21 @@ function diaspora_settings_post(App $a, &$b)
}
}
+function diaspora_hook_fork(&$a, &$b)
+{
+ if ($b['name'] != 'notifier_normal') {
+ return;
+ }
+
+ $post = $b['data'];
+
+ 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(App $a, array &$b)
{
if ($b['edit']) {
@@ -267,7 +212,7 @@ function diaspora_post_local(App $a, array &$b)
$diaspora_post = intval(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'))) {
$diaspora_enable = 1;
@@ -286,9 +231,9 @@ function diaspora_post_local(App $a, array &$b)
function diaspora_send(App $a, array &$b)
{
- $hostname = $a->get_hostname();
+ $hostname = $a->getHostName();
- logger('diaspora_send: invoked');
+ Logger::log('diaspora_send: invoked');
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
@@ -310,14 +255,14 @@ function diaspora_send(App $a, array &$b)
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');
if ($handle && $password) {
- logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
+ Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
$tag_arr = [];
$tags = '';
@@ -362,29 +307,22 @@ function diaspora_send(App $a, array &$b)
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();
}
}
}