X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailstream%2Fmailstream.php;h=d76ccf86e61cdc8428c52f3fb7beb810a48247f3;hb=d9c54193518678408093f21101b1bcc1c5796d57;hp=8c6e2693b7487a5e1fd0a3d07103dcd8045be035;hpb=fe4982d51b4c8ca0e0e44058e096549e555afee2;p=friendica-addons.git

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 8c6e2693..d76ccf86 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -32,7 +32,6 @@ function mailstream_install()
 	Hook::register('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
 	Hook::register('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Hook::register('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
 	Logger::info("mailstream: installed");
@@ -53,7 +52,7 @@ function mailstream_check_version()
 			'addon/mailstream/mailstream.php',
 			'mailstream_convert_table_entries'
 		);
-		Hook::fork(PRIORITY_LOW, 'mailstream_convert_table_entries');
+		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_convert_table_entries');
 	}
 }
 
@@ -67,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/');
@@ -104,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);
@@ -139,16 +137,15 @@ 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();
 
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled for item ' . $item['id']);
+		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
 	if (!$item['uid']) {
@@ -163,8 +160,8 @@ function mailstream_post_hook(App $a, array &$item)
 		Logger::debug('mailstream: no uri for item ' . $item['id']);
 		return;
 	}
-	if (!$item['plink']) {
-		Logger::debug('mailstream: no plink for item ' . $item['id']);
+	if ($item['verb'] == Activity::ANNOUNCE) {
+		Logger::debug('mailstream: announce item ', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
@@ -183,7 +180,7 @@ function mailstream_post_hook(App $a, array &$item)
 		'message_id' => $message_id,
 		'tries' => 0,
 	];
-	Hook::fork(PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
+	Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 }
 
 /**
@@ -197,7 +194,7 @@ function mailstream_post_hook(App $a, array &$item)
  *
  * @return array new value of the attachments table (results are also stored in the reference parameter)
  */
-function mailstream_do_images(arrat &$item, array &$attachments)
+function mailstream_do_images(array &$item, array &$attachments)
 {
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
 		return;
@@ -217,7 +214,12 @@ function mailstream_do_images(arrat &$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),
@@ -256,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;
 	}
@@ -296,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
@@ -309,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'];
 	}
@@ -331,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;
@@ -374,6 +377,8 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 
 	require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
 
+	$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+
 	$attachments = [];
 	mailstream_do_images($item, $attachments);
 	$frommail = DI::config()->get('mailstream', 'frommail');
@@ -395,7 +400,9 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 			$mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($item['thr-parent']));
 		}
 		$mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']);
-		$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
+		if ($item['plink']) {
+			$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
+		}
 		$encoding = 'base64';
 		foreach ($attachments as $url => $image) {
 			$mail->AddStringEmbeddedImage(
@@ -411,12 +418,13 @@ 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'),
 						 '$local' => DI::l10n()->t('Local'),
 						 '$item' => $item]);
-		mailstream_html_wrap($mail->Body);
+		$mail->Body = mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
@@ -437,15 +445,17 @@ function mailstream_send(string $message_id, array $item, array $user): bool
  * bbcode's output suitable for transmission, we try to break things
  * up so that lines are about 200 characters.
  *
- * @param string $text text to word wrap - modified in-place
+ * @param string $text text to word wrap
+ * @return string wrapped text
  */
-function mailstream_html_wrap(string &$text): string
+function mailstream_html_wrap(string &$text)
 {
 	$lines = str_split($text, 200);
 	for ($i = 0; $i < count($lines); $i++) {
 		$lines[$i] = preg_replace('/ /', "\n", $lines[$i], 1);
 	}
 	$text = implode($lines);
+	return $text;
 }
 
 /**
@@ -462,12 +472,11 @@ function mailstream_convert_table_entries()
 					'message_id' => $ms_item_id['message-id'],
 					'tries' => 0);
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('mailstream_cron: Item ' .
-							$ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id');
+			Logger::info('mailstream_convert_table_entries: item has no message-id.', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
 							continue;
 		}
 		Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data);
-		Hook::fork(PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
+		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 	}
 	DBA::e('DROP TABLE `mailstream_item`');
 }
@@ -475,16 +484,15 @@ 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(local_user(), 'mailstream', 'enabled');
-	$address   = DI::pConfig()->get(local_user(), 'mailstream', 'address');
-	$nolikes   = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes');
-	$attachimg = DI::pConfig()->get(local_user(), 'mailstream', 'attachimg');
+	$enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
+	$address   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
+	$nolikes   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes');
+	$attachimg = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg');
 
 	$template  = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
 	$html      = Renderer::replaceMacros($template, [
@@ -523,34 +531,33 @@ 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 (!local_user() || empty($post['mailstream-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($post['mailstream-submit'])) {
 		return;
 	}
 
 	if ($post['mailstream_address'] != "") {
-		DI::pConfig()->set(local_user(), 'mailstream', 'address', $post['mailstream_address']);
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'address', $post['mailstream_address']);
 	} else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'address');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
 	}
 	if ($post['mailstream_nolikes']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $post['mailstream_enabled']);
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes', $post['mailstream_enabled']);
 	} else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes');
 	}
 	if ($post['mailstream_enabled']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $post['mailstream_enabled']);
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled', $post['mailstream_enabled']);
 	} else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'enabled');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
 	}
 	if ($post['mailstream_attachimg']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $post['mailstream_attachimg']);
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg', $post['mailstream_attachimg']);
 	} else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg');
 	}
 }