X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FIntroduction.php;h=aab4a9a8e47667857b74034671c446b9127a81f3;hb=741bc98174f81b9cd65432716a21168dd34468a7;hp=e6cd4f852596ebaefde47cc2935d527259ad329e;hpb=36190d1e79ff43b5ec81dbe953535c81d41bcce9;p=friendica.git

diff --git a/src/Model/Introduction.php b/src/Model/Introduction.php
index e6cd4f8525..aab4a9a8e4 100644
--- a/src/Model/Introduction.php
+++ b/src/Model/Introduction.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Model;
 
@@ -22,9 +41,9 @@ use Psr\Log\LoggerInterface;
  * @property string hash
  * @property string datetime
  * @property bool   blocked
- * @property bool   ignored
+ * @property bool   ignore
  */
-final class Introduction extends BaseModel
+class Introduction extends BaseModel
 {
 	/** @var Repository\Introduction */
 	protected $intro;
@@ -97,7 +116,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']);
@@ -116,7 +135,7 @@ final class Introduction extends BaseModel
 	 */
 	public function ignore()
 	{
-		$this->ignored = true;
+		$this->ignore = true;
 
 		return $this->intro->update($this);
 	}
@@ -145,19 +164,16 @@ final class Introduction extends BaseModel
 		}
 
 		$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);