X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=18b56215ce39ca9a680e64fc062f693c84dca392;hb=58e5f0d9c5ba75f92cc4c77b5b27069789f11318;hp=04853314f5b90adf34659439982307c53ac6ef36;hpb=e4a37f344ef52195f7ad9e7988d8a495b4034069;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 04853314f5..18b56215ce 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -117,7 +117,7 @@ class Item
 	const DELIVER_FIELDLIST = [
 		'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
 		'parent-guid', 'conversation', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
-		'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
+		'private', 'title', 'body', 'raw-body', 'language', 'location', 'coord', 'app',
 		'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity',
 		'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
 		'author-id', 'author-addr', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid',
@@ -880,6 +880,10 @@ class Item
 			if (is_int($notify) && in_array($notify, Worker::PRIORITIES)) {
 				$priority = $notify;
 			}
+
+			// Mastodon style API visibility
+			$copy_permissions = ($item['visibility'] ?? 'private') == 'private';
+			unset($item['visibility']);
 		} else {
 			$item['network'] = trim(($item['network'] ?? '') ?: Protocol::PHANTOM);
 		}
@@ -1038,10 +1042,12 @@ class Item
 
 			// Reshares have to keep their permissions to allow groups to work
 			if (!$defined_permissions && (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE))) {
-				$item['allow_cid']     = $toplevel_parent['allow_cid'];
-				$item['allow_gid']     = $toplevel_parent['allow_gid'];
-				$item['deny_cid']      = $toplevel_parent['deny_cid'];
-				$item['deny_gid']      = $toplevel_parent['deny_gid'];
+				// Don't store the permissions on pure AP posts
+				$store_permissions = ($item['network'] != Protocol::ACTIVITYPUB) || $item['origin'] || !empty($item['diaspora_signed_text']);
+				$item['allow_cid'] = $store_permissions ? $toplevel_parent['allow_cid'] : '';
+				$item['allow_gid'] = $store_permissions ? $toplevel_parent['allow_gid'] : '';
+				$item['deny_cid']  = $store_permissions ? $toplevel_parent['deny_cid'] : '';
+				$item['deny_gid']  = $store_permissions ? $toplevel_parent['deny_gid'] : '';
 			}
 
 			$parent_origin         = $toplevel_parent['origin'];
@@ -1359,6 +1365,9 @@ class Item
 
 		if ($notify) {
 			DI::contentItem()->postProcessPost($posted_item);
+			if ($copy_permissions && ($posted_item['thr-parent-id'] != $posted_item['uri-id']) && ($posted_item['private'] == self::PRIVATE)) {
+				DI::contentItem()->copyPermissions($posted_item['thr-parent-id'], $posted_item['uri-id']);
+			}
 		} else {
 			Hook::callAll('post_remote_end', $posted_item);
 		}
@@ -1475,6 +1484,10 @@ class Item
 	 */
 	private static function setOwnerforResharedItem(array $item)
 	{
+		if ($item['uid'] == 0) {
+			return;
+		}
+
 		$parent = Post::selectFirst(
 			['id', 'causer-id', 'owner-id', 'author-id', 'author-link', 'origin', 'post-reason'],
 			['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid']]
@@ -2025,15 +2038,12 @@ class Item
 			return [];
 		}
 
-		$availableLanguages = DI::l10n()->getAvailableLanguages(true);
-		$availableLanguages = DI::l10n()->convertForLanguageDetection($availableLanguages);
-
-		$ld = new Language(array_keys($availableLanguages));
+		$ld = new Language(DI::l10n()->getDetectableLanguages());
 
 		$result = [];
 
 		foreach (self::splitByBlocks($searchtext) as $block) {
-			$languages = $ld->detect($block)->limit(0, $count)->close() ?: [];
+			$languages = $ld->detect($block)->close() ?: [];
 
 			$data = [
 				'text'      => $block,
@@ -2048,10 +2058,32 @@ class Item
 			}
 		}
 
+		$result = self::compactLanguages($result);
+
 		arsort($result);
-		$result = array_slice($result, 0, $count);
+		return array_slice($result, 0, $count);
+	}
 
-		return $result;
+	/**
+	 * Concert the language code in the detection result to ISO 639-1.
+	 * On duplicates the system uses the higher quality value.
+	 *
+	 * @param array $result
+	 * @return array
+	 */
+	private static function compactLanguages(array $result): array
+	{
+		$languages = [];
+		foreach ($result as $language => $quality) {
+			if ($quality == 0) {
+				continue;
+			}
+			$code = DI::l10n()->toISO6391($language);
+			if (empty($languages[$code]) || ($languages[$code] < $quality)) {
+				$languages[$code] = $quality;
+			}
+		}
+		return $languages;
 	}
 
 	/**
@@ -2134,7 +2166,15 @@ class Item
 
 		$used_languages = '';
 		foreach (json_decode($item['language'], true) as $language => $reliability) {
-			$used_languages .= $iso639->nativeByCode1(substr($language, 0, 2)) . ' (' . $iso639->languageByCode1(substr($language, 0, 2)) . ' - ' . $language . "): " . number_format($reliability, 5) . '\n';
+			$code = DI::l10n()->toISO6391($language);
+
+			$native   = $iso639->nativeByCode1($code);
+			$language = $iso639->languageByCode1($code);
+			if ($native != $language) {
+				$used_languages .= DI::l10n()->t('%s (%s - %s): %s', $native, $language, $code, number_format($reliability, 5)) . '\n';
+			} else {
+				$used_languages .= DI::l10n()->t('%s (%s): %s', $native, $code, number_format($reliability, 5)) . '\n';
+			}
 		}
 		$used_languages = DI::l10n()->t('Detected languages in this post:\n%s', $used_languages);
 		return $used_languages;
@@ -3905,11 +3945,12 @@ class Item
 	 * Fetches item for given URI or plink
 	 *
 	 * @param string $uri
-	 * @param integer $uid
+	 * @param int    $uid
+	 * @param int    $completion
 	 *
 	 * @return integer item id
 	 */
-	public static function fetchByLink(string $uri, int $uid = 0): int
+	public static function fetchByLink(string $uri, int $uid = 0, int $completion = ActivityPub\Receiver::COMPLETION_MANUAL): int
 	{
 		Logger::info('Trying to fetch link', ['uid' => $uid, 'uri' => $uri]);
 		$item_id = self::searchByLink($uri, $uid);
@@ -3930,7 +3971,7 @@ class Item
 			return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
 		}
 
-		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', ActivityPub\Receiver::COMPLETION_MANUAL, $uid);
+		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', $completion, $uid);
 
 		if ($fetched_uri) {
 			$item_id = self::searchByLink($fetched_uri, $uid);
@@ -3990,7 +4031,7 @@ class Item
 		}
 
 		$url = $shared['message_id'] ?: $shared['link'];
-		$id = self::fetchByLink($url);
+		$id = self::fetchByLink($url, 0, ActivityPub\Receiver::COMPLETION_ASYNC);
 		if (!$id) {
 			Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]);
 			return 0;