From d75cd8a00a88a52e6d7bf67c91ba464c81c644c1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 21 Dec 2022 22:21:22 +0000
Subject: [PATCH] The GNU-Social import is removed

---
 src/Module/Contact/Follow.php        |  5 ++---
 src/Module/Search/Acl.php            |  4 ++--
 src/Module/User/PortableContacts.php |  4 ----
 src/Protocol/DFRN.php                |  4 ++--
 src/Protocol/OStatus.php             | 10 ++++------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index f8b88c05fc..0b4363b4c1 100644
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -105,11 +105,10 @@ class Follow extends BaseModule
 
 		// Don't try to add a pending contact
 		$userContact = Contact::selectFirst(['pending'], [
-			"`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+			"`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 			$uid, Contact::FOLLOWER, Protocol::DFRN,
 			Strings::normaliseLink($url),
-			Strings::normaliseLink($url), $url,
-			Protocol::STATUSNET]);
+			Strings::normaliseLink($url), $url]);
 
 		if (!empty($userContact['pending'])) {
 			$this->sysMessages->addNotice($this->t('You already added this contact.'));
diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index ddf45303b3..9f072b91c9 100644
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -135,13 +135,13 @@ class Acl extends BaseModule
 		switch ($type) {
 			case self::TYPE_MENTION_CONTACT_GROUP:
 				$condition = DBA::mergeConditions($condition,
-					["NOT `self` AND NOT `blocked` AND `notify` != ? AND NOT `network` IN (?, ?)", '', Protocol::OSTATUS, Protocol::STATUSNET
+					["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS
 				]);
 				break;
 
 			case self::TYPE_MENTION_CONTACT:
 				$condition = DBA::mergeConditions($condition,
-					["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::STATUSNET
+					["NOT `self` AND NOT `blocked` AND `notify` != ?", ''
 				]);
 				break;
 
diff --git a/src/Module/User/PortableContacts.php b/src/Module/User/PortableContacts.php
index 6a3c1201d9..9f98ca7ebe 100644
--- a/src/Module/User/PortableContacts.php
+++ b/src/Module/User/PortableContacts.php
@@ -223,10 +223,6 @@ class PortableContacts extends BaseModule
 
 			if ($selectedFields['network']) {
 				$entry['network'] = $contact['network'];
-				if ($entry['network'] == Protocol::STATUSNET) {
-					$entry['network'] = Protocol::OSTATUS;
-				}
-
 				if (($entry['network'] == '') && ($contact['self'])) {
 					$entry['network'] = Protocol::DFRN;
 				}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 9900708ed0..e29cfcc5ab 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1066,8 +1066,8 @@ class DFRN
 
 		$fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
 			'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
-		$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked`",
-			$importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET];
+		$condition = ["`uid` = ? AND `nurl` = ? AND NOT `pending` AND NOT `blocked`",
+			$importer["importer_uid"], Strings::normaliseLink($author["link"])];
 
 		if ($importer['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
 			$condition = DBA::mergeConditions($condition, ['rel' => [Contact::SHARING, Contact::FRIEND]]);
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index ee9c015a9c..81a0c38842 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -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,
 			]);