diff options
| author | Mario <mario@mariovavti.com> | 2022-02-08 15:15:18 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-02-08 15:15:18 +0000 |
| commit | c94f25570b94ba2f389fbd1ad9f547a10e962e24 (patch) | |
| tree | 294fabaf3e7d9172c8e0201a389b0e72d0cbf29f | |
| parent | ffa5e088325a8ddef0941efee58a8be739ffb538 (diff) | |
| parent | 63243c8e0417f6922e745aca3593bb06cb46760e (diff) | |
| download | volse-hubzilla-c94f25570b94ba2f389fbd1ad9f547a10e962e24.tar.gz volse-hubzilla-c94f25570b94ba2f389fbd1ad9f547a10e962e24.tar.bz2 volse-hubzilla-c94f25570b94ba2f389fbd1ad9f547a10e962e24.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Daemon/Externals.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Externals.php b/Zotlabs/Daemon/Externals.php index 81414d02d..fb35a65c7 100644 --- a/Zotlabs/Daemon/Externals.php +++ b/Zotlabs/Daemon/Externals.php @@ -133,7 +133,9 @@ class Externals { continue; } - Libzot::fetch_conversation($importer, $message['object']['id']); + $obj_id = isset($message['object']['id']) ?? $message['object']; + + Libzot::fetch_conversation($importer, $obj_id); $total++; continue; } diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index e78cb4568..e4d8d2275 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -3172,7 +3172,7 @@ class Libzot { } static function update_cached_hubloc($hubloc) { - if ($hubloc['hubloc_updated'] > datetime_convert('UTC','UTC','now - 1 week') || $hubloc['hubloc_url'] === z_root()) { + if ($hubloc['hubloc_updated'] > datetime_convert('UTC','UTC','now - 3 days') || $hubloc['hubloc_url'] === z_root()) { return; } self::refresh( [ 'hubloc_id_url' => $hubloc['hubloc_id_url'] ] ); |