X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=5e34636b215f8900b84f964723e0fa068da84da7;hb=79a646550f4498440d6ee3148b17b3b0d6d5e743;hp=ee9c015a9c44260aa92bbb7c5f8237615b4272f2;hpb=d26b0ed5a2b5cd66954816096ba87c05043826f0;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index ee9c015a9c..5e34636b21 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -103,9 +103,9 @@ class OStatus
 */
 		if ($aliaslink != '') {
 			$contact = DBA::selectFirst('contact', [], [
-				"`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
+				"`uid` = ? AND `alias` = ? AND `rel` IN (?, ?)",
 				$importer['uid'],
-				$aliaslink, Protocol::STATUSNET,
+				$aliaslink,
 				Contact::SHARING, Contact::FRIEND,
 			]);
 		}
@@ -116,11 +116,10 @@ class OStatus
 			}
 
 			$contact = DBA::selectFirst('contact', [], [
-				"`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
+				"`uid` = ? AND `nurl` IN (?, ?) AND `rel` IN (?, ?)",
 				$importer['uid'],
 				Strings::normaliseLink($author['author-link']),
 				Strings::normaliseLink($aliaslink),
-				Protocol::STATUSNET,
 				Contact::SHARING,
 				Contact::FRIEND,
 			]);
@@ -128,10 +127,9 @@ class OStatus
 
 		if (!DBA::isResult($contact) && ($addr != '')) {
 			$contact = DBA::selectFirst('contact', [], [
-				"`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
+				"`uid` = ? AND `addr` = ? AND `rel` IN (?, ?)",
 				$importer['uid'],
 				$addr,
-				Protocol::STATUSNET,
 				Contact::SHARING,
 				Contact::FRIEND,
 			]);
@@ -1553,7 +1551,7 @@ class OStatus
 
 			if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
 				$contact = Contact::getByURL($item['author-link']) ?: $owner;
-				$contact['nickname'] = $contact['nickname'] ?? $contact['nick']; 
+				$contact['nickname'] = $contact['nickname'] ?? $contact['nick'];
 				$author = self::addAuthor($doc, $contact, false);
 				$entry->appendChild($author);
 			}