Merge pull request #5824 from annando/fix-follow
Following a soapbox now works / rapid follow/unfollow should work now
This commit is contained in:
commit
be7bd10678
2 changed files with 7 additions and 1 deletions
|
@ -1917,6 +1917,12 @@ class Contact extends BaseObject
|
|||
} elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
|
||||
$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
|
||||
DBA::update('contact', ['pending' => false], $condition);
|
||||
|
||||
$contact = DBA::selectFirst('contact', ['url', 'network', 'hub-verify'], ['id' => $contact_record['id']]);
|
||||
|
||||
if ($contact['network'] == Protocol::ACTIVITYPUB) {
|
||||
ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -283,7 +283,7 @@ class Processor
|
|||
|
||||
$cid = Contact::getIdForURL($activity['owner'], $uid);
|
||||
if (!empty($cid)) {
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
|
||||
} else {
|
||||
$contact = false;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue