Adhere feedback

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

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index a8306cef3e80529db937e1d328859ad3fb0ab6f2..d76ccf86e61cdc8428c52f3fb7beb810a48247f3 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -66,10 +66,9 @@ function mailstream_module() {}
 /**
  * Adds an item in "addon features" in the admin menu of the site
  *
- * @param App $a App object (unused)
  * @param string        $o HTML form data
  */
-function mailstream_addon_admin(App $a, string &$o)
+function mailstream_addon_admin(string &$o)
 {
        $frommail = DI::config()->get('mailstream', 'frommail');
        $template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
@@ -103,14 +102,14 @@ function mailstream_addon_admin_post()
  */
 function mailstream_generate_id(string $uri): string
 {
-       $host = DI::baseUrl()->getHostname();
+       $host = DI::baseUrl()->getHost();
        $resource = hash('md5', $uri);
        $message_id = "<" . $resource . "@" . $host . ">";
        Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri);
        return $message_id;
 }
 
-function mailstream_send_hook(App $a, array $data)
+function mailstream_send_hook(array $data)
 {
        $criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
        $item = Post::selectFirst([], $criteria);
@@ -138,11 +137,10 @@ function mailstream_send_hook(App $a, array $data)
  * mailstream is enabled and the necessary data is available, forks a
  * workerqueue item to send the email.
  *
- * @param App $a    App object (unused)
  * @param array     $item content of the item (may or may not already be stored in the item table)
  * @return void
  */
-function mailstream_post_hook(App $a, array &$item)
+function mailstream_post_hook(array &$item)
 {
        mailstream_check_version();
 
@@ -216,7 +214,12 @@ function mailstream_do_images(array &$item, array &$attachments)
                }
 
                $cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
-               $curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+               try {
+                       $curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+               } catch (InvalidArgumentException $e) {
+                       Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+                       continue;
+               }
                $attachments[$url] = [
                        'data' => $curlResult->getBody(),
                        'guid' => hash('crc32', $url),
@@ -255,12 +258,13 @@ function mailstream_sender(array $item): string
  * Converts a bbcode-encoded subject line into a plaintext version suitable for the subject line of an email
  *
  * @param string $subject bbcode-encoded subject line
+ * @param int    $uri_id
  *
  * @return string plaintext subject line
  */
-function mailstream_decode_subject(string $subject): string
+function mailstream_decode_subject(string $subject, int $uri_id): string
 {
-       $html = BBCode::convert($subject);
+       $html = BBCode::convertForUriId($uri_id, $subject);
        if (!$html) {
                return $subject;
        }
@@ -295,7 +299,7 @@ function mailstream_decode_subject(string $subject): string
 function mailstream_subject(array $item): string
 {
        if ($item['title']) {
-               return mailstream_decode_subject($item['title']);
+               return mailstream_decode_subject($item['title'], $item['uri-id']);
        }
        $parent = $item['thr-parent'];
        // Don't look more than 100 levels deep for a subject, in case of loops
@@ -308,7 +312,7 @@ function mailstream_subject(array $item): string
                        break;
                }
                if ($parent_item['title']) {
-                       return DI::l10n()->t('Re:') . ' ' . mailstream_decode_subject($parent_item['title']);
+                       return DI::l10n()->t('Re:') . ' ' . mailstream_decode_subject($parent_item['title'], $item['uri-id']);
                }
                $parent = $parent_item['thr-parent'];
        }
@@ -330,7 +334,7 @@ function mailstream_subject(array $item): string
                return DI::l10n()->t("Diaspora post");
        }
        if ($contact['network'] === 'face') {
-               $text = mailstream_decode_subject($item['body']);
+               $text = mailstream_decode_subject($item['body'], $item['uri-id']);
                // For some reason these do show up in Facebook
                $text = preg_replace('/\xA0$/', '', $text);
                $subject = (strlen($text) > 150) ? (substr($text, 0, 140) . '...') : $text;
@@ -414,7 +418,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
                $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
                $mail->AltBody = BBCode::toPlaintext($item['body']);
                $item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
-               $item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid'];
+               $item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
                $mail->Body = Renderer::replaceMacros($template, [
                                                 '$upstream' => DI::l10n()->t('Upstream'),
                                                 '$uri' => DI::l10n()->t('URI'),
@@ -480,11 +484,10 @@ function mailstream_convert_table_entries()
 /**
  * Form for configuring mailstream features for a user
  *
- * @param App   $a    App object
  * @param array $data Hook data array
  * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
  */
-function mailstream_addon_settings(App &$a, array &$data)
+function mailstream_addon_settings(array &$data)
 {
        $enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
        $address   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
@@ -528,11 +531,10 @@ function mailstream_addon_settings(App &$a, array &$data)
 
 /**
  * Process data submitted to user's mailstream features form
- * @param App $a
  * @param array          $post POST data
  * @return void
  */
-function mailstream_addon_settings_post(App $a, array $post)
+function mailstream_addon_settings_post(array $post)
 {
        if (!DI::userSession()->getLocalUserId() || empty($post['mailstream-submit'])) {
                return;