diff options
-rw-r--r-- | Zotlabs/Lib/Libzotdir.php | 2 | ||||
-rw-r--r-- | Zotlabs/Module/Dirsearch.php | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php index b27f87a5f..3b66a42c6 100644 --- a/Zotlabs/Lib/Libzotdir.php +++ b/Zotlabs/Lib/Libzotdir.php @@ -288,7 +288,7 @@ class Libzotdir { q("insert into updates ( ud_hash, ud_guid, ud_date, ud_addr, ud_flags ) values ( '%s', '%s', '%s', '%s', 1 ) ", dbesc($t['hash']), - dbesc($t['transaction_id']), + dbesc($t['host'] ?? $t['transaction_id']), // 2023-04-12 transaction_id is deprecated dbesc($t['timestamp']), dbesc($t['address']) ); diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index 001bd87a7..837783e8b 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -216,24 +216,18 @@ class Dirsearch extends Controller { if($sync) { $spkt = array('transactions' => array()); - $r = q("select * from updates where ud_date >= '%s' order by ud_date desc", + $r = q("SELECT * FROM updates WHERE ud_flags = 0 AND ud_date >= '%s' ORDER BY ud_date DESC", dbesc($sync) ); if($r) { foreach($r as $rr) { - $flags = []; - if($rr['ud_flags'] & UPDATE_FLAGS_DELETED) - $flags[] = 'deleted'; - if($rr['ud_flags'] & UPDATE_FLAGS_FORCED) - $flags[] = 'forced'; - $spkt['transactions'][] = [ 'hash' => $rr['ud_hash'], 'address' => $rr['ud_addr'], - 'transaction_id' => $rr['ud_guid'], - 'timestamp' => $rr['ud_date'], - 'flags' => $flags + 'host' => $rr['ud_guid'], + 'transaction_id' => $rr['ud_guid'], // deprecated 2023-04-12 + 'timestamp' => $rr['ud_date'] ]; } } |