Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-07 23:04:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

No more gender

Browse source
This commit is contained in:
Michael 2020-02-16 10:55:18 +00:00
parent 797e3a2079
commit 3bd1f3a836
24 changed files with 32 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Protocol/PortableContact.php
View file

@ -99,7 +99,7 @@ class PortableContact
return;
}
$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation');
$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation');
Logger::log('load: ' . $url, Logger::DEBUG);
@ -134,7 +134,6 @@ class PortableContact
$location = '';
$about = '';
$keywords = '';
$gender = '';
$contact_type = -1;
$generation = 0;
@ -179,10 +178,6 @@ class PortableContact
$about = HTML::toBBCode($entry['aboutMe']);
}
if (isset($entry['gender'])) {
$gender = $entry['gender'];
}
if (isset($entry['generation']) && ($entry['generation'] > 0)) {
$generation = ++$entry['generation'];
}
@ -203,7 +198,6 @@ class PortableContact
"photo" => $profile_photo,
"about" => $about,
"location" => $location,
"gender" => $gender,
"keywords" => $keywords,
"connect" => $connect_url,
"updated" => $updated,
@ -293,7 +287,7 @@ class PortableContact
self::fetchServerlist($server["poco"]);
// Fetch all users from the other server
$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
Logger::info("Fetch all users from the server " . $server["url"]);
@ -316,7 +310,7 @@ class PortableContact
$updatedSince = date(DateTimeFormat::MYSQL, time() - $timeframe * 86400);
// Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
$url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
$url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
$success = false;
@ -376,7 +370,7 @@ class PortableContact
Logger::log('Fetch contacts for the user ' . $username . ' from the server ' . $server['nurl'], Logger::DEBUG);
// Fetch all contacts from a given user from the other server
$url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation';
$url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation';
$curlResult = Network::curl($url);
@ -409,7 +403,6 @@ class PortableContact
$location = '';
$about = '';
$keywords = '';
$gender = '';
$contact_type = -1;
$generation = $default_generation;
@ -455,10 +448,6 @@ class PortableContact
$about = HTML::toBBCode($entry['aboutMe']);
}
if (isset($entry['gender'])) {
$gender = $entry['gender'];
}
if (isset($entry['generation']) && ($entry['generation'] > 0)) {
$generation = ++$entry['generation'];
}
@ -484,7 +473,6 @@ class PortableContact
"photo" => $profile_photo,
"about" => $about,
"location" => $location,
"gender" => $gender,
"keywords" => $keywords,
"connect" => $connect_url,
"updated" => $updated,