Remove usage of profile.gender

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

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 6401c8baab141b49f3e08a62ad0a028a57d83ac2..05f20ec5b8063822cced6ea70aa276b838135f3f 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -8,7 +8,6 @@ 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;
@@ -43,13 +42,13 @@ class GContact
                }
 
                // 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;
@@ -424,11 +423,11 @@ class GContact
 
                $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;
                }
 
@@ -508,7 +507,7 @@ class GContact
 
                $done[] = DI::baseUrl() . '/poco';
 
-               if (strlen(Config::get('system', 'directory'))) {
+               if (strlen(DI::config()->get('system', 'directory'))) {
                        $x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
                        if (!empty($x)) {
                                $j = json_decode($x);
@@ -903,7 +902,7 @@ class GContact
                $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;
@@ -1118,7 +1117,7 @@ class GContact
                );
 
                $gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'],
-                               'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'],
+                               'gender' => '', 'keywords' => $userdata['pub_keywords'],
                                'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
                                "notify" => $userdata['notify'], 'url' => $userdata['url'],
                                "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
@@ -1235,7 +1234,7 @@ class GContact
         */
        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));