bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8076 from MrPetovan/bug/fatal-errors

Browse source 
Remove unnecessary subnamespaces in Model\Introduction
This commit is contained in:
Philipp 2020-01-08 23:15:02 +01:00 committed by GitHub
commit 012aa0f8a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Introduction.php
View file

@ -50,7 +50,7 @@ final class Introduction extends BaseModel
{ {
$this->logger->info('Confirming follower', ['cid' => $this->{'contact-id'}]); $this->logger->info('Confirming follower', ['cid' => $this->{'contact-id'}]);
$contact = Model\Contact::selectFirst([], ['id' => $this->{'contact-id'}, 'uid' => $this->uid]); $contact = Contact::selectFirst([], ['id' => $this->{'contact-id'}, 'uid' => $this->uid]);
if (!$contact) { if (!$contact) {
throw new HTTPException\NotFoundException('Contact record not found.'); throw new HTTPException\NotFoundException('Contact record not found.');
@ -71,12 +71,12 @@ final class Introduction extends BaseModel
if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
if ($duplex) { if ($duplex) {
$newRelation = Model\Contact::FRIEND; $newRelation = Contact::FRIEND;
} else { } else {
$newRelation = Model\Contact::FOLLOWER; $newRelation = Contact::FOLLOWER;
} }
if ($newRelation != Model\Contact::FOLLOWER) { if ($newRelation != Contact::FOLLOWER) {
$writable = 1; $writable = 1;
} }
} }
@ -95,9 +95,9 @@ final class Introduction extends BaseModel
array_merge($contact, $fields); array_merge($contact, $fields);
if ($newRelation == Model\Contact::FRIEND) { if ($newRelation == Contact::FRIEND) {
if ($protocol == Protocol::DIASPORA) { if ($protocol == Protocol::DIASPORA) {
$ret = Diaspora::sendShare(Model\Contact::getById($contact['uid']), $contact); $ret = Diaspora::sendShare(Contact::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']);
@ -136,15 +136,15 @@ final class Introduction extends BaseModel
if (!$this->fid) { if (!$this->fid) {
// When the contact entry had been created just for that intro, we want to get rid of it now // When the contact entry had been created just for that intro, we want to get rid of it now
$condition = ['id' => $this->{'contact-id'}, 'uid' => $this->uid, $condition = ['id' => $this->{'contact-id'}, 'uid' => $this->uid,
'self' => false, 'pending' => true, 'rel' => [0, Model\Contact::FOLLOWER]]; 'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
if ($this->dba->exists('contact', $condition)) { if ($this->dba->exists('contact', $condition)) {
Model\Contact::remove($this->{'contact-id'}); Contact::remove($this->{'contact-id'});
} else { } else {
$this->dba->update('contact', ['pending' => false], ['id' => $this->{'contact-id'}]); $this->dba->update('contact', ['pending' => false], ['id' => $this->{'contact-id'}]);
} }
} }
$contact = Model\Contact::selectFirst([], ['id' => $this->{'contact-id'}, 'uid' => $this->uid]); $contact = Contact::selectFirst([], ['id' => $this->{'contact-id'}, 'uid' => $this->uid]);
if (!$contact) { if (!$contact) {
throw new HTTPException\NotFoundException('Contact record not found.'); throw new HTTPException\NotFoundException('Contact record not found.');