X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=0fb7394579f7513d4667d600f5b598aef9306f75;hb=aacaa3c2cf7ac4189ae6b41701d66ee3cd7f8535;hp=6e35ae23a99622532660b4509e21dc1f3dbc7419;hpb=f6faae5bb10299c81ab4ca2e94463246e47cacf7;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 6e35ae23a9..0fb7394579 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -413,6 +413,48 @@ class DFRN
 		return $root;
 	}
 
+	/**
+	 * Determine the next birthday, but only if the birthday is published
+	 * in the default profile. We _could_ also look for a private profile that the
+	 * recipient can see, but somebody could get mad at us if they start getting
+	 * public birthday greetings when they haven't made this info public.
+	 *
+	 * Assuming we are able to publish this info, we are then going to convert
+	 * the start time from the owner's timezone to UTC.
+	 *
+	 * This will potentially solve the problem found with some social networks
+	 * where birthdays are converted to the viewer's timezone and salutations from
+	 * elsewhere in the world show up on the wrong day. We will convert it to the
+	 * viewer's timezone also, but first we are going to convert it from the birthday
+	 * person's timezone to GMT - so the viewer may find the birthday starting at
+	 * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+	 */
+	private static function determineNextBirthday($uid, $tz)
+	{
+		$birthday = '';
+
+		if (!strlen($tz)) {
+			$tz = 'UTC';
+		}
+
+		$profile = DBA::selectFirst('profile', ['dob'], ['uid' => $uid]);
+		if (DBA::isResult($profile)) {
+			$tmp_dob = substr($profile['dob'], 5);
+			if (intval($tmp_dob)) {
+				$y = DateTimeFormat::timezoneNow($tz, 'Y');
+				$bd = $y . '-' . $tmp_dob . ' 00:00';
+				$t_dob = strtotime($bd);
+				$now = strtotime(DateTimeFormat::timezoneNow($tz));
+				if ($t_dob < $now) {
+					$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+				}
+				$birthday = DateTimeFormat::convert($bd, 'UTC', $tz, DateTimeFormat::ATOM);
+			}
+		}
+
+		return $birthday;
+	}
+
 	/**
 	 * Adds the author element in the header for the DFRN protocol
 	 *
@@ -467,7 +509,7 @@ class DFRN
 			return $author;
 		}
 
-		$birthday = feed_birthday($owner['uid'], $owner['timezone']);
+		$birthday = self::determineNextBirthday($owner['uid'], $owner['timezone']);
 
 		if ($birthday) {
 			XML::addElement($doc, $author, "dfrn:birthday", $birthday);
@@ -883,9 +925,9 @@ class DFRN
 
 		foreach ($mentioned as $mention) {
 			$condition = ['uid' => $owner["uid"], 'nurl' => Strings::normaliseLink($mention)];
-			$contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition);
+			$contact = DBA::selectFirst('contact', ['contact-type'], $condition);
 
-			if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) {
+			if (DBA::isResult($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
 				XML::addElement(
 					$doc,
 					$entry,
@@ -1352,7 +1394,7 @@ class DFRN
 		}
 
 		// Quit if we already have an introduction for this person
-		if (DBA::exists('intro', ['uid' => $uid, 'suggest-cid' => $cid])) {
+		if (DI::intro()->suggestionExistsForUser($cid, $uid)) {
 			return false;
 		}
 
@@ -1366,10 +1408,13 @@ class DFRN
 		$suggest['title'] = '';
 		$suggest['body'] = $note;
 
-		$hash = Strings::getRandomHex();
-		$fields = ['uid' => $suggest['uid'], 'suggest-cid' => $cid, 'contact-id' => $suggest['cid'],
-			'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
-		DBA::insert('intro', $fields);
+		DI::intro()->save(DI::introFactory()->createNew(
+			$suggest['uid'],
+			$suggest['cid'],
+			$suggest['body'],
+			null,
+			$cid
+		));
 
 		DI::notify()->createFromArray([
 			'type'  => Notification\Type::SUGGEST,
@@ -1502,7 +1547,7 @@ class DFRN
 		if ($item["thr-parent"] != $item["uri"]) {
 			$community = false;
 
-			if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) {
+			if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
 				$sql_extra = "";
 				$community = true;
 				Logger::notice("possible community action");
@@ -1512,22 +1557,11 @@ class DFRN
 
 			// was the top-level post for this action written by somebody on this site?
 			// Specifically, the recipient?
-			$parent = Post::selectFirst(['forum_mode', 'wall'],
+			$parent = Post::selectFirst(['wall'],
 				["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]);
 
 			$is_a_remote_action = DBA::isResult($parent);
 
-			/*
-			 * Does this have the characteristics of a community or private group action?
-			 * If it's an action to a wall post on a community/prvgroup page it's a
-			 * valid community action. Also forum_mode makes it valid for sure.
-			 * If neither, it's not.
-			 */
-			if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) {
-				$is_a_remote_action = false;
-				Logger::notice("not a community action");
-			}
-
 			if ($is_a_remote_action) {
 				return DFRN::REPLY_RC;
 			} else {
@@ -1634,7 +1668,7 @@ class DFRN
 			}
 			if ($activity->match($item["verb"], Activity::UNFRIEND)) {
 				Logger::notice("Lost sharer");
-				Contact::removeSharer($importer, $contact, $item);
+				Contact::removeSharer($contact);
 				return false;
 			}
 		} else {
@@ -1735,19 +1769,34 @@ class DFRN
 	 * Checks if an incoming message is wanted
 	 *
 	 * @param array $item
+	 * @param array $imporer
 	 * @return boolean Is the message wanted?
 	 */
-	private static function isSolicitedMessage(array $item)
+	private static function isSolicitedMessage(array $item, array $importer)
 	{
 		if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
 			Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) {
-			Logger::info('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]);
+			Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
+			return true;
+		}
+
+		if ($importer['importer_uid'] != 0) {
+			Logger::debug('Message is directed to a user - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'importer' => $importer['importer_uid']]);
+			return true;
+		}
+
+		if ($item['uri'] != $item['thr-parent']) {
+			Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
 			return true;
 		}
 
-		$taglist = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]);
-		$tags = array_column($taglist, 'name');
-		return Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN);
+		$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
+		if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) {
+			Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -1948,11 +1997,9 @@ class DFRN
 		}
 
 		// Check if the message is wanted
-		if (($importer['importer_uid'] == 0) && ($item['uri'] == $item['thr-parent'])) {
-			if (!self::isSolicitedMessage($item)) {
-				DBA::delete('item-uri', ['uri' => $item['uri']]);
-				return 403;
-			}
+		if (!self::isSolicitedMessage($item, $importer)) {
+			DBA::delete('item-uri', ['uri' => $item['uri']]);
+			return 403;
 		}
 
 		// Get the type of the item (Top level post, reply or remote reply)
@@ -2336,14 +2383,11 @@ class DFRN
 			return false;
 		}
 
-		$user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', ['account-type', 'nickname'], ['uid' => $uid]);
 		if (!DBA::isResult($user)) {
 			return false;
 		}
 
-		$community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
-		$prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP);
-
 		$link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']);
 
 		/*
@@ -2366,7 +2410,7 @@ class DFRN
 			return false;
 		}
 
-		return $community_page || $prvgroup;
+		return ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
 	}
 
 	/**