diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-12-05 10:49:44 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-12-05 10:49:44 +0100 |
| commit | 9d71a7b50c710f12051dba04e05c3dc366798bd1 (patch) | |
| tree | 286f1f4bdffe79de840aca2094184793f7715ab9 /lib | |
| parent | 61a28c21711332edca0642ca153f6854ed33591c (diff) | |
Fix following and actor_info for account stream
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Db/NotesRequest.php | 1 | ||||
| -rw-r--r-- | lib/Service/ActivityPub/FollowService.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Db/NotesRequest.php b/lib/Db/NotesRequest.php index ec9aca9f..b4de9316 100644 --- a/lib/Db/NotesRequest.php +++ b/lib/Db/NotesRequest.php @@ -204,6 +204,7 @@ class NotesRequest extends NotesRequestBuilder { $this->limitToRecipient($qb, ActivityService::TO_PUBLIC); $this->limitPaginate($qb, $since, $limit); $this->limitToAttributedTo($qb, $actorId); + $this->leftJoinCacheActors($qb, 'attributed_to'); $notes = []; $cursor = $qb->execute(); diff --git a/lib/Service/ActivityPub/FollowService.php b/lib/Service/ActivityPub/FollowService.php index e243c271..4e9942af 100644 --- a/lib/Service/ActivityPub/FollowService.php +++ b/lib/Service/ActivityPub/FollowService.php @@ -136,7 +136,7 @@ class FollowService implements ICoreService { } catch (FollowDoesNotExistException $e) { $this->followsRequest->save($follow); // TODO - Remove this auto-accepted. -// $this->followsRequest->accepted($follow); + $this->followsRequest->accepted($follow); $follow->addInstancePath( new InstancePath( |