Raw content is now stored with announce messages as well

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 6d50582e68452251144b1bef22731af6c1fdf5c0..7ce47bb227ec04e39804680947228533ac696328 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -1,23 +1,37 @@
 <?php
-
 /**
- * @file src/Model/APContact.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Network;
 use Friendica\Util\JsonLD;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-class APContact extends BaseObject
+class APContact
 {
        /**
         * Resolves the profile url from the address by using webfinger
@@ -34,7 +48,7 @@ class APContact extends BaseObject
                        return false;
                }
 
-               $xrd_timeout = Config::get('system', 'xrd_timeout');
+               $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
 
                $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
 
@@ -84,7 +98,7 @@ class APContact extends BaseObject
        public static function getByURL($url, $update = null)
        {
                if (empty($url)) {
-                       return false;
+                       return [];
                }
 
                $fetched_contact = false;
@@ -110,7 +124,7 @@ class APContact extends BaseObject
                        }
 
                        if (!is_null($update)) {
-                               return DBA::isResult($apcontact) ? $apcontact : false;
+                               return DBA::isResult($apcontact) ? $apcontact : [];
                        }
 
                        if (DBA::isResult($apcontact)) {
@@ -153,7 +167,7 @@ class APContact extends BaseObject
                        self::unarchiveInbox($apcontact['sharedinbox'], true);
                }
 
-               $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value');
+               $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value') ?? '';
                $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
 
                if (empty($apcontact['name'])) {
@@ -185,8 +199,14 @@ class APContact extends BaseObject
                $parts = parse_url($apcontact['url']);
                unset($parts['scheme']);
                unset($parts['path']);
-               $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
 
+               if (!empty($apcontact['nick'])) {
+                       $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
+               } else {
+                       $apcontact['addr'] = '';
+               }
+
+               $apcontact['pubkey'] = null;
                if (!empty($compacted['w3id:publicKey'])) {
                        $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
                }
@@ -198,6 +218,33 @@ class APContact extends BaseObject
                        $apcontact['generator'] = JsonLD::fetchElement($compacted['as:generator'], 'as:name', '@value');
                }
 
+               if (!empty($apcontact['following'])) {
+                       $data = ActivityPub::fetchContent($apcontact['following']);
+                       if (!empty($data)) {
+                               if (!empty($data['totalItems'])) {
+                                       $apcontact['following_count'] = $data['totalItems'];
+                               }
+                       }
+               }
+
+               if (!empty($apcontact['followers'])) {
+                       $data = ActivityPub::fetchContent($apcontact['followers']);
+                       if (!empty($data)) {
+                               if (!empty($data['totalItems'])) {
+                                       $apcontact['followers_count'] = $data['totalItems'];
+                               }
+                       }
+               }
+
+               if (!empty($apcontact['outbox'])) {
+                       $data = ActivityPub::fetchContent($apcontact['outbox']);
+                       if (!empty($data)) {
+                               if (!empty($data['totalItems'])) {
+                                       $apcontact['statuses_count'] = $data['totalItems'];
+                               }
+                       }
+               }
+
                // To-Do
 
                // Unhandled
@@ -237,41 +284,6 @@ class APContact extends BaseObject
                        DBA::delete('apcontact', ['url' => $url]);
                }
 
-               // Update some data in the contact table with various ways to catch them all
-               $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']];
-
-               // Fetch the type and match it with the contact type
-               $contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
-               if (!empty($contact_types)) {
-                       $contact_type = array_pop($contact_types);
-                       if (is_int($contact_type)) {
-                               $contact_fields['contact-type'] = $contact_type;
-
-                               if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
-                                       // Resetting the 'forum' and 'prv' field when it isn't a forum
-                                       $contact_fields['forum'] = false;
-                                       $contact_fields['prv'] = false;
-                               } else {
-                                       // Otherwise set the corresponding forum type
-                                       $contact_fields['forum'] = !$apcontact['manually-approve'];
-                                       $contact_fields['prv'] = $apcontact['manually-approve'];
-                               }
-                       }
-               }
-
-               DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
-               if (!empty($apcontact['photo'])) {
-                       $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
-                       while ($contact = DBA::fetch($contacts)) {
-                               Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
-                       }
-                       DBA::close($contacts);
-               }
-
-               // Update the gcontact table
-               GContact::updateFromPublicContactURL($url);
-
                Logger::log('Updated profile for ' . $url, Logger::DEBUG);
 
                return $apcontact;