From 88373c714005ea948f2b332e8d08f76286149d1e Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Fri, 11 Aug 2023 07:28:47 +1000 Subject: [PATCH] use the hubloc_url instead of the xchan_url as they might be different. --- include/conversation.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b183cba51..c6444826d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1539,13 +1539,13 @@ function conv_sort($arr, $order) // or other channel streams on this site which are not owned by the viewer if (local_channel()) { - $m = parse_url($item['author']['xchan_url']); + $m = parse_url($item['author']['hubloc_url']); $authorSite = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . $m['port'] : ''); - $m = parse_url($item['owner']['xchan_url']); + $m = parse_url($item['owner']['hubloc_url']); $ownerSite = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . $m['port'] : ''); - + if (LibBlock::fetch_by_entity(local_channel(), $authorSite) || LibBlock::fetch_by_entity(local_channel(), $ownerSite)) { continue;