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

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 3513d581..d76ccf86 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -2,109 +2,150 @@
 /**
  * Name: Mail Stream
  * Description: Mail all items coming into your network feed to an email address
- * Version: 1.1
+ * Version: 2.0
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Protocol\Activity;
-use Friendica\Util\Network;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Protocol\Activity;
+use Friendica\Util\DateTimeFormat;
 
-function mailstream_install() {
+/**
+ * Sets up the addon hooks and the database table
+ */
+function mailstream_install()
+{
 	Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
 	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');
 
-	if (Config::get('mailstream', 'dbversion') == '0.1') {
-		q('ALTER TABLE `mailstream_item` DROP INDEX `uid`');
-		q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`');
-		q('ALTER TABLE `mailstream_item` DROP INDEX `plink`');
-		q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL');
-		Config::set('mailstream', 'dbversion', '0.2');
-	}
-	if (Config::get('mailstream', 'dbversion') == '0.2') {
-		q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"');
-		Config::set('mailstream', 'dbversion', '0.3');
-	}
-	if (Config::get('mailstream', 'dbversion') == '0.3') {
-		q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()');
-		q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL');
-		Config::set('mailstream', 'dbversion', '0.4');
-	}
-	if (Config::get('mailstream', 'dbversion') == '0.4') {
-		q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin');
-		Config::set('mailstream', 'dbversion', '0.5');
-	}
-	if (Config::get('mailstream', 'dbversion') == '0.5') {
-		Config::set('mailstream', 'dbversion', '1.0');
-	}
-
-	if (Config::get('retriever', 'dbversion') != '1.0') {
-		$schema = file_get_contents(dirname(__file__).'/database.sql');
-		$arr = explode(';', $schema);
-		foreach ($arr as $a) {
-			$r = q($a);
-		}
-		Config::set('mailstream', 'dbversion', '1.0');
-	}
+	Logger::info("mailstream: installed");
 }
 
-function mailstream_uninstall() {
-	Hook::unregister('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
-	Hook::unregister('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
-	Hook::unregister('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-	Hook::unregister('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Hook::unregister('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
-	Hook::unregister('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
+/**
+ * Enforces that mailstream_install has set up the current version
+ */
+function mailstream_check_version()
+{
+	if (!is_null(DI::config()->get('mailstream', 'dbversion'))) {
+		DI::config()->delete('mailstream', 'dbversion');
+		Logger::info("mailstream_check_version: old version detected, reinstalling");
+		mailstream_install();
+		Hook::loadHooks();
+		Hook::add(
+			'mailstream_convert_table_entries',
+			'addon/mailstream/mailstream.php',
+			'mailstream_convert_table_entries'
+		);
+		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_convert_table_entries');
+	}
 }
 
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function mailstream_module() {}
 
-function mailstream_addon_admin(&$a,&$o) {
-	$frommail = Config::get('mailstream', 'frommail');
+/**
+ * Adds an item in "addon features" in the admin menu of the site
+ *
+ * @param string        $o HTML form data
+ */
+function mailstream_addon_admin(string &$o)
+{
+	$frommail = DI::config()->get('mailstream', 'frommail');
 	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
 	$config = ['frommail',
-			L10n::t('From Address'),
-			$frommail,
-			L10n::t('Email address that stream items will appear to be from.')];
+		DI::l10n()->t('From Address'),
+		$frommail,
+		DI::l10n()->t('Email address that stream items will appear to be from.')];
 	$o .= Renderer::replaceMacros($template, [
-				 '$frommail' => $config,
-				 '$submit' => L10n::t('Save Settings')]);
+		'$frommail' => $config,
+		'$submit' => DI::l10n()->t('Save Settings')
+	]);
 }
 
-function mailstream_addon_admin_post ($a) {
+/**
+ * Process input from the "addon features" part of the admin menu
+ */
+function mailstream_addon_admin_post()
+{
 	if (!empty($_POST['frommail'])) {
-		Config::set('mailstream', 'frommail', $_POST['frommail']);
+		DI::config()->set('mailstream', 'frommail', $_POST['frommail']);
 	}
 }
 
-function mailstream_generate_id($a, $uri) {
-	// http://www.jwz.org/doc/mid.html
-	$host = DI::baseUrl()->getHostname();
+/**
+ * Creates a message ID for a post URI in accordance with RFC 1036
+ * See also http://www.jwz.org/doc/mid.html
+ *
+ * @param string $uri the URI to be converted to a message ID
+ *
+ * @return string the created message ID
+ */
+function mailstream_generate_id(string $uri): string
+{
+	$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_post_hook(&$a, &$item) {
+function mailstream_send_hook(array $data)
+{
+	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
+	$item = Post::selectFirst([], $criteria);
+	if (empty($item)) {
+		Logger::error('mailstream_send_hook could not find item');
+		return;
+	}
+
+	$user = User::getById($item['uid']);
+	if (empty($user)) {
+			Logger::error('mailstream_send_hook could not fund user', ['uid' => $item['uid']]);
+		return;
+	}
+
+	if (!mailstream_send($data['message_id'], $item, $user)) {
+		Logger::debug('mailstream_send_hook send failed, will retry', $data);
+		if (!Worker::defer()) {
+			Logger::error('mailstream_send_hook failed and could not defer', $data);
+		}
+	}
+}
+
+/**
+ * Called when either a local or remote post is created.  If
+ * mailstream is enabled and the necessary data is available, forks a
+ * workerqueue item to send the email.
+ *
+ * @param array     $item content of the item (may or may not already be stored in the item table)
+ * @return void
+ */
+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']) {
@@ -119,8 +160,8 @@ function mailstream_post_hook(&$a, &$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')) {
@@ -130,52 +171,58 @@ function mailstream_post_hook(&$a, &$item) {
 		}
 	}
 
-	$message_id = mailstream_generate_id($a, $item['uri']);
-	q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " .
-		"VALUES (%d, '%s', '%s', '%s')", intval($item['uid']),
-		intval($item['contact-id']), DBA::escape($item['uri']), DBA::escape($message_id));
-	$r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), DBA::escape($item['uri']));
-	if (count($r) != 1) {
-		Logger::info('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item');
-		return;
-	}
-	$ms_item = $r[0];
-	Logger::debug('mailstream_post_remote_hook: created mailstream_item ' . $ms_item['id'] . ' for item ' . $item['uri'] . ' ' . $item['uid'] . ' ' . $item['contact-id']);
-	$user = mailstream_get_user($item['uid']);
-	if (!$user) {
-		Logger::info('mailstream_post_remote_hook: no user ' . $item['uid']);
-		return;
-	}
-	mailstream_send($a, $ms_item['message-id'], $item, $user);
-}
+	$message_id = mailstream_generate_id($item['uri']);
 
-function mailstream_get_user($uid) {
-	$r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid));
-	if (count($r) != 1) {
-		Logger::info('mailstream_post_remote_hook: Unexpected number of users returned');
-		return;
-	}
-	return $r[0];
+	$send_hook_data = [
+		'uid' => $item['uid'],
+		'contact-id' => $item['contact-id'],
+		'uri' => $item['uri'],
+		'message_id' => $message_id,
+		'tries' => 0,
+	];
+	Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 }
 
-function mailstream_do_images($a, &$item, &$attachments) {
+/**
+ * If the user has configured attaching images to emails as
+ * attachments, this function searches the post for such images,
+ * retrieves the image, and inserts the data and metadata into the
+ * supplied array
+ *
+ * @param array         $item        content of the item
+ * @param array         $attachments contains an array element for each attachment to add to the email
+ *
+ * @return array new value of the attachments table (results are also stored in the reference parameter)
+ */
+function mailstream_do_images(array &$item, array &$attachments)
+{
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
 		return;
 	}
+
 	$attachments = [];
+
 	preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
 	preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
 	preg_match_all("/\[img\=([^\]]*)\]([^[]*)\[\/img\]/ism", $item["body"], $matches3);
+
 	foreach (array_merge($matches1[3], $matches2[1], $matches3[1]) as $url) {
 		$components = parse_url($url);
+
 		if (!$components) {
 			continue;
 		}
-		$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-		$curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
+
+		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
+		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),
+			'guid' => hash('crc32', $url),
 			'filename' => basename($components['path']),
 			'type' => $curlResult->getContentType()
 		];
@@ -185,13 +232,21 @@ function mailstream_do_images($a, &$item, &$attachments) {
 			continue;
 		}
 	}
+
 	return $attachments;
 }
 
-function mailstream_sender($item) {
-	$r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
-	if (DBA::isResult($r)) {
-		$contact = $r[0];
+/**
+ * Creates a sender to use in the email, either from the contact or the author of the item, or both
+ *
+ * @param array $item content of the item
+ *
+ * @return string sender suitable for use in the email
+ */
+function mailstream_sender(array $item): string
+{
+	$contact = Contact::getById($item['contact-id']);
+	if (DBA::isResult($contact)) {
 		if ($contact['name'] != $item['author-name']) {
 			return $contact['name'] . ' - ' . $item['author-name'];
 		}
@@ -199,8 +254,17 @@ function mailstream_sender($item) {
 	return $item['author-name'];
 }
 
-function mailstream_decode_subject($subject) {
-	$html = BBCode::convert($subject);
+/**
+ * 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, int $uri_id): string
+{
+	$html = BBCode::convertForUriId($uri_id, $subject);
 	if (!$html) {
 		return $subject;
 	}
@@ -212,7 +276,9 @@ function mailstream_decode_subject($subject) {
 	if (!$noentity) {
 		return $notags;
 	}
-	$nocodes = preg_replace_callback("/(&#[0-9]+;)/", function($m) { return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); }, $noentity);
+	$nocodes = preg_replace_callback("/(&#[0-9]+;)/", function ($m) {
+		return mb_convert_encoding($m[1], 'UTF-8', 'HTML-ENTITIES');
+	}, $noentity);
 	if (!$nocodes) {
 		return $noentity;
 	}
@@ -223,14 +289,22 @@ function mailstream_decode_subject($subject) {
 	return $trimmed;
 }
 
-function mailstream_subject($item) {
+/**
+ * Creates a subject line to use in the email
+ *
+ * @param array $item content of the item
+ *
+ * @return string subject line suitable for use in the email
+ */
+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
 	for ($i = 0; ($i < 100) && $parent; $i++) {
-		$parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
+		$parent_item = Post::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
 		if (!DBA::isResult($parent_item)) {
 			break;
 		}
@@ -238,55 +312,84 @@ function mailstream_subject($item) {
 			break;
 		}
 		if ($parent_item['title']) {
-			return 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'];
 	}
-	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
-		intval($item['contact-id']), intval($item['uid']));
-	$contact = $r[0];
+	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
+	if (!DBA::isResult($contact)) {
+		Logger::error(
+			'mailstream_subject no contact for item',
+			['id' => $item['id'],
+				'plink' => $item['plink'],
+				'contact id' => $item['contact-id'],
+			'uid' => $item['uid']]
+		);
+		return DI::l10n()->t("Friendica post");
+	}
 	if ($contact['network'] === 'dfrn') {
-		return L10n::t("Friendica post");
+		return DI::l10n()->t("Friendica post");
 	}
 	if ($contact['network'] === 'dspr') {
-		return L10n::t("Diaspora post");
+		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;
 		return preg_replace('/\\s+/', ' ', $subject);
 	}
 	if ($contact['network'] === 'feed') {
-		return L10n::t("Feed item");
+		return DI::l10n()->t("Feed item");
 	}
 	if ($contact['network'] === 'mail') {
-		return L10n::t("Email");
+		return DI::l10n()->t("Email");
 	}
-	return L10n::t("Friendica Item");
+	return DI::l10n()->t("Friendica Item");
 }
 
-function mailstream_send(\Friendica\App $a, $message_id, $item, $user) {
+/**
+ * Sends a message using PHPMailer
+ *
+ * @param string $message_id ID of the message (RFC 1036)
+ * @param array  $item       content of the item
+ * @param array  $user       results from the user table
+ *
+ * @return bool True if this message has been completed.  False if it should be retried.
+ */
+function mailstream_send(string $message_id, array $item, array $user): bool
+{
+	if (!is_array($item)) {
+		Logger::error('mailstream_send item is empty', ['message_id' => $message_id]);
+		return false;
+	}
+
 	if (!$item['visible']) {
-		return;
+		Logger::debug('mailstream_send item not yet visible', ['item uri' => $item['uri']]);
+		return false;
 	}
 	if (!$message_id) {
-		return;
+		Logger::error('mailstream_send no message ID supplied', ['item uri' => $item['uri'],
+				'user email' => $user['email']]);
+		return true;
 	}
-	require_once(dirname(__file__).'/phpmailer/class.phpmailer.php');
+
+	require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
+
+	$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
 	$attachments = [];
-	mailstream_do_images($a, $item, $attachments);
-	$frommail = Config::get('mailstream', 'frommail');
-	if ($frommail == "") {
+	mailstream_do_images($item, $attachments);
+	$frommail = DI::config()->get('mailstream', 'frommail');
+	if ($frommail == '') {
 		$frommail = 'friendica@localhost.local';
 	}
 	$address = DI::pConfig()->get($item['uid'], 'mailstream', 'address');
 	if (!$address) {
 		$address = $user['email'];
 	}
-	$mail = new PHPmailer;
+	$mail = new PHPmailer();
 	try {
 		$mail->XMailer = 'Friendica Mailstream Addon';
 		$mail->SetFrom($frommail, mailstream_sender($item));
@@ -294,141 +397,167 @@ function mailstream_send(\Friendica\App $a, $message_id, $item, $user) {
 		$mail->MessageID = $message_id;
 		$mail->Subject = mailstream_subject($item);
 		if ($item['thr-parent'] != $item['uri']) {
-			$mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($a, $item['thr-parent']));
+			$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($image['data'], $image['guid'], $image['filename'], $encoding, $image['type']);
+			$mail->AddStringEmbeddedImage(
+				$image['data'],
+				$image['guid'],
+				$image['filename'],
+				$encoding,
+				$image['type']
+			);
 		}
 		$mail->IsHTML(true);
 		$mail->CharSet = 'utf-8';
 		$template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
 		$mail->AltBody = BBCode::toPlaintext($item['body']);
-		$item['body'] = BBCode::convert($item['body']);
-		$item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid'];
+		$item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
+		$item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
 		$mail->Body = Renderer::replaceMacros($template, [
-						 '$upstream' => L10n::t('Upstream'),
-						 '$local' => L10n::t('Local'),
+						 '$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);
 		}
-		Logger::debug('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject);
+		Logger::debug('mailstream_send sent message', ['message ID' => $mail->MessageID,
+				'subject' => $mail->Subject,
+				'address' => $address]);
 	} catch (phpmailerException $e) {
 		Logger::debug('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage());
 	} catch (Exception $e) {
 		Logger::debug('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage());
 	}
-	// In case of failure, still set the item to completed.  Otherwise
-	// we'll just try to send it over and over again and it'll fail
-	// every time.
-	q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', DBA::escape($message_id));
+
+	return true;
 }
 
 /**
  * Email tends to break if you send excessively long lines.  To make
  * 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
+ * @return string wrapped text
  */
-function mailstream_html_wrap(&$text)
+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;
 }
 
-function mailstream_cron($a, $b) {
-	// Only process items older than an hour in cron.  This is because
-	// we want to give mailstream_post_remote_hook a fair chance to
-	// send the email itself before cron jumps in.  Only if
-	// mailstream_post_remote_hook fails for some reason will this get
-	// used, and in that case it's worth holding off a bit anyway.
-	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
-	Logger::debug('mailstream_cron processing ' . count($ms_item_ids) . ' items');
+/**
+ * Convert v1 mailstream table entries to v2 workerqueue items
+ */
+function mailstream_convert_table_entries()
+{
+	$ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]);
+	Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items');
 	foreach ($ms_item_ids as $ms_item_id) {
+		$send_hook_data = array('uid' => $ms_item_id['uid'],
+					'contact-id' => $ms_item_id['contact-id'],
+					'uri' => $ms_item_id['uri'],
+					'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');
-		}
-		$item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
-		$users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
-		$user = $users[0];
-		if ($user && $item) {
-			mailstream_send($a, $ms_item_id['message-id'], $item, $user);
-		}
-		else {
-			Logger::info('mailstream_cron: Unable to find item ' . $ms_item_id['id']);
-			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['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(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 	}
-	mailstream_tidy();
+	DBA::e('DROP TABLE `mailstream_item`');
 }
 
-function mailstream_addon_settings(&$a,&$s) {
-	$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');
-	$template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
-	$s .= Renderer::replaceMacros($template, [
-				 '$enabled' => [
-					'mailstream_enabled',
-					L10n::t('Enabled'),
-					$enabled],
-				 '$address' => [
-					'mailstream_address',
-					L10n::t('Email Address'),
-					$address,
-					L10n::t("Leave blank to use your account email address")],
-				 '$nolikes' => [
-					'mailstream_nolikes',
-					L10n::t('Exclude Likes'),
-					$nolikes,
-					L10n::t("Check this to omit mailing \"Like\" notifications")],
-				 '$attachimg' => [
-					'mailstream_attachimg',
-					L10n::t('Attach Images'),
-					$attachimg,
-					L10n::t("Download images in posts and attach them to the email.  Useful for reading email while offline.")],
-				 '$title' => L10n::t('Mail Stream Settings'),
-				 '$submit' => L10n::t('Save Settings')]);
+/**
+ * Form for configuring mailstream features for a user
+ *
+ * @param array $data Hook data array
+ * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
+ */
+function mailstream_addon_settings(array &$data)
+{
+	$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, [
+		'$enabled'   => [
+			'mailstream_enabled',
+			DI::l10n()->t('Enabled'),
+			$enabled
+		],
+		'$address'   => [
+			'mailstream_address',
+			DI::l10n()->t('Email Address'),
+			$address,
+			DI::l10n()->t('Leave blank to use your account email address')
+		],
+		'$nolikes'   => [
+			'mailstream_nolikes',
+			DI::l10n()->t('Exclude Likes'),
+			$nolikes,
+			DI::l10n()->t('Check this to omit mailing "Like" notifications')
+		],
+		'$attachimg' => [
+			'mailstream_attachimg',
+			DI::l10n()->t('Attach Images'),
+			$attachimg,
+			DI::l10n()->t('Download images in posts and attach them to the email.  ' .
+				'Useful for reading email while offline.')
+		],
+	]);
+
+	$data = [
+		'addon' => 'mailstream',
+		'title' => DI::l10n()->t('Mail Stream Settings'),
+		'html'  => $html,
+	];
 }
 
-function mailstream_addon_settings_post($a,$post) {
-	if ($_POST['mailstream_address'] != "") {
-		DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
-	}
-	else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'address');
-	}
-	if ($_POST['mailstream_nolikes']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
-	}
-	else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes');
-	}
-	if ($_POST['mailstream_enabled']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
-	}
-	else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'enabled');
-	}
-	if ($_POST['mailstream_attachimg']) {
-		DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
-	}
-	else {
-		DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg');
+/**
+ * Process data submitted to user's mailstream features form
+ * @param array          $post POST data
+ * @return void
+ */
+function mailstream_addon_settings_post(array $post)
+{
+	if (!DI::userSession()->getLocalUserId() || empty($post['mailstream-submit'])) {
+		return;
 	}
-}
 
-function mailstream_tidy() {
-	$r = q("SELECT id FROM mailstream_item WHERE completed IS NOT NULL AND completed < DATE_SUB(NOW(), INTERVAL 1 YEAR)");
-	foreach ($r as $rr) {
-		q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id']));
+	if ($post['mailstream_address'] != "") {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'address', $post['mailstream_address']);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
+	}
+	if ($post['mailstream_nolikes']) {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes', $post['mailstream_enabled']);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes');
+	}
+	if ($post['mailstream_enabled']) {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled', $post['mailstream_enabled']);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
+	}
+	if ($post['mailstream_attachimg']) {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg', $post['mailstream_attachimg']);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg');
 	}
-	Logger::debug('mailstream_tidy: deleted ' . count($r) . ' old items');
 }