initial commit directory sync rewrite - should work but still requires lots of cleanup

1 files changed, 11 insertions, 8 deletions

diff --git a/Zotlabs/Daemon/Onedirsync.php b/Zotlabs/Daemon/Onedirsync.php
index ea995be9e..89f4a40ed 100644
--- a/Zotlabs/Daemon/Onedirsync.php
+++ b/Zotlabs/Daemon/Onedirsync.php
@@ -19,13 +19,14 @@ class Onedirsync {
 			return;
 		}
 
-		$r = q("select * from updates where ud_id = %d limit 1",
+		$r = q("select * from updates where ud_id = %d",
 			intval($update_id)
 		);
 
 		if (!$r)
 			return;
 
+/*
 		if (($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (!$r[0]['ud_addr']))
 			return;
 
@@ -47,22 +48,24 @@ class Onedirsync {
 			);
 			return;
 		}
-
+*/
 		// ignore doing an update if this ud_addr refers to a known dead hubloc
 
-		$h = q("select * from hubloc where hubloc_addr = '%s'",
+		$h = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_id desc",
 			dbesc($r[0]['ud_addr']),
 		);
 
 		$h = Libzot::zot_record_preferred($h);
 
 		if (($h) && (($h['hubloc_status'] & HUBLOC_OFFLINE) || $h['hubloc_deleted'] || $h['hubloc_error'])) {
-			q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
-				intval(UPDATE_FLAGS_DELETED),
-				dbesc($r[0]['ud_addr']),
-				intval(UPDATE_FLAGS_UPDATED)
+			q("update updates set ud_flags = 9 where ud_hash = '%s' and ud_flags != 9",
+				dbesc($r[0]['ud_hash'])
 			);
-			return;
+
+			// 2023-04-12: Flag the entry deleted but try to update anyway since the info is not always correct
+			// This might change after all directory servers run the new code.
+
+			// return;
 		}
 
 		// we might have to pull this out some day, but for now update_directory_entry()