From 59b217f7eaf4d5efd08ca8db82866b38ce1f5cf4 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 12 Jun 2023 08:13:42 +0000 Subject: only remove the owner from delivery if its their post and minor cleanup --- Zotlabs/Daemon/Notifier.php | 2 +- include/socgraph.php | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index d5fe7ee6d..592dd2c38 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -409,7 +409,7 @@ class Notifier { self::$private = false; self::$recipients = collect_recipients($parent_item, self::$private); - if ($top_level_post) { + if ($top_level_post && intval($target_item['item_wall'])) { // remove clones who will receive the post via sync self::$recipients = array_values(array_diff(self::$recipients, [$target_item['owner_xchan']])); } diff --git a/include/socgraph.php b/include/socgraph.php index 49cc45d52..e5e8ddf74 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -112,12 +112,8 @@ function poco_load($xchan = '', $url = null) { $profile_url = ''; $profile_photo = ''; $address = ''; - $name = ''; - $hash = ''; - $rating = 0; - - $name = $entry['displayName']; - $hash = $entry['hash']; + $name = $entry['displayName'] ?? ''; + $hash = $entry['hash'] ?? ''; if(x($entry,'urls') && is_array($entry['urls'])) { foreach($entry['urls'] as $url) { -- cgit v1.2.3