Revert "changelog"

This reverts commit 3aefe23184c25c1fc0865313d13902cabfb934d3.

6 files changed, 26 insertions, 36 deletions

diff --git a/CHANGELOG b/CHANGELOG
index fe5a3924a..d4c6b3fc0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,3 @@
-Hubzilla 8.8.4 (2023-12-20)
-	- Fix regression introduced in version 8.8.3
-	- Add active addons and blocked sites to siteinfo
-
-
 Hubzilla 8.8.3 (2023-12-17)
 	- Check return from Config::Load() and retry on failure
 	- Libzot::import() do not prozess items where we could not fetch the author
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 8cdf0e511..4b74a7ba9 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -300,7 +300,7 @@ class Notifier {
 				return;
 			}
 
-			if ($target_item['verb'] === 'Announce') {
+			if ($target_item['verb'] === ACTIVITY_SHARE) {
 				// Provide correct representation across the wire. Internally this is treated as a comment.
 				$target_item['parent_mid'] = $target_item['thr_parent'] = $target_item['mid'];
 			}
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 7e38ace34..835909849 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1194,7 +1194,7 @@ class Activity {
 
 		$acts = [
 			'http://activitystrea.ms/schema/1.0/post'           => 'Create',
-		//	'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
+			'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
 			'http://activitystrea.ms/schema/1.0/update'         => 'Update',
 			'http://activitystrea.ms/schema/1.0/like'           => 'Like',
 			'http://activitystrea.ms/schema/1.0/favorite'       => 'Like',
@@ -1208,8 +1208,7 @@ class Activity {
 			'http://purl.org/zot/activity/attendmaybe'          => 'TentativeAccept',
 			'Invite'                                            => 'Invite',
 			'Delete'                                            => 'Delete',
-			'Undo'                                              => 'Undo',
-			'Announce'                                          => 'Announce',
+			'Undo'                                              => 'Undo'
 		];
 
 		call_hooks('activity_mapper', $acts);
@@ -1243,7 +1242,7 @@ class Activity {
 
 		$acts = [
 			'http://activitystrea.ms/schema/1.0/post'           => 'Create',
-		//	'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
+			'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
 			'http://activitystrea.ms/schema/1.0/update'         => 'Update',
 			'http://activitystrea.ms/schema/1.0/like'           => 'Like',
 			'http://activitystrea.ms/schema/1.0/favorite'       => 'Like',
@@ -1257,8 +1256,7 @@ class Activity {
 			'http://purl.org/zot/activity/attendmaybe'          => 'TentativeAccept',
 			'Invite'                                            => 'Invite',
 			'Delete'                                            => 'Delete',
-			'Undo'                                              => 'Undo',
-			'Announce'                                          => 'Announce'
+			'Undo'                                              => 'Undo'
 		];
 
 		call_hooks('activity_decode_mapper', $acts);
@@ -1286,11 +1284,11 @@ class Activity {
 			'http://activitystrea.ms/schema/1.0/profile-photo' => 'Icon',
 			'http://activitystrea.ms/schema/1.0/event'         => 'Event',
 			'http://purl.org/zot/activity/location'            => 'Place',
-		//	'http://purl.org/zot/activity/chessgame'           => 'Game',
-		//	'http://purl.org/zot/activity/tagterm'             => 'zot:Tag',
-		//	'http://purl.org/zot/activity/thing'               => 'Object',
-		//	'http://purl.org/zot/activity/file'                => 'zot:File',
-		//	'http://purl.org/zot/activity/mood'                => 'zot:Mood',
+			'http://purl.org/zot/activity/chessgame'           => 'Game',
+			'http://purl.org/zot/activity/tagterm'             => 'zot:Tag',
+			'http://purl.org/zot/activity/thing'               => 'Object',
+			'http://purl.org/zot/activity/file'                => 'zot:File',
+			'http://purl.org/zot/activity/mood'                => 'zot:Mood',
 			'Invite'                                           => 'Invite',
 			'Question'                                         => 'Question',
 			'Document'                                         => 'Document',
@@ -1323,11 +1321,11 @@ class Activity {
 			'http://activitystrea.ms/schema/1.0/profile-photo' => 'Icon',
 			'http://activitystrea.ms/schema/1.0/event'         => 'Event',
 			'http://purl.org/zot/activity/location'            => 'Place',
-		//	'http://purl.org/zot/activity/chessgame'           => 'Game',
-		//	'http://purl.org/zot/activity/tagterm'             => 'zot:Tag',
-		//	'http://purl.org/zot/activity/thing'               => 'Object',
-		//	'http://purl.org/zot/activity/file'                => 'zot:File',
-		//	'http://purl.org/zot/activity/mood'                => 'zot:Mood',
+			'http://purl.org/zot/activity/chessgame'           => 'Game',
+			'http://purl.org/zot/activity/tagterm'             => 'zot:Tag',
+			'http://purl.org/zot/activity/thing'               => 'Object',
+			'http://purl.org/zot/activity/file'                => 'zot:File',
+			'http://purl.org/zot/activity/mood'                => 'zot:Mood',
 			'Invite'                                           => 'Invite',
 			'Question'                                         => 'Question',
 			'Audio'                                            => 'Audio',
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 927da5434..037ddb19e 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -121,9 +121,7 @@ class ThreadItem {
 			$locktype = 0;
 		}
 
-		$shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (intval($item['item_private']) === 0)) ? true : false);
-		$repeatable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (intval($item['item_private']) === 0) && (in_array($item['author']['xchan_network'], ['zot6', 'activitypub']))) ? true : false);
-
+		$shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && ($item['item_private'] != 1)) ? true : false);
 
 		// allow an exemption for sharing stuff from your private feeds
 		if($item['author']['xchan_network'] === 'rss')
@@ -317,13 +315,13 @@ class ThreadItem {
 		$share = [];
 		$embed = [];
 		if ($shareable) {
-			$embed = [t('Reshare'), t('reshare')];
-		}
-
-		// This actually turns out not to be possible in some protocol stacks without opening up hundreds of new issues.
-		// Will allow it only for uri resolvable sources.
-		if($repeatable) {
-			$share = [t('Repeat'), t('repeat')];
+			// This actually turns out not to be possible in some protocol stacks without opening up hundreds of new issues.
+			// Will allow it only for uri resolvable sources.
+			if(strpos($item['mid'],'http') === 0) {
+				//Not yet ready for primetime
+				//$share = array( t('Repeat This'), t('repeat'));
+			}
+			$embed = [t('Share This'), t('share')];
 		}
 
 		$dreport = '';
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 576a415af..716f7229b 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -68,7 +68,6 @@ class Share extends \Zotlabs\Web\Controller {
 		$owner_uid = $r[0]['uid'];
 		$owner_aid = $r[0]['aid'];
 
-/*
 		$can_comment = false;
 		if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self']))
 			$can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments');
@@ -79,7 +78,6 @@ class Share extends \Zotlabs\Web\Controller {
 			notice( t('Permission denied') . EOL);
 			killme();
 		}
-*/
 
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($item['owner_xchan'])
@@ -115,7 +113,7 @@ class Share extends \Zotlabs\Web\Controller {
 		$arr['owner_xchan']  = $item['author_xchan'];
 		$arr['obj'] = Activity::encode_item($item);
 		$arr['obj_type'] = $item['obj_type'];
-		$arr['verb'] = 'Announce'; //ACTIVITY_SHARE;
+		$arr['verb'] = ACTIVITY_SHARE;
 
 		$post = item_store($arr);
 
diff --git a/include/text.php b/include/text.php
index b9e3835e7..27dd94bc5 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1798,7 +1798,8 @@ function prepare_body(&$item,$attach = false,$opts = false) {
 		}
 	}
 
-	$poll = (($item['obj_type'] === 'Question' && in_array($item['verb'],[ ACTIVITY_POST, ACTIVITY_UPDATE ])) ? format_poll($item, $s, $opts) : false);
+
+	$poll = (($item['obj_type'] === 'Question' && in_array($item['verb'],[ ACTIVITY_POST, ACTIVITY_UPDATE, ACTIVITY_SHARE ])) ? format_poll($item, $s, $opts) : false);
 	if ($poll) {
 		$s = $poll;
 	}