Add probe_detect hook

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index becc80c0c3c6e09e557e77778aaf37cc59882b80..e881398df8b9ce893de96f520646934b6117a73c 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -847,7 +847,7 @@ class Contact
                        $item['body'] = '';
                        $item['title'] = '';
                        $item['guid'] = '';
-                       $item['tag'] = '';
+                       $item['uri-id'] = 0;
                        $item['attach'] = '';
                        $slap = OStatus::salmon($item, $user);
 
@@ -1530,10 +1530,6 @@ class Contact
 
                if (empty($data)) {
                        $data = Probe::uri($url, "", $uid);
-                       // Ensure that there is a gserver entry
-                       if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
-                               GServer::check($data['baseurl']);
-                       }
                }
 
                // Take the default values when probing failed
@@ -1546,6 +1542,14 @@ class Contact
                        return 0;
                }
 
+               if (!empty($data['baseurl'])) {
+                       $data['baseurl'] = GServer::cleanURL($data['baseurl']);
+               }
+
+               if (!empty($data['baseurl']) && empty($data['gsid'])) {
+                       $data['gsid'] = GServer::getID($data['baseurl']);
+               }
+
                if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
                        $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
                }
@@ -1575,6 +1579,7 @@ class Contact
                                'confirm'   => $data['confirm'] ?? '',
                                'poco'      => $data['poco'] ?? '',
                                'baseurl'   => $data['baseurl'] ?? '',
+                               'gsid'      => $data['gsid'] ?? null,
                                'name-date' => DateTimeFormat::utcNow(),
                                'uri-date'  => DateTimeFormat::utcNow(),
                                'avatar-date' => DateTimeFormat::utcNow(),
@@ -1627,7 +1632,7 @@ class Contact
                                }
                        }
                } else {
-                       $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl'];
+                       $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid'];
                        $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
                        // This condition should always be true
@@ -1641,7 +1646,7 @@ class Contact
                                'updated' => DateTimeFormat::utcNow()
                        ];
 
-                       $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
+                       $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid'];
 
                        foreach ($fields as $field) {
                                $updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
@@ -2080,9 +2085,9 @@ class Contact
                // These fields aren't updated by this routine:
                // 'xmpp', 'sensitive'
 
-               $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about',
+               $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
                        'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
-                       'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey'];
+                       'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey'];
                $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
                if (!DBA::isResult($contact)) {
                        return false;
@@ -2415,6 +2420,7 @@ class Contact
                                'nick'    => $ret['nick'],
                                'network' => $ret['network'],
                                'baseurl' => $ret['baseurl'],
+                               'gsid'    => $ret['gsid'] ?? null,
                                'protocol' => $protocol,
                                'pubkey'  => $ret['pubkey'],
                                'rel'     => $new_relation,
@@ -2457,7 +2463,7 @@ class Contact
                                $item['body'] = '';
                                $item['title'] = '';
                                $item['guid'] = '';
-                               $item['tag'] = '';
+                               $item['uri-id'] = 0;
                                $item['attach'] = '';
 
                                $slap = OStatus::salmon($item, $owner);