X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=1bbc0228a806a46dc7729ef1a852e7d12d53cb81;hb=c4ea3bfb3e8a603aacd386438b23fe5a59068114;hp=b18159d40cf0cf823bba43b082e6d897af214b9c;hpb=1ca8d573e6383fb45d23cf8d761f2135e4818fcc;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index b18159d40c..1bbc0228a8 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -17,6 +17,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
@@ -94,6 +95,210 @@ class Contact extends BaseObject
 	 * @}
 	 */
 
+	/**
+	 * @brief Returns the contact id for the user and the public contact id for a given contact id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return array with public and user's contact id
+	 */
+	private static function getPublicAndUserContacID($cid, $uid)
+	{
+		if (empty($uid) || empty($cid)) {
+			return [];
+		}
+
+		$contact = DBA::selectFirst('contact', ['id', 'uid', 'url'], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
+			return [];
+		}
+
+		// We quit when the user id don't match the user id of the provided contact
+		if (($contact['uid'] != $uid) && ($contact['uid'] != 0)) {
+			return [];
+		}
+
+		if ($contact['uid'] != 0) {
+			$pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+			if (empty($pcid)) {
+				return [];
+			}
+			$ucid = $contact['id'];
+		} else {
+			$pcid = $contact['id'];
+			$ucid = Contact::getIdForURL($contact['url'], $uid, true);
+		}
+
+		return ['public' => $pcid, 'user' => $ucid];
+	}
+
+	/**
+	 * @brief Block contact id for user id
+	 *
+	 * @param int     $cid     Either public contact id or user's contact id
+	 * @param int     $uid     User ID
+	 * @param boolean $blocked Is the contact blocked or unblocked?
+	 */
+	public static function setBlockedForUser($cid, $uid, $blocked)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		if ($cdata['user'] != 0) {
+			DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
+		}
+
+		DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "block" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id blocked for the given user?
+	 */
+	public static function isBlockedByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$public_blocked = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$public_blocked = $public_contact['blocked'];
+			}
+		}
+
+		$user_blocked = $public_blocked;
+
+		if (!empty($cdata['user'])) {
+			$user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]);
+			if (DBA::isResult($user_contact)) {
+				$user_blocked = $user_contact['blocked'];
+			}
+		}
+
+		if ($user_blocked != $public_blocked) {
+			DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+		}
+
+		return $user_blocked;
+	}
+
+	/**
+	 * @brief Ignore contact id for user id
+	 *
+	 * @param int     $cid     Either public contact id or user's contact id
+	 * @param int     $uid     User ID
+	 * @param boolean $ignored Is the contact ignored or unignored?
+	 */
+	public static function setIgnoredForUser($cid, $uid, $ignored)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		if ($cdata['user'] != 0) {
+			DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]);
+		}
+
+		DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "ignore" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id ignored for the given user?
+	 */
+	public static function isIgnoredByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$public_ignored = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$public_ignored = $public_contact['ignored'];
+			}
+		}
+
+		$user_ignored = $public_ignored;
+
+		if (!empty($cdata['user'])) {
+			$user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
+			if (DBA::isResult($user_contact)) {
+				$user_ignored = $user_contact['readonly'];
+			}
+		}
+
+		if ($user_ignored != $public_ignored) {
+			DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+		}
+
+		return $user_ignored;
+	}
+
+	/**
+	 * @brief Set "collapsed" for contact id and user id
+	 *
+	 * @param int     $cid       Either public contact id or user's contact id
+	 * @param int     $uid       User ID
+	 * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+	 */
+	public static function setCollapsedForUser($cid, $uid, $collapsed)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "collapsed" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id blocked for the given user?
+	 */
+	public static function isCollapsedByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$collapsed = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$collapsed = $public_contact['collapsed'];
+			}
+		}
+
+		return $collapsed;
+	}
+
 	/**
 	 * @brief Returns a list of contacts belonging in a group
 	 *
@@ -324,13 +529,16 @@ class Contact extends BaseObject
 	/**
 	 * @brief Sends an unfriend message. Does not remove the contact
 	 *
-	 * @param array $user    User unfriending
-	 * @param array $contact Contact unfriended
+	 * @param array   $user     User unfriending
+	 * @param array   $contact  Contact unfriended
+	 * @param boolean $dissolve Remove the contact on the remote side
 	 * @return void
 	 */
-	public static function terminateFriendship(array $user, array $contact)
+	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
-		if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+			DFRN::deliver($user, $contact, 'placeholder', true);
+		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
 			// create an unfollow slap
 			$item = [];
 			$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
@@ -364,6 +572,16 @@ class Contact extends BaseObject
 	 */
 	public static function markForArchival(array $contact)
 	{
+		if (!isset($contact['url']) && !empty($contact['id'])) {
+			$fields = ['id', 'url', 'archive', 'self', 'term-date'];
+			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			if (!DBA::isResult($contact)) {
+				return;
+			}
+		} elseif (!isset($contact['url'])) {
+			logger('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+		}
+
 		// Contact already archived or "self" contact? => nothing to do
 		if ($contact['archive'] || $contact['self']) {
 			return;
@@ -371,10 +589,7 @@ class Contact extends BaseObject
 
 		if ($contact['term-date'] <= NULL_DATE) {
 			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-
-			if ($contact['url'] != '') {
-				DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
-			}
+			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
 		} else {
 			/* @todo
 			 * We really should send a notification to the owner after 2-3 weeks
@@ -392,10 +607,7 @@ class Contact extends BaseObject
 				 * the whole process over again.
 				 */
 				DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
-
-				if ($contact['url'] != '') {
-					DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
-				}
+				DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
 			}
 		}
 	}
@@ -418,13 +630,18 @@ class Contact extends BaseObject
 			return;
 		}
 
+		if (!isset($contact['url']) && !empty($contact['id'])) {
+			$fields = ['id', 'url', 'batch'];
+			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			if (!DBA::isResult($contact)) {
+				return;
+			}
+		}
+
 		// It's a miracle. Our dead contact has inexplicably come back to life.
 		$fields = ['term-date' => NULL_DATE, 'archive' => false];
 		DBA::update('contact', $fields, ['id' => $contact['id']]);
-
-		if (!empty($contact['url'])) {
-			DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
-		}
+		DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
 
 		if (!empty($contact['batch'])) {
 			$condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
@@ -670,15 +887,6 @@ class Contact extends BaseObject
 			$contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
 			if (DBA::isResult($contact_own)) {
 				return self::photoMenu($contact_own, $uid);
-			} else {
-				$profile_link = self::magicLink($contact['url']);
-				$connlnk = 'follow/?url=' . $contact['url'];
-				$menu = [
-					'profile' => [L10n::t('View Profile'), $profile_link, true],
-					'follow' => [L10n::t('Connect/Follow'), $connlnk, true]
-				];
-
-				return $menu;
 			}
 		}
 
@@ -710,7 +918,7 @@ class Contact extends BaseObject
 
 		$contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
 
-		$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts';
+		$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations';
 
 		if (!$contact['self']) {
 			$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
@@ -720,16 +928,26 @@ class Contact extends BaseObject
 		 * Menu array:
 		 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
 		 */
-		$menu = [
-			'status'  => [L10n::t("View Status")  , $status_link      , true],
-			'profile' => [L10n::t("View Profile") , $profile_link     , true],
-			'photos'  => [L10n::t("View Photos")  , $photos_link      , true],
-			'network' => [L10n::t("Network Posts"), $posts_link       , false],
-			'edit'    => [L10n::t("View Contact") , $contact_url      , false],
-			'drop'    => [L10n::t("Drop Contact") , $contact_drop_link, false],
-			'pm'      => [L10n::t("Send PM")      , $pm_url           , false],
-			'poke'    => [L10n::t("Poke")         , $poke_link        , false],
-		];
+		if (empty($contact['uid'])) {
+			$connlnk = 'follow/?url=' . $contact['url'];
+			$menu = [
+				'profile' => [L10n::t('View Profile'),   $profile_link, true],
+				'network' => [L10n::t('Network Posts'),  $posts_link,   false],
+				'edit'    => [L10n::t('View Contact'),   $contact_url,  false],
+				'follow'  => [L10n::t('Connect/Follow'), $connlnk,      true],
+			];
+		} else {
+			$menu = [
+				'status'  => [L10n::t('View Status'),   $status_link,       true],
+				'profile' => [L10n::t('View Profile'),  $profile_link,      true],
+				'photos'  => [L10n::t('View Photos'),   $photos_link,       true],
+				'network' => [L10n::t('Network Posts'), $posts_link,        false],
+				'edit'    => [L10n::t('View Contact'),  $contact_url,       false],
+				'drop'    => [L10n::t('Drop Contact'),  $contact_drop_link, false],
+				'pm'      => [L10n::t('Send PM'),       $pm_url,            false],
+				'poke'    => [L10n::t('Poke'),          $poke_link,         false],
+			];
+		}
 
 		$args = ['contact' => $contact, 'menu' => &$menu];
 
@@ -862,6 +1080,11 @@ class Contact extends BaseObject
 
 		if (empty($data)) {
 			$data = Probe::uri($url, "", $uid);
+
+			// Ensure that there is a gserver entry
+			if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
+				PortableContact::checkServer($data['baseurl']);
+			}
 		}
 
 		// Last try in gcontact for unsupported networks
@@ -1087,7 +1310,7 @@ class Contact extends BaseObject
 	 *
 	 * @return string posts in HTML
 	 */
-	public static function getPostsFromUrl($contact_url)
+	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
 	{
 		$a = self::getApp();
 
@@ -1114,17 +1337,34 @@ class Contact extends BaseObject
 
 		$contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
-		$condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
-			$author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+		if ($thread_mode) {
+			$condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
+				$author_id, GRAVITY_PARENT, local_user()];
+		} else {
+			$condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
+				$author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+		}
+
 		$params = ['order' => ['created' => true],
 			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-		$r = Item::selectForUser(local_user(), [], $condition, $params);
 
-		$items = Item::inArray($r);
+		if ($thread_mode) {
+			$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+			$items = Item::inArray($r);
+
+			$o = conversation($a, $items, 'contacts', $update);
+		} else {
+			$r = Item::selectForUser(local_user(), [], $condition, $params);
+
+			$items = Item::inArray($r);
 
-		$o = conversation($a, $items, 'contact-posts', false);
+			$o = conversation($a, $items, 'contact-posts', false);
+		}
 
-		$o .= alt_pager($a, count($items));
+		if (!$update) {
+			$o .= alt_pager($a, count($items));
+		}
 
 		return $o;
 	}
@@ -1381,22 +1621,14 @@ class Contact extends BaseObject
 		// 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' AND NOT `pending` LIMIT 1",
-			intval($uid),
-			DBA::escape($ret['poll']),
-			DBA::escape(normalise_link($ret['poll'])),
-			DBA::escape($ret['network'])
-		);
-
-		if (!DBA::isResult($r)) {
-			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1",
-				intval($uid),
-				DBA::escape(normalise_link($url)),
-				DBA::escape($ret['network'])
-			);
+		$condition = ['uid' => $uid, 'poll' => [$ret['poll'], normalise_link($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+		$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
+		if (!DBA::isResult($contact)) {
+			$condition = ['uid' => $uid, 'nurl' => normalise_link($url), 'network' => $ret['network'], 'pending' => false];
+			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		}
 
-		if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
+		if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
 			if ($interactive) {
 				if (strlen($a->urlpath)) {
 					$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
@@ -1458,14 +1690,14 @@ class Contact extends BaseObject
 			$writeable = 1;
 		}
 
-		if (DBA::isResult($r)) {
+		if (DBA::isResult($contact)) {
 			// update contact
-			$new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
+			$new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
 
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
-			DBA::update('contact', $fields, ['id' => $r[0]['id']]);
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		} else {
-			$new_relation = ((in_array($ret['network'], [Protocol::MAIL])) ? self::FRIEND : self::SHARING);
+			$new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
 			// create contact record
 			DBA::insert('contact', [
@@ -1512,12 +1744,9 @@ class Contact extends BaseObject
 
 		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)
-		);
+		$owner = User::getOwnerDataById($uid);
 
-		if (DBA::isResult($r)) {
+		if (DBA::isResult($owner)) {
 			if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
 				// create a follow slap
 				$item = [];
@@ -1528,9 +1757,11 @@ class Contact extends BaseObject
 				$item['guid'] = '';
 				$item['tag'] = '';
 				$item['attach'] = '';
-				$slap = OStatus::salmon($item, $r[0]);
+
+				$slap = OStatus::salmon($item, $owner);
+
 				if (!empty($contact['notify'])) {
-					Salmon::slapper($r[0], $contact['notify'], $slap);
+					Salmon::slapper($owner, $contact['notify'], $slap);
 				}
 			} elseif ($contact['network'] == Protocol::DIASPORA) {
 				$ret = Diaspora::sendShare($a->user, $contact);
@@ -1542,7 +1773,15 @@ class Contact extends BaseObject
 		return $result;
 	}
 
-	public static function updateSslPolicy($contact, $new_policy)
+	/**
+	 * @brief Updated contact's SSL policy
+	 *
+	 * @param array  $contact Contact array
+	 * @param string $new_policy New policy, valid: self,full
+	 *
+	 * @return array Contact array with updated values
+	 */
+	public static function updateSslPolicy(array $contact, $new_policy)
 	{
 		$ssl_changed = false;
 		if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
@@ -1667,10 +1906,8 @@ class Contact extends BaseObject
 
 				}
 			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
-				q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
-						intval($importer['uid']),
-						DBA::escape($url)
-				);
+				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
+				DBA::update('contact', ['pending' => false], $condition);
 			}
 		}
 	}
@@ -1719,10 +1956,9 @@ class Contact extends BaseObject
 				 */
 
 				// Check for duplicates
-				$s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-					intval($rr['uid']), intval($rr['id']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday'));
-
-				if (DBA::isResult($s)) {
+				$condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
+					'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
+				if (DBA::exists('event', $condition)) {
 					continue;
 				}
 
@@ -1736,7 +1972,6 @@ class Contact extends BaseObject
 					intval(0)
 				);
 
-
 				// update bdyear
 				q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
 					DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])