Merge pull request #10857 from annando/no-q

[friendica.git] / src / Model / Introduction.php

diff --git a/src/Model/Introduction.php b/src/Model/Introduction.php
index 8b939aa2a58def146def3905bcbbc523806b6776..aa718912143dc520f71a1e80db9de22e51189560 100644 (file)
--- a/src/Model/Introduction.php
+++ b/src/Model/Introduction.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -110,7 +110,7 @@ class Introduction extends BaseModel
                        'hidden'    => $hidden ?? $contact['hidden'],
                        'rel'       => $newRelation,
                ];
-               $this->dba->update('contact', $fields, ['id' => $contact['id']]);
+               Contact::update($fields, ['id' => $contact['id']]);
 
                array_merge($contact, $fields);
 
@@ -159,24 +159,21 @@ class Introduction extends BaseModel
                        if ($this->dba->exists('contact', $condition)) {
                                Contact::remove($this->{'contact-id'});
                        } else {
-                               $this->dba->update('contact', ['pending' => false], ['id' => $this->{'contact-id'}]);
+                               Contact::update(['pending' => false], ['id' => $this->{'contact-id'}]);
                        }
                }
 
                $contact = Contact::selectFirst([], ['id' => $this->{'contact-id'}, 'uid' => $this->uid]);
+               if (!empty($contact)) {
+                       if (!empty($contact['protocol'])) {
+                               $protocol = $contact['protocol'];
+                       } else {
+                               $protocol = $contact['network'];
+                       }
 
-               if (!$contact) {
-                       throw new HTTPException\NotFoundException('Contact record not found.');
-               }
-
-               if (!empty($contact['protocol'])) {
-                       $protocol = $contact['protocol'];
-               } else {
-                       $protocol = $contact['network'];
-               }
-
-               if ($protocol == Protocol::ACTIVITYPUB) {
-                       ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $contact['uid']);
+                       if ($protocol == Protocol::ACTIVITYPUB) {
+                               ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $contact['uid']);
+                       }
                }
 
                return $this->intro->delete($this);