miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Merge pull request #4033 from annando/diaspora-autofriend 

Possible fix for issue 4013
2022.09-rc
Hypolite Petovan 2017-12-07 16:12:49 -05:00 zatwierdzone przez GitHub
rodzic cf45e8738c a7b004a727
commit 16140c8f9f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 12 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
src/Protocol/Diaspora.php
Wyświetl plik

@ -992,16 +992,18 @@ class Diaspora
* That makes us friends. * That makes us friends.
* Normally this should have handled by getting a request - but this could get lost * Normally this should have handled by getting a request - but this could get lost
*/ */
if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { // It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
dba::update( // It is not removed by now. Possibly the code is needed?
'contact', //if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
array('rel' => CONTACT_IS_FRIEND, 'writable' => true), // dba::update(
array('id' => $contact["id"], 'uid' => $contact["uid"]) // 'contact',
); // array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
$contact["rel"] = CONTACT_IS_FRIEND; // );
logger("defining user ".$contact["nick"]." as friend"); //
} // $contact["rel"] = CONTACT_IS_FRIEND;
// logger("defining user ".$contact["nick"]." as friend");
//}
// We don't seem to like that person // We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) { if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {