X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=discourse%2Fdiscourse.php;h=3d27c5b0b09afc4a45fdf5787622d232c6748fb6;hb=96c70489f59c8c9ba6914873a8a2a70c41ca8fa9;hp=262ee554e0c968bb0b089acbef31f2cdb838e630;hpb=75a7d6f1c7ef03851a3e4baa1dcac3399b433605;p=friendica-addons.git

diff --git a/discourse/discourse.php b/discourse/discourse.php
index 262ee554..3d27c5b0 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -7,20 +7,18 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  *
  */
+
 use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
-use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Util\XML;
-use Friendica\Content\Text\Markdown;
-use Friendica\Util\Network;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
-Use Friendica\Util\DateTimeFormat;
 
 /* Todo:
  * - Obtaining API tokens to be able to read non public posts as well
@@ -38,38 +36,44 @@ function discourse_install()
 	Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post');
 }
 
-function discourse_settings(App $a, &$s)
+function discourse_settings(array &$data)
 {
-	if (!local_user()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	$enabled = intval(PConfig::get(local_user(), 'discourse', 'enabled'));
+	$enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'discourse', 'enabled'));
 
-	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/');
-	$s .= Renderer::replaceMacros($t, [
-		'$title'   => L10n::t('Discourse'),
-		'$enabled' => ['enabled', L10n::t('Enable processing of Discourse mailing list mails'), $enabled, L10n::t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')],
-		'$submit'  => L10n::t('Save Settings'),
+	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/discourse/');
+	$html = Renderer::replaceMacros($t, [
+		'$enabled' => ['enabled', DI::l10n()->t('Enable processing of Discourse mailing list mails'), $enabled, DI::l10n()->t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')],
 	]);
+
+	$data = [
+		'connector' => 'discourse',
+		'title'     => DI::l10n()->t('Discourse'),
+		'image'     => 'images/discourse.png',
+		'enabled'   => $enabled,
+		'html'      => $html,
+	];
 }
 
-function discourse_settings_post(App $a)
+function discourse_settings_post()
 {
-	if (!local_user() || empty($_POST['discourse-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['discourse-submit'])) {
                 return;
         }
 
-	PConfig::set(local_user(), 'discourse', 'enabled', intval($_POST['enabled']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'discourse', 'enabled', intval($_POST['enabled']));
 }
 
-function discourse_email_getmessage(App $a, &$message)
+function discourse_email_getmessage(&$message)
 {
 	if (empty($message['item']['uid'])) {
 		return;
 	}
 
-	if (!PConfig::get($message['item']['uid'], 'discourse', 'enabled')) {
+	if (!DI::pConfig()->get($message['item']['uid'], 'discourse', 'enabled')) {
 		return;
 	}
 
@@ -108,7 +112,7 @@ function discourse_email_getmessage(App $a, &$message)
 	}
 
 	// Remove the title on comments, they don't serve any purpose there
-	if ($message['item']['parent-uri'] != $message['item']['uri']) {
+	if ($message['item']['thr-parent'] != $message['item']['uri']) {
 		unset($message['item']['title']);
 	}
 }
@@ -116,7 +120,7 @@ function discourse_email_getmessage(App $a, &$message)
 function discourse_fetch_post($host, $topic, $pid)
 {
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
-	$curlResult = Network::curl($url);
+	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
 		Logger::info('No success', ['url' => $url]);
 		return false;
@@ -153,7 +157,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 {
 	$hostaddr = 'https://' . $host;
 	$url = $hostaddr . '/posts/' . $post . '.json';
-	$curlResult = Network::curl($url);
+	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
 		return false;
 	}
@@ -200,12 +204,12 @@ function discourse_get_user($post, $hostaddr)
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
 	Logger::info('Contact', $contact);
-	$contact['id'] = Contact::getIdForURL($contact['url'], 0, true, $contact);
+	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
 		unset($contact['photo']);
 		DBA::update('contact', $contact, ['id' => $contact['id']]);
-		Contact::updateAvatar($avatar, 0, $contact['id']);
+		Contact::updateAvatar($contact['id'], $avatar);
 		$contact['photo'] = $avatar;
 	}
 
@@ -270,7 +274,7 @@ function discourse_get_html($message)
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
 		Logger::info('Found profile', $profile);
-		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, true, $profile);
+		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
 		$message['item']['author-link'] = $profile['url'];
 		$message['item']['author-name'] = $profile['name'];
 		$message['item']['author-avatar'] = $profile['photo'];