mirror
/
social
kopia lustrzana https://github.com/nextcloud/social
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fill followId and confirm local followers 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/134/head
Maxence Lange 2018-12-04 22:52:47 -01:00 zatwierdzone przez Julius Härtl
rodzic aa3d417edb
commit 6af499a817
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4C614C6ED2CDE6DF
1 zmienionych plików z 11 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
lib/Service/ActivityPub/FollowService.php
Wyświetl plik

@ -129,11 +129,14 @@ class FollowService implements ICoreService {
$follow->generateUniqueId();
$follow->setActorId($actor->getId());
$follow->setObjectId($remoteActor->getId());
$follow->setFollowId($remoteActor->getFollowers());
try {
$this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
} catch (FollowDoesNotExistException $e) {
$this->followsRequest->save($follow);
// TODO - Remove this auto-accepted.
// $this->followsRequest->accepted($follow);
$follow->addInstancePath(
new InstancePath(
@ -258,7 +261,14 @@ class FollowService implements ICoreService {
$follow->checkOrigin($follow->getActorId());
try {
$this->followsRequest->getByPersons($follow->getActorId(), $follow->getObjectId());
$knownFollow = $this->followsRequest->getByPersons(
$follow->getActorId(), $follow->getObjectId()
);
// in case of local follower.
// TODO - remove when following a local account does not need curl request anymore
if ($knownFollow->getId() === $follow->getId() && !$knownFollow->isAccepted()) {
$this->confirmFollowRequest($follow);
}
} catch (FollowDoesNotExistException $e) {
$actor = $this->personService->getFromId($follow->getObjectId());
if ($actor->isLocal()) {