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('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
- 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('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
- 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 .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
- . L10n::t('Post to Diaspora') . '</div>';
- }
-}
-
-function diaspora_queue_hook(App $a, &$b) {
- $hostname = $a->getHostName();
-
- $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
- DBA::escape(Protocol::DIASPORA2)
- );
-
- if (!DBA::isResult($qi)) {
- return;
- }
-
- foreach ($qi as $x) {
- if ($x['network'] !== Protocol::DIASPORA2) {
- continue;
- }
-
- Logger::log('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::log('diaspora_queue: able to post for user '.$handle);
-
- $z = unserialize($x['content']);
-
- $post = $z['post'];
-
- Logger::log('diaspora_queue: post: '.$post, Logger::DATA);
-
- try {
- Logger::log('diaspora_queue: prepare', Logger::DEBUG);
- $conn = new Diaspora_Connection($handle, $password);
- Logger::log('diaspora_queue: try to log in '.$handle, Logger::DEBUG);
- $conn->logIn();
- Logger::log('diaspora_queue: try to send '.$body, Logger::DEBUG);
- $conn->provider = $hostname;
- $conn->postStatusMessage($post, $aspect);
-
- Logger::log('diaspora_queue: send '.$userdata['uid'].' success', Logger::DEBUG);
-
- $success = true;
-
- Queue::removeItem($x['id']);
- } catch (Exception $e) {
- Logger::log("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), Logger::DEBUG);
- }
- } else {
- Logger::log('diaspora_queue: send '.$userdata['uid'].' missing username or password', Logger::DEBUG);
- }
-
- if (!$success) {
- Logger::log('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')
+ ]
+ ];
}
}
Logger::log('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(['url' => $url, 'item' => $b['id'], 'post' => $body]);
-
- Queue::add($a->contact, Protocol::DIASPORA2, $s);
- notice(L10n::t('Diaspora post failed. Queued for retry.').EOL);
+ Worker::defer();
}
}
}
projects / friendica-addons.git / blobdiff