Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 11:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked

Browse source 
Contact requests blocked
This commit is contained in:
Philipp 2019-05-25 20:20:36 +02:00 • committed by GitHub
commit 5c2cca432f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 80 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/OStatus.php
View file

@ -417,13 +417,6 @@ class OStatus
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
if ($value != "") {
$nickname = $value;
} else {
$nickname = $author["author-name"];
}
$item = array_merge($header, $author);
$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
@ -463,7 +456,7 @@ class OStatus
}
if ($item["verb"] == ACTIVITY_FOLLOW) {
Contact::addRelationship($importer, $contact, $item, $nickname);
Contact::addRelationship($importer, $contact, $item);
continue;
}