From 93fb5a6151ac4faea1bdbcf10b5f49559949c765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <Quix0r@users.noreply.github.com>
Date: Sat, 28 Jul 2018 07:34:38 +0200
Subject: [PATCH] [cross] Moved CONTACT_* constants to class
 Friendica\Model\Contact (#670)

* [cross] Moved CONTACT_* constants to class Friendica\Model\Contact

* Other PR request:
- renamed Contact::CONTACT_IS_* to just plain Contact::* :-) (MrPetovan)
---
 pumpio/pumpio.php       | 2 +-
 statusnet/statusnet.php | 3 ++-
 twitter/twitter.php     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5cda94d07..eea1c2845 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1035,7 +1035,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 			DBA::escape($contact->preferredUsername),
 			DBA::escape($contact->image->url),
 			DBA::escape(NETWORK_PUMPIO),
-			intval(CONTACT_IS_FRIEND),
+			intval(Contact::FRIEND),
 			intval(1),
 			DBA::escape($contact->location->displayName),
 			DBA::escape($contact->summary),
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 58f4485e1..6f987f36b 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -48,6 +48,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -928,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 			DBA::escape($contact->screen_name),
 			DBA::escape($contact->profile_image_url),
 			DBA::escape(NETWORK_STATUSNET),
-			intval(CONTACT_IS_FRIEND),
+			intval(Contact::FRIEND),
 			intval(1),
 			DBA::escape($contact->location),
 			DBA::escape($contact->description),
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 591887057..8ac6197bf 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1029,7 +1029,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 		$fields['nurl'] = normalise_link($url);
 		$fields['alias'] = 'twitter::' . $data->id_str;
 		$fields['poll'] = 'twitter::' . $data->id_str;
-		$fields['rel'] = CONTACT_IS_FRIEND;
+		$fields['rel'] = Contact::FRIEND;
 		$fields['priority'] = 1;
 		$fields['writable'] = true;
 		$fields['blocked'] = false;