Merge branch 'dev'

3 files changed, 7 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 33c8c273a..931aa3872 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Hubzilla 6.4.2 (2021-12-14)
+	- Fix issue in mod sse_bs where returning message id's were assumed to be base64 encoded
+	- Fix announce activity type not registered as response activity
+
+
 Hubzilla 6.4.1 (2021-12-03)
 	- Fix hubloc_site_id in fix_system_urls() on detected site rename events
 	- Fix duplicate deliveries if duplicate hublocs available
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index fa38c569e..09e1679ac 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -285,7 +285,7 @@ class ActivityStreams {
 		if (!$s) {
 			return false;
 		}
-		return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
+		return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
 	}
 
 	/**
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index eaaeae7b7..3a13b0a6f 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -124,7 +124,7 @@ class Sse_bs extends Controller {
 		$str = '';
 
 		foreach($arr as $a) {
-			$mids[] = '\'' . dbesc(@base64url_decode(substr($a,4))) . '\'';
+			$mids[] = '\'' . dbesc(unpack_link_id($a)) . '\'';
 		}
 
 		$str = implode(',', $mids);