[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)
This commit is contained in:
Roland Häder 2018-07-28 07:34:38 +02:00 committed by Hypolite Petovan
parent 05bea7c61d
commit 93fb5a6151
3 changed files with 4 additions and 3 deletions

View file

@ -1035,7 +1035,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
DBA::escape($contact->preferredUsername), DBA::escape($contact->preferredUsername),
DBA::escape($contact->image->url), DBA::escape($contact->image->url),
DBA::escape(NETWORK_PUMPIO), DBA::escape(NETWORK_PUMPIO),
intval(CONTACT_IS_FRIEND), intval(Contact::FRIEND),
intval(1), intval(1),
DBA::escape($contact->location->displayName), DBA::escape($contact->location->displayName),
DBA::escape($contact->summary), DBA::escape($contact->summary),

View file

@ -48,6 +48,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -928,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
DBA::escape($contact->screen_name), DBA::escape($contact->screen_name),
DBA::escape($contact->profile_image_url), DBA::escape($contact->profile_image_url),
DBA::escape(NETWORK_STATUSNET), DBA::escape(NETWORK_STATUSNET),
intval(CONTACT_IS_FRIEND), intval(Contact::FRIEND),
intval(1), intval(1),
DBA::escape($contact->location), DBA::escape($contact->location),
DBA::escape($contact->description), DBA::escape($contact->description),

View file

@ -1029,7 +1029,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
$fields['nurl'] = normalise_link($url); $fields['nurl'] = normalise_link($url);
$fields['alias'] = 'twitter::' . $data->id_str; $fields['alias'] = 'twitter::' . $data->id_str;
$fields['poll'] = 'twitter::' . $data->id_str; $fields['poll'] = 'twitter::' . $data->id_str;
$fields['rel'] = CONTACT_IS_FRIEND; $fields['rel'] = Contact::FRIEND;
$fields['priority'] = 1; $fields['priority'] = 1;
$fields['writable'] = true; $fields['writable'] = true;
$fields['blocked'] = false; $fields['blocked'] = false;