"community", "keywords", "location", "about", "hide",
"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
- "priority", "network", "pubkey", "baseurl", "gsid"];
+ "priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
+
+ $numeric_fields = ["gsid", "hide", "account-type", "manually-approve"];
$newdata = [];
foreach ($fields as $field) {
if (isset($data[$field])) {
- if (in_array($field, ["gsid", "hide", "account-type"])) {
+ if (in_array($field, $numeric_fields)) {
$newdata[$field] = (int)$data[$field];
} else {
$newdata[$field] = $data[$field];
}
- } elseif ($field != "gsid") {
+ } elseif (!in_array($field, $numeric_fields)) {
$newdata[$field] = "";
} else {
$newdata[$field] = null;
}
if (empty($data['photo'])) {
- $data['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ $data['photo'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
}
if (empty($data['name'])) {
Logger::info('Probing start', ['uri' => $uri]);
- $data = self::getWebfingerArray($uri);
+ if (!empty($ap_profile['addr']) && ($ap_profile['addr'] != $uri)) {
+ $data = self::getWebfingerArray($ap_profile['addr']);
+ }
+
+ if (empty($data)) {
+ $data = self::getWebfingerArray($uri);
+ }
+
if (empty($data)) {
if (!empty($parts['scheme'])) {
return self::feed($uri);
&& !empty($hcard_url)
) {
$data["network"] = Protocol::DIASPORA;
+ $data["manually-approve"] = false;
// The Diaspora handle must always be lowercase
if (!empty($data["addr"])) {
&& isset($data["url"])
) {
$data["network"] = Protocol::OSTATUS;
+ $data["manually-approve"] = false;
} else {
return $short ? false : [];
}
*/
public static function getLastUpdate(array $data)
{
+ $uid = User::getIdForURL($data['url']);
+ if (!empty($uid)) {
+ $contact = Contact::selectFirst(['url', 'last-item'], ['self' => true, 'uid' => $uid]);
+ if (!empty($contact['last-item'])) {
+ return $contact['last-item'];
+ }
+ }
+
if ($lastUpdate = self::updateFromNoScrape($data)) {
return $lastUpdate;
}
return '';
}
- public static function localProbe($url)
+ /**
+ * Probe data from local profiles without network traffic
+ *
+ * @param string $url
+ * @return array probed data
+ */
+ private static function localProbe(string $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]);
- }
- if (empty($self)) {
- $self = Contact::selectFirst($fields, ['self' => true, 'alias' => [$url, Strings::normaliseLink($url)]]);
- }
- if (empty($self)) {
+ $uid = User::getIdForURL($url);
+ if (empty($uid)) {
return [];
}
- $profile = Profile::getByUID($self['uid']);
+ $profile = User::getOwnerDataById($uid);
if (empty($profile)) {
return [];
}
- $approfile = ActivityPub\Transmitter::getProfile($self['uid']);
+ $approfile = ActivityPub\Transmitter::getProfile($uid);
if (empty($approfile)) {
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'] == User::ACCOUNT_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'],
+ 'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
return self::rearrangeData($data);
}
}