<?php
/**
- * @file src/Model/GlobalContact.php
- * @brief This file includes the GlobalContact class with directory related functions
+ * @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 DOMDocument;
use DOMXPath;
use Exception;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
-use Friendica\Core\Worker;
+use Friendica\Core\Search;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\PortableContact;
use Friendica\Util\Strings;
/**
- * @brief This class handles GlobalContact related functions
+ * This class handles GlobalContact related functions
*/
class GContact
{
/**
- * @brief Search global contact table by nick or name
+ * Search global contact table by nick or name
*
* @param string $search Name or nick
* @param string $mode Search mode (e.g. "community")
}
// check supported networks
- if (Config::get('system', 'diaspora_enabled')) {
+ if (DI::config()->get('system', 'diaspora_enabled')) {
$diaspora = Protocol::DIASPORA;
} else {
$diaspora = Protocol::DFRN;
}
- if (!Config::get('system', 'ostatus_disabled')) {
+ if (!DI::config()->get('system', 'ostatus_disabled')) {
$ostatus = Protocol::OSTATUS;
} else {
$ostatus = Protocol::DFRN;
}
/**
- * @brief Link the gcontact entry with user, contact and global contact
+ * Link the gcontact entry with user, contact and global contact
*
* @param integer $gcid Global contact ID
* @param integer $uid User ID
}
/**
- * @brief Sanitize the given gcontact data
+ * Sanitize the given gcontact data
*
* Generation:
* 0: No definition
}
// The global contacts should contain the original picture, not the cached one
- if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(System::baseUrl() . '/photo/'))) {
+ if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(DI::baseUrl() . '/photo/'))) {
$gcontact['photo'] = '';
}
$network = [Protocol::DFRN, Protocol::ACTIVITYPUB];
- if (Config::get('system', 'diaspora_enabled')) {
+ if (DI::config()->get('system', 'diaspora_enabled')) {
$network[] = Protocol::DIASPORA;
}
- if (!Config::get('system', 'ostatus_disabled')) {
+ if (!DI::config()->get('system', 'ostatus_disabled')) {
$network[] = Protocol::OSTATUS;
}
$done = [];
/// @TODO Check if it is really neccessary to poll the own server
- PortableContact::loadWorker(0, 0, 0, System::baseUrl() . '/poco');
+ PortableContact::loadWorker(0, 0, 0, DI::baseUrl() . '/poco');
- $done[] = System::baseUrl() . '/poco';
+ $done[] = DI::baseUrl() . '/poco';
- if (strlen(Config::get('system', 'directory'))) {
- $x = Network::fetchUrl(get_server() . '/pubsites');
+ if (strlen(DI::config()->get('system', 'directory'))) {
+ $x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
if (!empty($x)) {
$j = json_decode($x);
if (!empty($j->entries)) {
}
/**
- * @brief Removes unwanted parts from a contact url
+ * Removes unwanted parts from a contact url
*
* @param string $url Contact url
*
}
/**
- * @brief Fetch the gcontact id, add an entry if not existed
+ * Fetch the gcontact id, add an entry if not existed
*
* @param array $contact contact array
*
}
/**
- * @brief Updates the gcontact table from a given array
+ * Updates the gcontact table from a given array
*
* @param array $contact contact array
*
}
$public_contact = DBA::selectFirst('gcontact', [
- 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'gender', 'keywords',
+ 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'keywords',
'contact-type', 'hide', 'nsfw', 'network', 'alias', 'notify', 'server_url', 'connect', 'updated', 'url'
], ['id' => $gcontact_id]);
'photo' => $contact['photo'], 'name' => $contact['name'],
'nick' => $contact['nick'], 'addr' => $contact['addr'],
'network' => $contact['network'], 'birthday' => $contact['birthday'],
- 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
+ 'keywords' => $contact['keywords'],
'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
'notify' => $contact['notify'], 'url' => $contact['url'],
$curlResult = Network::curl($data['poll']);
if (!$curlResult->isSuccess()) {
$fields = ['last_failure' => DateTimeFormat::utcNow()];
- DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($profile)]);
+ DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
Logger::info("Profile wasn't reachable (no feed)", ['url' => $data['url']]);
return;
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
}
/**
- * @brief Updates the gcontact entry from a given public contact id
+ * Updates the gcontact entry from a given public contact id
*
* @param integer $cid contact id
* @return void
}
/**
- * @brief Updates the gcontact entry from a given public contact url
+ * Updates the gcontact entry from a given public contact url
*
* @param string $url contact url
* @return integer gcontact id
}
/**
- * @brief Helper function for updateFromPublicContactID and updateFromPublicContactURL
+ * Helper function for updateFromPublicContactID and updateFromPublicContactURL
*
* @param array $condition contact condition
* @return integer gcontact id
*/
private static function updateFromPublicContact($condition)
{
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender',
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords',
'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'term-date',
'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv',
'baseurl', 'sensitive', 'unsearchable'];
return 0;
}
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', 'generation',
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'generation',
'birthday', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archived', 'archive_date',
'created', 'updated', 'photo', 'last_contact', 'last_failure', 'community', 'connect',
'server_url', 'nsfw', 'hide', 'id'];
$gcontact = [];
// These fields are identical in both contact and gcontact
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender',
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords',
'contact-type', 'network', 'addr', 'notify', 'alias', 'created', 'updated'];
foreach ($fields as $field) {
}
/**
- * @brief Updates the gcontact entry from probe
+ * Updates the gcontact entry from probe
*
* @param string $url profile link
* @param boolean $force Optional forcing of network probing (otherwise we use the cached data)
}
/**
- * @brief Update the gcontact entry for a given user id
+ * Update the gcontact entry for a given user id
*
* @param int $uid User ID
* @return bool
);
$gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'],
- 'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'],
+ 'keywords' => $userdata['pub_keywords'],
'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
"notify" => $userdata['notify'], 'url' => $userdata['url'],
- "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
+ "hide" => !$userdata['net-publish'],
'nick' => $userdata['nickname'], 'addr' => $userdata['addr'],
- "connect" => $userdata['addr'], "server_url" => System::baseUrl(),
+ "connect" => $userdata['addr'], "server_url" => DI::baseUrl(),
"generation" => 1, 'network' => Protocol::DFRN];
self::update($gcontact);
}
/**
- * @brief Get the basepath for a given contact link
+ * Get the basepath for a given contact link
*
* @param string $url The gcontact link
* @param boolean $dont_update Don't update the contact
}
/**
- * @brief Fetches users of given GNU Social server
+ * Fetches users of given GNU Social server
*
* If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
*
'addr' => $user->nickname . '@' . $hostname,
'nick' => $user->nickname,
"network" => Protocol::OSTATUS,
- 'photo' => System::baseUrl() . '/images/person-300.jpg'];
+ 'photo' => DI::baseUrl() . '/images/person-300.jpg'];
if (isset($user->bio)) {
$contact['about'] = $user->bio;
}
/**
- * @brief Asking GNU Social server on a regular base for their user data
+ * Asking GNU Social server on a regular base for their user data
+ *
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function discoverGsUsers()
{
- $requery_days = intval(Config::get('system', 'poco_requery_days'));
+ $requery_days = intval(DI::config()->get('system', 'poco_requery_days'));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
projects / friendica.git / blobdiff