From f1a8db4e7638f0d0021cd2a349d86d620e5beaea Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 18 Aug 2020 17:30:48 +0000
Subject: [PATCH] Use the owner data to collect all data
---
src/Network/Probe.php | 38 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 467c79a152..01cd886fb1 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -2167,20 +2167,18 @@ class Probe
public static function localProbe($url)
{
- $fields = ['uid', 'url', 'name', 'nick', 'addr', 'alias', 'photo', 'contact-type', 'keywords',
- 'location', 'about', 'notify', 'poll', 'request', 'confirm', 'poco', 'pubkey', 'gsid'];
- $self = Contact::selectFirst($fields, ['self' => true, 'nurl' => Strings::normaliseLink($url)]);
- if (empty($self)) {
- $self = Contact::selectFirst($fields, ['self' => true, 'addr' => $url]);
+ $self = Contact::selectFirst(['uid'], ['self' => true, 'nurl' => Strings::normaliseLink($url)]);
+ if (empty($self['uid'])) {
+ $self = Contact::selectFirst(['uid'], ['self' => true, 'addr' => $url]);
}
- if (empty($self)) {
- $self = Contact::selectFirst($fields, ['self' => true, 'alias' => [$url, Strings::normaliseLink($url)]]);
+ if (empty($self['uid'])) {
+ $self = Contact::selectFirst(['uid'], ['self' => true, 'alias' => [$url, Strings::normaliseLink($url)]]);
}
- if (empty($self)) {
+ if (empty($self['uid'])) {
return [];
}
- $profile = Profile::getByUID($self['uid']);
+ $profile = User::getOwnerDataById($self['uid']);
if (empty($profile)) {
return [];
}
@@ -2190,22 +2188,22 @@ class Probe
return [];
}
- if (empty($self['gsid'])) {
- $self['gsid'] = GServer::getID($approfile['generator']['url']);
+ if (empty($profile['gsid'])) {
+ $profile['gsid'] = GServer::getID($approfile['generator']['url']);
}
- $data = ['name' => $self['name'], 'nick' => $self['nick'], 'guid' => $approfile['diaspora:guid'],
- 'url' => $self['url'], 'addr' => $self['addr'], 'alias' => $self['alias'],
- 'photo' => $self['photo'], 'account-type' => $self['contact-type'],
- 'community' => ($self['contact-type'] == Contact::TYPE_COMMUNITY),
- 'keywords' => $self['keywords'], 'location' => $self['location'], 'about' => $self['about'],
- 'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $self['notify'],
- 'poll' => $self['poll'], 'request' => $self['request'], 'confirm' => $self['confirm'],
- 'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $self['poco'],
+ $data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'],
+ 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
+ 'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
+ 'community' => ($profile['contact-type'] == Contact::TYPE_COMMUNITY),
+ 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
+ 'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
+ 'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
+ 'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'],
'following' => $approfile['following'], 'followers' => $approfile['followers'],
'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
- 'pubkey' => $self['pubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $self['gsid']];
+ 'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid']];
return self::rearrangeData($data);
}
}
--
2.39.5