clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8198 from nupplaphil/bug/intro_send_share 

Fix Introduction Diaspore sendShare()
This commit is contained in:
Hypolite Petovan 2020-01-29 16:29:11 -05:00 committed by GitHub
parent f2547947c9 16e1df0b22
commit 478006c193
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Introduction.php
View File

@ -24,7 +24,7 @@ use Psr\Log\LoggerInterface;
* @property bool blocked * @property bool blocked
* @property bool ignore * @property bool ignore
*/ */
final class Introduction extends BaseModel class Introduction extends BaseModel
{ {
/** @var Repository\Introduction */ /** @var Repository\Introduction */
protected $intro; protected $intro;
@ -97,7 +97,7 @@ final class Introduction extends BaseModel
if ($newRelation == Contact::FRIEND) { if ($newRelation == Contact::FRIEND) {
if ($protocol == Protocol::DIASPORA) { 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]); $this->logger->info('share returns', ['return' => $ret]);
} elseif ($protocol == Protocol::ACTIVITYPUB) { } elseif ($protocol == Protocol::ACTIVITYPUB) {
ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $contact['uid']); ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $contact['uid']);