diff --git a/include/conversation.php b/include/conversation.php index 1e8437f715..c2226fa352 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -452,8 +452,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o $profile_owner = 0; if (!$update) { - $live_update_div = '
' . "\r\n" - . "\r\n"; } } elseif ($mode === 'search') { diff --git a/mod/update_contact.php b/mod/update_contact.php index 4863ad02de..3f8e00b296 100644 --- a/mod/update_contact.php +++ b/mod/update_contact.php @@ -28,11 +28,10 @@ use Friendica\Module\Contact; function update_contact_content(App $a) { - if (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) { - $text = Contact::content([], true); + if (!empty($a->argv[1]) && (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update'))) { + $text = Contact::getConversationsHMTL($a, $a->argv[1], true, ($_GET['item'] ?? 0)); } else { $text = ''; } - System::htmlUpdateExit($text); } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index e997bffdef..6bbc0921ca 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1247,25 +1247,27 @@ class Contact * * @param string $contact_url Contact URL * @param bool $thread_mode - * @param int $update + * @param int $update Update mode + * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception */ - public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0) + public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0) { - return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update); + return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent); } /** * Returns posts from a given contact id * - * @param integer $cid - * @param bool $thread_mode - * @param integer $update + * @param int $cid Contact ID + * @param bool $thread_mode + * @param int $update Update mode + * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception */ - public static function getPostsFromId($cid, $thread_mode = false, $update = 0) + public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0) { $a = DI::app(); @@ -1290,9 +1292,13 @@ class Contact $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; } - $last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : ''; - if (!empty($last_received)) { - $condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]); + if (!empty($parent)) { + $condition = DBA::mergeConditions($condition, ['parent' => $parent]); + } else { + $last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : ''; + if (!empty($last_received)) { + $condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]); + } } if (DI::mode()->isMobile()) { @@ -1335,7 +1341,7 @@ class Contact $items = Item::inArray($r); - $o .= conversation($a, $items, 'contact-posts', false); + $o .= conversation($a, $items, 'contact-posts', $update); } if (!$update) { diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 659380fbef..cc4f4d9abe 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -921,7 +921,7 @@ class Contact extends BaseModule return $tab_str; } - private static function getConversationsHMTL($a, $contact_id, $update) + public static function getConversationsHMTL($a, $contact_id, $update, $parent = 0) { $o = ''; @@ -952,14 +952,15 @@ class Contact extends BaseModule if (DBA::isResult($contact)) { DI::page()['aside'] = ''; - $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user()); - - Model\Profile::load($a, '', $profiledata, true); + if (!$update) { + $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user()); + Model\Profile::load($a, '', $profiledata, true); + } if ($contact['uid'] == 0) { - $o .= Model\Contact::getPostsFromId($contact['id'], true, $update); + $o .= Model\Contact::getPostsFromId($contact['id'], true, $update, $parent); } else { - $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update); + $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update, $parent); } }