Move follow functions
move follow functions into Contact class
This commit is contained in:
Adam Magness
parent
c3cfbbc461
commit
878ce3b858
|
|
@ -1009,4 +1009,280 @@ class Contact extends BaseObject
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param integer $id contact id
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
function update_contact($id)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
|
||||||
|
This will reliably kill your communication with Friendica contacts.
|
||||||
|
*/
|
||||||
|
|
||||||
|
$r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `network` FROM `contact` WHERE `id` = %d", intval($id));
|
||||||
|
if (!$r) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ret = Probe::uri($r[0]["url"]);
|
||||||
|
|
||||||
|
// If Probe::uri fails the network code will be different
|
||||||
|
if ($ret["network"] != $r[0]["network"]) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$update = false;
|
||||||
|
|
||||||
|
// make sure to not overwrite existing values with blank entries
|
||||||
|
foreach ($ret AS $key => $val) {
|
||||||
|
if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == ""))
|
||||||
|
$ret[$key] = $r[0][$key];
|
||||||
|
|
||||||
|
if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key]))
|
||||||
|
$update = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$update) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s' WHERE `id` = %d",
|
||||||
|
dbesc($ret['url']),
|
||||||
|
dbesc(normalise_link($ret['url'])),
|
||||||
|
dbesc($ret['addr']),
|
||||||
|
dbesc($ret['alias']),
|
||||||
|
dbesc($ret['batch']),
|
||||||
|
dbesc($ret['notify']),
|
||||||
|
dbesc($ret['poll']),
|
||||||
|
dbesc($ret['poco']),
|
||||||
|
intval($id)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Update the corresponding gcontact entry
|
||||||
|
PortableContact::lastUpdated($ret["url"]);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Takes a $uid and a url/handle and adds a new contact
|
||||||
|
* Currently if the contact is DFRN, interactive needs to be true, to redirect to the
|
||||||
|
* dfrn_request page.
|
||||||
|
*
|
||||||
|
* Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
|
||||||
|
*
|
||||||
|
* Returns an array
|
||||||
|
* $return['success'] boolean true if successful
|
||||||
|
* $return['message'] error text if success is false.
|
||||||
|
*
|
||||||
|
* @brief Takes a $uid and a url/handle and adds a new contact
|
||||||
|
* @param int $uid
|
||||||
|
* @param string $url
|
||||||
|
* @param bool $interactive
|
||||||
|
* @param string $network
|
||||||
|
* @return boolean|string
|
||||||
|
*/
|
||||||
|
function new_contact($uid, $url, $interactive = false, $network = '')
|
||||||
|
{
|
||||||
|
$result = array('cid' => -1, 'success' => false, 'message' => '');
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
|
// remove ajax junk, e.g. Twitter
|
||||||
|
$url = str_replace('/#!/', '/', $url);
|
||||||
|
|
||||||
|
if (!allowed_url($url)) {
|
||||||
|
$result['message'] = t('Disallowed profile URL.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (blocked_url($url)) {
|
||||||
|
$result['message'] = t('Blocked domain');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$url) {
|
||||||
|
$result['message'] = t('Connect URL missing.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$arr = array('url' => $url, 'contact' => array());
|
||||||
|
|
||||||
|
call_hooks('follow', $arr);
|
||||||
|
|
||||||
|
if (x($arr['contact'], 'name')) {
|
||||||
|
$ret = $arr['contact'];
|
||||||
|
} else {
|
||||||
|
$ret = Probe::uri($url, $network, $uid, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($network != '') && ($ret['network'] != $network)) {
|
||||||
|
logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ret['network'] === NETWORK_DFRN) {
|
||||||
|
if ($interactive) {
|
||||||
|
if (strlen($a->path)) {
|
||||||
|
$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
|
||||||
|
} else {
|
||||||
|
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||||
|
}
|
||||||
|
|
||||||
|
goaway($ret['request'] . "&addr=$myaddr");
|
||||||
|
|
||||||
|
// NOTREACHED
|
||||||
|
}
|
||||||
|
} elseif (Config::get('system', 'dfrn_only')) {
|
||||||
|
$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
|
||||||
|
$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This extra param just confuses things, remove it
|
||||||
|
if ($ret['network'] === NETWORK_DIASPORA) {
|
||||||
|
$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// do we have enough information?
|
||||||
|
|
||||||
|
if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
|
||||||
|
$result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
|
||||||
|
if (!x($ret, 'poll')) {
|
||||||
|
$result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
}
|
||||||
|
if (!x($ret, 'name')) {
|
||||||
|
$result['message'] .= t('An author or name was not found.') . EOL;
|
||||||
|
}
|
||||||
|
if (!x($ret, 'url')) {
|
||||||
|
$result['message'] .= t('No browser URL could be matched to this address.') . EOL;
|
||||||
|
}
|
||||||
|
if (strpos($url, '@') !== false) {
|
||||||
|
$result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
|
||||||
|
$result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
|
||||||
|
$result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
|
||||||
|
$ret['notify'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$ret['notify']) {
|
||||||
|
$result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
|
||||||
|
|
||||||
|
$subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false);
|
||||||
|
|
||||||
|
$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
|
||||||
|
|
||||||
|
if (in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) {
|
||||||
|
$writeable = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if we already have a contact
|
||||||
|
// the poll url is more reliable than the profile url, as we may have
|
||||||
|
// indirect links or webfinger links
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' LIMIT 1",
|
||||||
|
intval($uid),
|
||||||
|
dbesc($ret['poll']),
|
||||||
|
dbesc(normalise_link($ret['poll'])),
|
||||||
|
dbesc($ret['network'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!DBM::is_result($r)) {
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
|
||||||
|
intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (DBM::is_result($r)) {
|
||||||
|
// update contact
|
||||||
|
$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
||||||
|
|
||||||
|
$fields = array('rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false);
|
||||||
|
dba::update('contact', $fields, array('id' => $r[0]['id']));
|
||||||
|
} else {
|
||||||
|
$new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
||||||
|
|
||||||
|
// create contact record
|
||||||
|
q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,
|
||||||
|
`writable`, `hidden`, `blocked`, `readonly`, `pending`, `subhub` )
|
||||||
|
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0, %d ) ",
|
||||||
|
intval($uid),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc($ret['url']),
|
||||||
|
dbesc(normalise_link($ret['url'])),
|
||||||
|
dbesc($ret['addr']),
|
||||||
|
dbesc($ret['alias']),
|
||||||
|
dbesc($ret['batch']),
|
||||||
|
dbesc($ret['notify']),
|
||||||
|
dbesc($ret['poll']),
|
||||||
|
dbesc($ret['poco']),
|
||||||
|
dbesc($ret['name']),
|
||||||
|
dbesc($ret['nick']),
|
||||||
|
dbesc($ret['network']),
|
||||||
|
dbesc($ret['pubkey']),
|
||||||
|
intval($new_relation),
|
||||||
|
intval($ret['priority']),
|
||||||
|
intval($writeable),
|
||||||
|
intval($hidden),
|
||||||
|
intval($subhub)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
|
dbesc($ret['url']),
|
||||||
|
dbesc($ret['network']),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!DBM::is_result($r)) {
|
||||||
|
$result['message'] .= t('Unable to retrieve contact information.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contact = $r[0];
|
||||||
|
$contact_id = $r[0]['id'];
|
||||||
|
$result['cid'] = $contact_id;
|
||||||
|
|
||||||
|
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
|
||||||
|
|
||||||
|
// Update the avatar
|
||||||
|
Contact::updateAvatar($ret['photo'], $uid, $contact_id);
|
||||||
|
|
||||||
|
// pull feed and consume it, which should subscribe to the hub.
|
||||||
|
|
||||||
|
Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
|
||||||
|
|
||||||
|
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (DBM::is_result($r)) {
|
||||||
|
if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
||||||
|
// create a follow slap
|
||||||
|
$item = array();
|
||||||
|
$item['verb'] = ACTIVITY_FOLLOW;
|
||||||
|
$item['follow'] = $contact["url"];
|
||||||
|
$slap = OStatus::salmon($item, $r[0]);
|
||||||
|
Salmon::slapper($r[0], $contact['notify'], $slap);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($contact['network'] == NETWORK_DIASPORA) {
|
||||||
|
$ret = Diaspora::sendShare($a->user, $contact);
|
||||||
|
logger('share returns: ' . $ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result['success'] = true;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user