From da2d49ba4338ff0815123271013f4859152f4d2c Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 29 Jan 2020 22:20:59 +0100 Subject: [PATCH 1/2] Fix Introduction Diaspore sendShare() --- src/Model/Introduction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Introduction.php b/src/Model/Introduction.php index 68d598e344..a0774c10ee 100644 --- a/src/Model/Introduction.php +++ b/src/Model/Introduction.php @@ -97,7 +97,7 @@ final class Introduction extends BaseModel if ($newRelation == Contact::FRIEND) { if ($protocol == Protocol::DIASPORA) { - $ret = Diaspora::sendShare(Contact::getById($contact['uid']), $contact); + $ret = Diaspora::sendShare(User::getById($contact['uid']), $contact); $this->logger->info('share returns', ['return' => $ret]); } elseif ($protocol == Protocol::ACTIVITYPUB) { ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $contact['uid']); From 16e1df0b22ccc4a4c307e02859deadcd57c46e70 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 29 Jan 2020 22:27:55 +0100 Subject: [PATCH 2/2] final keyword removed :-) --- src/Model/Introduction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Introduction.php b/src/Model/Introduction.php index a0774c10ee..4233ad6541 100644 --- a/src/Model/Introduction.php +++ b/src/Model/Introduction.php @@ -24,7 +24,7 @@ use Psr\Log\LoggerInterface; * @property bool blocked * @property bool ignore */ -final class Introduction extends BaseModel +class Introduction extends BaseModel { /** @var Repository\Introduction */ protected $intro;