X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=96314d883c5ce5d7c3ec5cd3bb055d9b02070c60;hb=1357817fc38de7be7dc8ebffc1fa0961796fd32d;hp=037933100d1c198ae5e6136f522ff2ee2e45ac3b;hpb=807a9bf383fc05dba070519fc630c91a32d1a87d;p=friendica-addons.git

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 03793310..96314d88 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -11,121 +11,47 @@ 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\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
-use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\Model\Queue;
+use Friendica\Core\Worker;
+use Friendica\DI;
 
 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 .= '<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 (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')
+			]
+		];
 	}
 }
 
@@ -137,30 +63,30 @@ function diaspora_settings(App $a, &$s)
 
 	/* 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->getBaseURL() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variables */
 
-	$enabled = PConfig::get(local_user(),'diaspora','post');
+	$enabled = DI::pConfig()->get(local_user(),'diaspora','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
+	$def_enabled = DI::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');
+	$handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle');
+	$password = DI::pConfig()->get(local_user(), 'diaspora', 'password');
+	$aspect = DI::pConfig()->get(local_user(),'diaspora','aspect');
 
 	$status = "";
 
 	$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
 
 	if (DBA::isResult($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']);
+		$status = DI::l10n()->t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
+		$status .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+		$status .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
 	}
 
 	$aspects = false;
@@ -171,18 +97,18 @@ function diaspora_settings(App $a, &$s)
 		$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.");
+			$status = 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 .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::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 .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::l10n()->t('Diaspora Export').'</h3>';
 	$s .= '</span>';
 
 	if ($status) {
@@ -192,32 +118,32 @@ function diaspora_settings(App $a, &$s)
 	}
 
 	$s .= '<div id="diaspora-enable-wrapper">';
-	$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . L10n::t('Enable Diaspora Post Addon') . '</label>';
+	$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . DI::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 .= '<label id="diaspora-username-label" for="diaspora-username">' . DI::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 .= '<label id="diaspora-password-label" for="diaspora-password">' . DI::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');
+		$single_aspect->name = DI::l10n()->t('All aspects');
 		$aspects[] = $single_aspect;
 
 		$single_aspect =  new stdClass();
 		$single_aspect->id = 'public';
-		$single_aspect->name = L10n::t('Public');
+		$single_aspect->name = DI::l10n()->t('Public');
 		$aspects[] = $single_aspect;
 
-		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
+		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . DI::l10n()->t('Post to aspect:') . '</label>';
 		$s .= '<select name="aspect" id="diaspora-aspect">';
 		foreach($aspects as $single_aspect) {
 			if ($single_aspect->id == $aspect)
@@ -231,13 +157,13 @@ function diaspora_settings(App $a, &$s)
 	}
 
 	$s .= '<div id="diaspora-bydefault-wrapper">';
-	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . L10n::t('Post to Diaspora by default') . '</label>';
+	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . DI::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>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -245,11 +171,26 @@ function diaspora_settings(App $a, &$s)
 function diaspora_settings_post(App $a, &$b)
 {
 	if (!empty($_POST['diaspora-submit'])) {
-		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']));
+		DI::pConfig()->set(local_user(),'diaspora', 'post'           , intval($_POST['diaspora']));
+		DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault']));
+		DI::pConfig()->set(local_user(),'diaspora', 'handle'         , trim($_POST['handle']));
+		DI::pConfig()->set(local_user(),'diaspora', 'password'       , trim($_POST['password']));
+		DI::pConfig()->set(local_user(),'diaspora', 'aspect'         , trim($_POST['aspect']));
+	}
+}
+
+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;
 	}
 }
 
@@ -267,11 +208,11 @@ function diaspora_post_local(App $a, array &$b)
 		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;
 	}
 
@@ -288,7 +229,7 @@ function diaspora_post_local(App $a, array &$b)
 
 function diaspora_send(App $a, array &$b)
 {
-	$hostname = $a->getHostName();
+	$hostname = DI::baseUrl()->getHostname();
 
 	Logger::log('diaspora_send: invoked');
 
@@ -314,9 +255,9 @@ function diaspora_send(App $a, array &$b)
 
 	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::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
@@ -379,14 +320,7 @@ function diaspora_send(App $a, array &$b)
 
 			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();
 		}
 	}
 }