Merge pull request #12655 from annando/fix-communication

[friendica.git] / mod / update_contact.php

diff --git a/mod/update_contact.php b/mod/update_contact.php
index 3f8e00b296f9583ea4d3db4c3bc9dee7db2679ef..1a85018e6d23645842f9b261e3c4a00364014ef5 100644 (file)
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,15 +23,25 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Module\Contact;
+use Friendica\Model\Post;
+use Friendica\Model\Contact;
 
 function update_contact_content(App $a)
 {
-       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 = '';
+       if (!empty(DI::args()->get(1)) && !empty($_GET['force'])) {
+               $contact = Contact::getById(DI::args()->get(1), ['id', 'deleted']);
+               if (DBA::isResult($contact) && empty($contact['deleted'])) {
+                       DI::page()['aside'] = '';
+
+                       if (!empty($_GET['item'])) {
+                               $item = Post::selectFirst(['parent'], ['id' => $_GET['item']]);
+                       }
+
+                       $text = Contact::getPostsFromId($contact['id'], true, true, $item['parent'] ?? 0);
+               }
        }
-       System::htmlUpdateExit($text);
+
+       System::htmlUpdateExit($text ?? '');
 }