diff options
| author | Mario <mario@mariovavti.com> | 2022-10-10 18:05:26 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-10 18:05:26 +0000 |
| commit | ef2448e17e742e7dcef458993bce1e0a29756aa7 (patch) | |
| tree | d23c62753abbb42e7bb742f2d44d09321b6f2eee /Zotlabs/Daemon | |
| parent | 6ab65519a0fc3e55ad5f32ce1641190ef609a4e2 (diff) | |
| parent | 99a5cf1ad4660a31af6c03e5a1abc3d374f82c78 (diff) | |
| download | volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.tar.gz volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.tar.bz2 volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.zip | |
Merge branch '7.8RC'7.8
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Externals.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Externals.php b/Zotlabs/Daemon/Externals.php index fb35a65c7..5b7954c2f 100644 --- a/Zotlabs/Daemon/Externals.php +++ b/Zotlabs/Daemon/Externals.php @@ -133,7 +133,7 @@ class Externals { continue; } - $obj_id = isset($message['object']['id']) ?? $message['object']; + $obj_id = $message['object']['id'] ?? $message['object']; Libzot::fetch_conversation($importer, $obj_id); $total++; diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 8aee08fe6..776cf4f63 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -111,6 +111,12 @@ class Notifier { $sys = get_sys_channel(); $normal_mode = true; + $upstream = false; + $uplink = false; + $target_item = []; + $parent_item = []; + $top_level_post = false; + $relay_to_owner = false; if ($cmd === 'keychange') { self::$channel = channelx_by_n($item_id); @@ -360,8 +366,6 @@ class Notifier { // the hostname in the message_id and provides a second (fallback) opinion. $relay_to_owner = (!$top_level_post && intval($target_item['item_origin']) && comment_local_origin($target_item)); - $uplink = false; - $upstream = false; // $cmd === 'relay' indicates the owner is sending it to the original recipients // don't allow the item in the relay command to relay to owner under any circumstances, it will loop diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 79fd06df9..f2b5d8c58 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -46,6 +46,7 @@ class Onepoll { } $contact = $contacts[0]; + $importer_uid = $contact['abook_channel']; $importer = channelx_by_n($importer_uid); @@ -53,7 +54,7 @@ class Onepoll { if (!$importer) return; - logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); + logger("onepoll: poll: ($contact_id) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE)) ? datetime_convert('UTC', 'UTC', 'now - 7 days') |