[twitter] Fix contact image handling in twitter_fetch_contact

[friendica-addons.git/.git] / discourse / discourse.php

diff --git a/discourse/discourse.php b/discourse/discourse.php
index 15081cd..f684425 100644 (file)
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -7,18 +7,14 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  *
  */
-//use DOMDocument;
-//use DOMXPath;
 use Friendica\App;
 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\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\Strings;
@@ -40,39 +36,20 @@ function discourse_install()
        Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post');
 }
 
-function discourse_uninstall()
-{
-       Hook::unregister('email_getmessage',        __FILE__, 'discourse_email_getmessage');
-       Hook::unregister('connector_settings',      __FILE__, 'discourse_settings');
-       Hook::unregister('connector_settings_post', __FILE__, 'discourse_settings_post');
-}
-
 function discourse_settings(App $a, &$s)
 {
        if (!local_user()) {
                return;
        }
 
-       $enabled = intval(PConfig::get(local_user(), 'discourse', 'enabled'));
-       $css = ($enabled ? '' : '-disabled');
-
-       $s .= '<span id="settings_discourse_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_discourse_expanded\'); openClose(\'settings_discourse_inflated\');">';
-       $s .= '<img class="connector' . $css . '" src="images/discourse.png" /><h3 class="connector">' . L10n::t('Discourse') . '</h3>';
-       $s .= '</span>';
-       $s .= '<div id="settings_discourse_expanded" class="settings-block" style="display: none;">';
-       $s .= '<span class="fakelink" onclick="openClose(\'settings_discourse_expanded\'); openClose(\'settings_discourse_inflated\');">';
-       $s .= '<img class="connector' . $css . '" src="images/discourse.png" /><h3 class="connector">' . L10n::t('Discourse') . '</h3>';
-       $s .= '</span>';
+       $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled'));
 
-       $field_checkbox = Renderer::getMarkupTemplate('field_checkbox.tpl');
-
-       $s .= Renderer::replaceMacros($field_checkbox, [
-               '$field' => ['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.')]
+       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/');
+       $s .= Renderer::replaceMacros($t, [
+               '$title'   => DI::l10n()->t('Discourse'),
+               '$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.')],
+               '$submit'  => DI::l10n()->t('Save Settings'),
        ]);
-
-       $s .= '<div class="clear"></div>';
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="discourse-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
-       $s .= '</div>';
 }
 
 function discourse_settings_post(App $a)
@@ -81,7 +58,7 @@ function discourse_settings_post(App $a)
                 return;
         }
 
-       PConfig::set(local_user(), 'discourse', 'enabled', intval($_POST['enabled']));
+       DI::pConfig()->set(local_user(), 'discourse', 'enabled', intval($_POST['enabled']));
 }
 
 function discourse_email_getmessage(App $a, &$message)
@@ -90,7 +67,7 @@ function discourse_email_getmessage(App $a, &$message)
                return;
        }
 
-       if (!PConfig::get($message['item']['uid'], 'discourse', 'enabled')) {
+       if (!DI::pConfig()->get($message['item']['uid'], 'discourse', 'enabled')) {
                return;
        }
 
@@ -249,6 +226,12 @@ function discourse_process_post($message, $post, $hostaddr)
 
        if ($post['post_number'] == 1) {
                $message['item']['parent-uri'] = $message['item']['uri'] = 'topic/' . $post['topic_id'] . '@' . $host;
+
+               // Remove the Discourse forum name from the subject
+               $pattern = '=\[.*\].*\s(\[.*\].*)=';
+               if (preg_match($pattern, $message['item']['title'])) {
+                       $message['item']['title'] = preg_replace($pattern, '$1', $message['item']['title']);
+               }
                /// @ToDo Fetch thread information
        } else {
                $message['item']['uri'] = 'topic/' . $post['topic_id'] . '/' . $post['id'] . '@' . $host;