aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2023-04-16 17:12:49 +0200
committerMario Vavti <mario@mariovavti.com>2023-04-16 17:12:49 +0200
commit5674badccd29f7a7069892cf0c0088e7f50f5f27 (patch)
tree5d04a9eca70a198fdfe6c45261d636300a90d761 /Zotlabs/Lib
parente99957f99f8b71b7761c7a3eb884e430a2c9fb3d (diff)
downloadvolse-hubzilla-5674badccd29f7a7069892cf0c0088e7f50f5f27.tar.gz
volse-hubzilla-5674badccd29f7a7069892cf0c0088e7f50f5f27.tar.bz2
volse-hubzilla-5674badccd29f7a7069892cf0c0088e7f50f5f27.zip
improved update_directory_entry(), update ud_last even if webfinger failed
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Libzotdir.php42
1 files changed, 22 insertions, 20 deletions
diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php
index f6dca65a3..a4f1fb2b9 100644
--- a/Zotlabs/Lib/Libzotdir.php
+++ b/Zotlabs/Lib/Libzotdir.php
@@ -307,8 +307,9 @@ class Libzotdir {
*
* Ignore updating records marked as deleted.
*
- * If successful, sets ud_last in the DB to the current datetime for this
+ * If successful, sets ud_updated in the DB to the current datetime for this
* reddress/webbie.
+ * Else update ud_last so we can stop trying after 7 days (Daemon/Poller.php)
*
* @param array $ud Entry from update table
*/
@@ -317,32 +318,33 @@ class Libzotdir {
logger('update_directory_entry: ' . print_r($ud,true), LOGGER_DATA);
- if (!$ud['ud_hash'] && !$ud['ud_addr']) {
- return;
+ if (!$ud['ud_hash'] || !$ud['ud_addr']) {
+ q("DELETE FROM updates WHERE ud_id = %d",
+ dbesc($ud['ud_id'])
+ );
+ return false;
}
$href = ((strpos($ud['ud_addr'], '://') === false) ? Webfinger::zot_url(punify($ud['ud_addr'])) : punify($ud['ud_addr']));
- if(!$href) {
- return;
- }
- $zf = Zotfinger::exec($href);
-
- if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
- $xc = Libzot::import_xchan($zf['data']);
- // This is a workaround for a missing xchan_updated column
- // TODO: implement xchan_updated in the xchan table and update this column instead
- if($zf['data']['primary_location']['address'] && $zf['data']['primary_location']['url']) {
- q("UPDATE hubloc SET hubloc_updated = '%s' WHERE hubloc_id_url = '%s' AND hubloc_primary = 1",
- dbesc(datetime_convert()),
- dbesc($zf['data']['primary_location']['url'])
- );
+ if($href) {
+ $zf = Zotfinger::exec($href);
+ if($zf && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
+ $xc = Libzot::import_xchan($zf['data']);
+ // This is a workaround for a missing xchan_updated column
+ // TODO: implement xchan_updated in the xchan table and update this column instead
+ if($zf['data']['primary_location']['address'] && $zf['data']['primary_location']['url']) {
+ q("UPDATE hubloc SET hubloc_updated = '%s' WHERE hubloc_id_url = '%s' AND hubloc_primary = 1",
+ dbesc(datetime_convert()),
+ dbesc($zf['data']['primary_location']['url'])
+ );
+ }
+ return true;
}
-
- return true;
}
- q("UPDATE updates SET ud_last = '%s' WHERE ud_hash = '%s'",
+ q("UPDATE updates SET ud_addr = '%s', ud_last = '%s' WHERE ud_hash = '%s'",
+ dbesc($href ? $href : $ud['ud_addr']),
dbesc(datetime_convert()),
dbesc($ud['ud_hash'])
);