diff --git a/include/follow.php b/include/follow.php deleted file mode 100644 index 9aedafb64d..0000000000 --- a/include/follow.php +++ /dev/null @@ -1,290 +0,0 @@ - $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; -} diff --git a/mod/contacts.php b/mod/contacts.php index b347617a1c..f673f84f10 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -14,7 +14,6 @@ use Friendica\Network\Probe; require_once 'include/contact_selectors.php'; require_once 'include/contact_widgets.php'; -require_once 'include/follow.php'; require_once 'mod/proxy.php'; function contacts_init(App $a) @@ -243,7 +242,7 @@ function _contact_update($contact_id) $uid = $contact["uid"]; if ($r[0]["network"] == NETWORK_OSTATUS) { - $result = new_contact($uid, $contact["url"], false, $contact["network"]); + $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]); if ($result['success']) { q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id)); @@ -275,7 +274,7 @@ function _contact_update_profile($contact_id) $update = array(); if ($data["network"] == NETWORK_OSTATUS) { - $result = new_contact($uid, $data["url"], false); + $result = Contact::createFromProbe($uid, $data["url"], false); if ($result['success']) { $update["subhub"] = true; diff --git a/mod/follow.php b/mod/follow.php index 41c008da51..503410fd09 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -1,12 +1,13 @@ ".t("Keep this window open until done.")."

"; - $result = new_contact($uid,$r[0]["url"],true); + $result = Contact::createFromProbe($uid,$r[0]["url"],true); $a->page['htmlhead'] = ''; diff --git a/mod/salmon.php b/mod/salmon.php index bd08431a4c..3a4dececde 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -5,12 +5,12 @@ use Friendica\App; use Friendica\Core\PConfig; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; use Friendica\Util\Crypto; require_once 'include/items.php'; -require_once 'include/follow.php'; function salmon_return($val) { @@ -164,7 +164,7 @@ function salmon_post(App $a) { if (! DBM::is_result($r)) { logger('mod-salmon: Author unknown to us.'); if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) { - $result = new_contact($importer['uid'],$author_link); + $result = Contact::createFromProbe($importer['uid'], $author_link); if($result['success']) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') AND `uid` = %d LIMIT 1", diff --git a/mod/unfollow.php b/mod/unfollow.php index 907982cd8a..98ad9fd026 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -1,11 +1,12 @@ $id], ['limit' => 1]); + if (!DBM::is_result($r)) { + return false; + } + + $ret = Probe::uri($r["url"]); + + // If Probe::uri fails the network code will be different + if ($ret["network"] != $r["network"]) { + return false; + } + + $update = false; + + // make sure to not overwrite existing values with blank entries + foreach ($ret as $key => $val) { + if (isset($r[$key]) && ($r[$key] != "") && ($val == "")) + $ret[$key] = $r[$key]; + + if (isset($r[$key]) && ($ret[$key] != $r[$key])) + $update = true; + } + + if (!$update) { + return true; + } + + dba::update( + 'contact', + [ + 'url' => $ret['url'], + 'nurl' => normalise_link($ret['url']), + 'addr' => $ret['addr'], + 'alias' => $ret['alias'], + 'batch' => $ret['batch'], + 'notify' => $ret['notify'], + 'poll' => $ret['poll'], + 'poco' => $ret['poco'] + ], + ['id' => $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 + */ + public static function createFromProbe($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 + dba::insert( + 'contact', + [ + 'uid' => $uid, + 'created' => datetime_convert(), + 'url' => $ret['url'], + 'nurl' => normalise_link($ret['url']), + 'addr' => $ret['addr'], + 'alias' => $ret['alias'], + 'batch' => $ret['batch'], + `notify` => $ret['notify'], + `poll` => $ret['poll'], + `poco` => $ret['poco'], + `name` => $ret['name'], + `nick` => $ret['nick'], + `network` => $ret['network'], + `pubkey` => $ret['pubkey'], + `rel` => $new_relation, + `priority` => $ret['priority'], + `writable` => $writeable, + `hidden` => $hidden, + `blocked` => 0, + `readonly` => 0, + `pending` => 0, + `subhub` => $subhub + ] + ); + } + + $r = dba::select('contact', ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid], ['limit' => 1]); + + if (!DBM::is_result($r)) { + $result['message'] .= t('Unable to retrieve contact information.') . EOL; + return $result; + } + + $contact = $r; + $contact_id = $r['id']; + $result['cid'] = $contact_id; + + Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id); + + // Update the avatar + self::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; + } } diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 3c284b29f5..1140f7a4e0 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -26,7 +26,6 @@ require_once 'include/bbcode.php'; require_once 'include/items.php'; require_once 'mod/share.php'; require_once 'include/enotify.php'; -require_once 'include/follow.php'; require_once 'include/api.php'; require_once 'mod/proxy.php'; diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 9cb33c471b..a527bf0da1 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -13,7 +13,6 @@ use Friendica\Protocol\PortableContact; use dba; require_once 'include/dba.php'; -require_once 'include/follow.php'; Class OnePoll { @@ -118,7 +117,7 @@ Class OnePoll return; } - if (!update_contact($contact["id"])) { + if (!Contact::updateFromProbe($contact["id"])) { Contact::markForArchival($contact); logger('Contact is marked dead');