version 9.4.3

(cherry picked from commit a5c1b669b4)

Co-authored-by: Mario Vavti <mario@mariovavti.com>

CHANGELOG

@@ -1,3 +1,9 @@
+Hubzilla 9.4.3 (2024-10-10)
+	- Discard Add/Remove activities (Hubzilla 10 and (streams) compatibility)
+	- Fix HQ channel activities icons
+	- Fix saved search icons
+
+
 Hubzilla 9.4.2 (2024-10-04)
 	- Indicate reacted state via icon color (community wish)
 	- Fix modal backdrop not removed when reacting from the modal

Zotlabs/Lib/Activity.php

@@ -3054,13 +3054,6 @@ class Activity {
 			}
 
 			$a = new ActivityStreams($n);
-			if ($a->type === 'Announce' && is_array($a->obj)
-				&& array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj)) {
-				// This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-				// Reparse the encapsulated Activity and use that instead
-				logger('relayed activity', LOGGER_DEBUG);
-				$a = new ActivityStreams($a->obj);
-			}
 
 			logger($a->debug(), LOGGER_DATA);
 
@@ -3069,6 +3062,24 @@ class Activity {
 				break;
 			}
 
+			if (in_array($a->type, ['Add', 'Remove'])
+				&& is_array($a->obj)
+				&& array_key_exists('object', $a->obj)
+				&& array_key_exists('actor', $a->obj)
+				&& !empty($a->tgt)) {
+
+				logger('unsupported collection operation', LOGGER_DEBUG);
+				return;
+			}
+
+			if ($a->type === 'Announce' && is_array($a->obj)
+				&& array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj)) {
+				// This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
+				// Reparse the encapsulated Activity and use that instead
+				logger('relayed activity', LOGGER_DEBUG);
+				$a = new ActivityStreams($a->obj);
+			}
+
 			$item = Activity::decode_note($a);
 
 			if (!$item) {

Zotlabs/Lib/Libzot.php

@@ -1148,6 +1148,17 @@ class Libzot {
 				logger('Activity rejected: ' . print_r($data, true));
 				return;
 			}
+
+			if (in_array($AS->type, ['Add', 'Remove'])
+				&& is_array($AS->obj)
+				&& array_key_exists('object', $AS->obj)
+				&& array_key_exists('actor', $AS->obj)
+				&& !empty($AS->tgt)) {
+
+				logger('unsupported collection operation', LOGGER_DEBUG);
+				return;
+			}
+
 			if (is_array($AS->obj)) {
 				$item = Activity::decode_note($AS);
 				if (!$item) {
@@ -1158,6 +1169,7 @@ class Libzot {
 			else {
 				$item = [];
 			}
+
 			logger($AS->debug(), LOGGER_DATA);
 
 		}
@@ -2006,7 +2018,13 @@ class Libzot {
 		foreach ($items as $activity) {
 
 			$AS = new ActivityStreams($activity);
-			if ($AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
+
+			if (!$AS->is_valid()) {
+				logger('Fetched activity rejected: ' . print_r($activity, true));
+				continue;
+			}
+
+			if ($AS->type === 'Announce' && is_array($AS->obj)
 				&& array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)) {
 				// This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
 				// Reparse the encapsulated Activity and use that instead
@@ -2014,9 +2032,14 @@ class Libzot {
 				$AS = new ActivityStreams($AS->obj);
 			}
 
-			if (!$AS->is_valid()) {
-				logger('Fetched activity rejected: ' . print_r($activity, true));
-				continue;
+			if (in_array($AS->type, ['Add', 'Remove'])
+				&& is_array($AS->obj)
+				&& array_key_exists('object', $AS->obj)
+				&& array_key_exists('actor', $AS->obj)
+				&& !empty($AS->tgt)) {
+
+				logger('unsupported collection operation', LOGGER_DEBUG);
+				return;
 			}
 
 			// logger($AS->debug());

Zotlabs/Widget/Channel_activities.php

@@ -91,7 +91,7 @@ class Channel_activities {
 
 		self::$activities['photos'] = [
 			'label' => t('Photos'),
-			'icon' => 'photo',
+			'icon' => 'image',
 			'url' => z_root() . '/photos/' . self::$channel['channel_address'],
 			'date' => $r[0]['edited'],
 			'items' => $i,
@@ -123,7 +123,7 @@ class Channel_activities {
 
 		self::$activities['files'] = [
 			'label' => t('Files'),
-			'icon' => 'folder-open',
+			'icon' => 'folder',
 			'url' => z_root() . '/cloud/' . self::$channel['channel_address'],
 			'date' => $r[0]['edited'],
 			'items' => $i,
@@ -166,7 +166,7 @@ class Channel_activities {
 
 		self::$activities['webpages'] = [
 			'label' => t('Webpages'),
-			'icon' => 'newspaper-o',
+			'icon' => 'layout-text-sidebar',
 			'url' => z_root() . '/webpages/' . self::$channel['channel_address'],
 			'date' => $r[0]['edited'],
 			'items' => $i,
@@ -237,7 +237,7 @@ class Channel_activities {
 
 		self::$activities['channels'] = [
 			'label' => t('Channels'),
-			'icon' => 'home',
+			'icon' => 'house',
 			'url' => z_root() . '/manage',
 			'date' => datetime_convert(),
 			'items' => $i,

boot.php

@@ -66,7 +66,7 @@ require_once('include/security.php');
 
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '9.4.2');
+define('STD_VERSION', '9.4.3');
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1263);

view/tpl/saved_searches.tpl

@@ -4,7 +4,7 @@
 	<ul id="saved-search-list" class="nav nav-pills flex-column">
 		{{foreach $saved as $search}}
 		<li class="nav-item nav-item-hack" id="search-term-{{$search.id}}">
-			<a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="bi bi-trash drop-icons" ></i></a>
+			<a class="nav-link widget-nav-pills-icons{{if $search.selected}} active{{/if}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i class="bi bi-trash"></i></a>
 			<a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}

view/tpl/searchbox.tpl

@@ -4,7 +4,7 @@
 		<input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
 		<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="bi bi-search"></i></button>
 		{{if $savedsearch}}
-		<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="bi fa-floppy-o"></i></button>
+		<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="bi bi-save"></i></button>
 		{{/if}}
 	</div>
 </form>