Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-09 16:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490)

Browse source 
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
This commit is contained in:
Roland Häder 2018-07-25 04:53:46 +02:00 • committed by Hypolite Petovan
parent cff90e20f2
commit 37253656e3
26 changed files with 139 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Protocol/Diaspora.php
View file

@ -177,7 +177,7 @@ class Diaspora
'name' => 'relay', 'nick' => 'relay',
'url' => $server_url, 'network' => NETWORK_DIASPORA,
'batch' => $server_url . '/receive/public',
'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false,
'rel' => Contact::FOLLOWER, 'blocked' => false,
'pending' => false, 'writable' => true];
$fields = array_merge($fields, $network_fields);
@ -1079,14 +1079,14 @@ class Diaspora
*/
// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
// It is not removed by now. Possibly the code is needed?
//if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
// dba::update(
// 'contact',
// array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
// array('rel' => Contact::FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
// );
//
// $contact["rel"] = CONTACT_IS_FRIEND;
// $contact["rel"] = Contact::FRIEND;
// logger("defining user ".$contact["nick"]." as friend");
//}
@ -1095,11 +1095,11 @@ class Diaspora
// Maybe blocked, don't accept.
return false;
// We are following this person?
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
} elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) {
// Yes, then it is fine.
return true;
// Is it a post to a community?
} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
} elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
// That's good
return true;
// Is the message a global user or a comment?
@ -2305,10 +2305,10 @@ class Diaspora
{
$a = get_app();
if ($contact["rel"] == CONTACT_IS_SHARING) {
if ($contact["rel"] == Contact::SHARING) {
DBA::update(
'contact',
['rel' => CONTACT_IS_FRIEND, 'writable' => true],
['rel' => Contact::FRIEND, 'writable' => true],
['id' => $contact["id"], 'uid' => $importer["uid"]]
);
}
@ -2359,7 +2359,7 @@ class Diaspora
// If we are now friends, we are sending a share message.
// Normally we needn't to do so, but the first message could have been vanished.
if (in_array($contact["rel"], [CONTACT_IS_FRIEND])) {
if (in_array($contact["rel"], [Contact::FRIEND])) {
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if ($u) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
@ -2455,16 +2455,16 @@ class Diaspora
Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
// technically they are sharing with us (CONTACT_IS_SHARING),
// technically they are sharing with us (Contact::SHARING),
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
// we are going to change the relationship and make them a follower.
if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
$new_relation = CONTACT_IS_FRIEND;
$new_relation = Contact::FRIEND;
} elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
$new_relation = CONTACT_IS_SHARING;
$new_relation = Contact::SHARING;
} else {
$new_relation = CONTACT_IS_FOLLOWER;
$new_relation = Contact::FOLLOWER;
}
$r = q(
@ -3269,13 +3269,15 @@ class Diaspora
/*
switch ($contact["rel"]) {
case CONTACT_IS_FRIEND:
case Contact::FRIEND:
$following = true;
$sharing = true;
case CONTACT_IS_SHARING:
case Contact::SHARING:
$following = false;
$sharing = true;
case CONTACT_IS_FOLLOWER:
case Contact::FOLLOWER:
$following = true;
$sharing = false;
}
@ -4131,7 +4133,7 @@ class Diaspora
AND `uid` = %d AND `rel` != %d",
DBA::escape(NETWORK_DIASPORA),
intval($uid),
intval(CONTACT_IS_SHARING)
intval(Contact::SHARING)
);
}