version 10.0.7

(cherry picked from commit 27efb887d2)

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

CHANGELOG

@@ -1,3 +1,15 @@
+Hubzilla 10.0.7 (2025-01-22)
+	- Fix ownership check in consume_feed()
+	- Fix toast() if notification contains non-ascii characters
+	- Fix regression in notifications filter
+
+
+Hubzilla 10.0.6 (2025-01-05)
+	- Fix entries where primary location data is not complete not dismissed early
+	- Fix query to cleanup outdated doc entries called multiple times
+	- Fix query to cleanup outdated doc entries
+
+
 Hubzilla 10.0.5 (2024-12-29)
 	- Fix another instance of drop_item() not having permission to drop items
 

Zotlabs/Daemon/Importdoc.php

@@ -11,6 +11,18 @@ class Importdoc {
 
 		self::update_docs_dir('doc/*');
 
+		// remove old files that weren't updated (indicates they were most likely deleted).
+		$i = q("select id, uid from item where item_type = 5 and edited < %s - INTERVAL %s",
+			db_utcnow(),
+			db_quoteinterval('14 DAY')
+		);
+
+		if ($i) {
+			foreach ($i as $iv) {
+				drop_item($iv['id'], uid: $iv['uid']);
+			}
+		}
+
 		return;
 
 	}
@@ -41,18 +53,6 @@ class Importdoc {
 				}
 			}
 		}
-
-		// remove old files that weren't updated (indicates they were most likely deleted).
-		$i = q("select id, uid from item where item_type = 5 and edited < %s - INTERVAL %s",
-			db_utcnow(),
-			db_quoteinterval('14 DAY', true)
-		);
-
-		if ($i) {
-			foreach ($i as $iv) {
-				drop_item($iv['id'], DROPITEM_NORMAL, uid: $iv['uid']);
-			}
-		}
 	}
 }
 

Zotlabs/Lib/Libzot.php

@@ -655,6 +655,11 @@ class Libzot {
 			return $ret;
 		}
 
+		if (empty($arr['primary_location']['address'])) {
+			logger('Empty primary location address: ' . print_r($arr, true), LOGGER_DEBUG);
+			return $ret;
+		}
+
 		/**
 		 * @hooks import_xchan
 		 *   Called when processing the result of zot_finger() to store the result

boot.php

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

include/connections.php

@@ -513,7 +513,7 @@ function remove_abook_items($channel_id, $xchan_hash) {
 			continue;
 		}
 
-		drop_item($rr['id']);
+		drop_item($rr['id'], uid: $channel_id);
 	}
 }
 

include/feedutils.php

@@ -1173,12 +1173,16 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 					intval($importer['channel_id'])
 				);
 
-
 				// Update content if 'updated' changes
 
-				if($r) {
-					if(activity_match($datarray['verb'], ['Delete', ACTIVITY_DELETE])
-						&& $datarray['author_xchan'] === $r[0]['author_xchan']) {
+				if ($r) {
+					// Check ownership
+					if ($datarray['author_xchan'] !== $r[0]['author_xchan']) {
+						logger('stored item author is not imported item author', LOGGER_DEBUG);
+						continue;
+					}
+
+					if (activity_match($datarray['verb'], ['Delete', ACTIVITY_DELETE])) {
 						if(! intval($r[0]['item_deleted'])) {
 							logger('deleting item ' . $r[0]['id'] . ' mid=' . $datarray['mid'], LOGGER_DEBUG);
 							drop_item($r[0]['id']);
@@ -1444,12 +1448,17 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 
 				// Update content if 'updated' changes
 
-				if($r) {
-					if(isset($datarray['verb']) && activity_match($datarray['verb'], ['Delete', ACTIVITY_DELETE])
-						&& isset($datarray['author_xchan']) && $datarray['author_xchan'] === $r[0]['author_xchan']) {
+				if ($r) {
+					// Check ownership
+					if ($datarray['author_xchan'] !== $r[0]['author_xchan']) {
+						logger('stored item author is not imported item author', LOGGER_DEBUG);
+						continue;
+					}
+
+					if (isset($datarray['verb']) && activity_match($datarray['verb'], ['Delete', ACTIVITY_DELETE])) {
 						if(! intval($r[0]['item_deleted'])) {
 							logger('deleting item ' . $r[0]['id'] . ' mid=' . $datarray['mid'], LOGGER_DEBUG);
-							drop_item($r[0]['id']);
+							drop_item($r[0]['id'], uid: $importer['channel_id']);
 						}
 						continue;
 					}

view/js/main.js

@@ -1796,7 +1796,7 @@ function toggleAside() {
 }
 
 function toast(string, severity) {
-	let id = btoa(string);
+	let id = bin2hex(string);
 	let container = document.getElementById('toast-container');
 	let toast = document.getElementById(id);
 

view/tpl/notifications_widget.tpl

@@ -546,7 +546,7 @@
 		}
 
 		// Filter thread_top notifications if the filter is active
-		let filterThreadTop = document.getElementById('cn-' + notifyType + '-input');
+		let filterThreadTop = document.getElementById('tt-' + notifyType + '-only');
 		if (filterThreadTop && filterThreadTop.classList.contains('active')) {
 			let notifications = notify_menu.querySelectorAll('[data-thread_top="false"]');
 			notifications.forEach(notification => notification.classList.add('tt-filter-active'));