X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=70965a72fd8e78121384bbe33eee592d6ba1b0e8;hb=79eeb409695716fae8a501a02ef57ed855acb3a8;hp=2dd3eba1e2c940befa788381589710c6f0b5cda9;hpb=85dc9bb96b30819fcf544c9aa1013a8f380d6981;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 2dd3eba1e2..70965a72fd 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2211,7 +2211,7 @@ class Diaspora
 			return false;
 		}
 
-		$item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
+		$item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
 		if (!DBA::isResult($item)) {
 			Logger::log('Item not found, no origin or private: '.$parent_guid);
 			return false;
@@ -2299,7 +2299,6 @@ class Diaspora
 		$name = XML::unescape($data->first_name).((strlen($data->last_name)) ? " ".XML::unescape($data->last_name) : "");
 		$image_url = XML::unescape($data->image_url);
 		$birthday = XML::unescape($data->birthday);
-		$gender = XML::unescape($data->gender);
 		$about = Markdown::toBBCode(XML::unescape($data->bio));
 		$location = Markdown::toBBCode(XML::unescape($data->location));
 		$searchable = (XML::unescape($data->searchable) == "true");
@@ -2347,8 +2346,7 @@ class Diaspora
 		}
 
 		$fields = ['name' => $name, 'location' => $location,
-			'name-date' => DateTimeFormat::utcNow(),
-			'about' => $about, 'gender' => $gender,
+			'name-date' => DateTimeFormat::utcNow(), 'about' => $about,
 			'addr' => $author, 'nick' => $nick, 'keywords' => $keywords,
 			'unsearchable' => !$searchable, 'sensitive' => $nsfw];
 
@@ -2362,7 +2360,7 @@ class Diaspora
 
 		$gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
 					"photo" => $image_url, "name" => $name, "location" => $location,
-					"about" => $about, "birthday" => $birthday, "gender" => $gender,
+					"about" => $about, "birthday" => $birthday,
 					"addr" => $author, "nick" => $nick, "keywords" => $keywords,
 					"hide" => !$searchable, "nsfw" => $nsfw];
 
@@ -2525,7 +2523,7 @@ class Diaspora
 		// Do we already have this item?
 		$fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 			'author-name', 'author-link', 'author-avatar'];
-		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
 		$item = Item::selectFirst($fields, $condition);
 
 		if (DBA::isResult($item)) {
@@ -2569,7 +2567,7 @@ class Diaspora
 			if ($stored) {
 				$fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 					'author-name', 'author-link', 'author-avatar'];
-				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
 				$item = Item::selectFirst($fields, $condition);
 
 				if (DBA::isResult($item)) {
@@ -2713,7 +2711,7 @@ class Diaspora
 		$datarray["app"]  = $original_item["app"];
 
 		$datarray["plink"] = self::plink($author, $guid);
-		$datarray["private"] = (($public == "false") ? 1 : 0);
+		$datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
 		$datarray["object-type"] = $original_item["object-type"];
@@ -2796,7 +2794,7 @@ class Diaspora
 				continue;
 			}
 
-			Item::delete(['id' => $item['id']]);
+			Item::markForDeletion(['id' => $item['id']]);
 
 			Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG);
 		}
@@ -2943,7 +2941,7 @@ class Diaspora
 		}
 
 		$datarray["plink"] = self::plink($author, $guid);
-		$datarray["private"] = (($public == "false") ? 1 : 0);
+		$datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
 		if (isset($address["address"])) {
@@ -3247,7 +3245,7 @@ class Diaspora
 	private static function sendParticipation(array $contact, array $item)
 	{
 		// Don't send notifications for private postings
-		if ($item['private']) {
+		if ($item['private'] == Item::PRIVATE) {
 			return;
 		}
 
@@ -3538,12 +3536,12 @@ class Diaspora
 
 		$myaddr = self::myHandle($owner);
 
-		$public = ($item["private"] ? "false" : "true");
+		$public = ($item["private"] == Item::PRIVATE ? "false" : "true");
 		$created = DateTimeFormat::utc($item['received'], DateTimeFormat::ATOM);
 		$edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM);
 
 		// Detect a share element and do a reshare
-		if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
+		if (($item['private'] != Item::PRIVATE) && ($ret = self::isReshare($item["body"]))) {
 			$message = ["author" => $myaddr,
 					"guid" => $item["guid"],
 					"created_at" => $created,
@@ -4120,7 +4118,7 @@ class Diaspora
 		$large = DI::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
 		$medium = DI::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
 		$small = DI::baseUrl().'/photo/custom/50/'  .$profile['uid'].'.jpg';
-		$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false');
+		$searchable = ($profile['net-publish'] ? 'true' : 'false');
 
 		$dob = null;
 		$about = null;
@@ -4137,8 +4135,7 @@ class Diaspora
 				$dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
 			}
 
-			$about = $profile['about'];
-			$about = strip_tags(BBCode::convert($about));
+			$about = BBCode::toMarkdown($profile['about']);
 
 			$location = Profile::formatLocation($profile);
 			$tags = '';
@@ -4164,7 +4161,6 @@ class Diaspora
 				"image_url_medium" => $medium,
 				"image_url_small" => $small,
 				"birthday" => $dob,
-				"gender" => $profile['gender'],
 				"bio" => $about,
 				"location" => $location,
 				"searchable" => $searchable,