Browse Source

Issue 8151: Automatic Friend is working again

tags/2020.03
Michael 4 weeks ago
parent
commit
e14ed2ce35
1 changed files with 10 additions and 1 deletions
  1. +10
    -1
      src/Model/Contact.php

+ 10
- 1
src/Model/Contact.php View File

@@ -2653,8 +2653,17 @@ class Contact
]);
}
} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
self::createFromProbe($importer['uid'], $url, false, $network);
}

$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
DBA::update('contact', ['pending' => false], $condition);
$fields = ['pending' => false];
if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) {
$fields['rel'] = Contact::FRIEND;
}

DBA::update('contact', $fields, $condition);

return true;
}


Loading…
Cancel
Save