From 4352a358a7d345a8c78b85c7f94fcbc1d9fd9128 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 8 Jan 2023 12:51:49 +0100
Subject: [PATCH 1/2] mailstream includes post media in message body

---
 mailstream/mailstream.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 35c6aab0..68ec78b9 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -374,6 +374,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');
-- 
2.43.0


From d06ced7272d17a5ae766c3f6afedd0ad4ec65e69 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 8 Jan 2023 19:11:35 +0000
Subject: [PATCH 2/2] Blockem: set to unsupported

---
 blockem/blockem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockem/blockem.php b/blockem/blockem.php
index dfd802dd..39272747 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -5,6 +5,7 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Author: Roland Haeder <https://f.haeder.net/roland>
+ * Status: unsupported
  */
 
 use Friendica\App;
-- 
2.43.0