X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=5cc72b05800bc15ebc60a92effb08baf3c553b8e;hb=a4b0ab90b1ac32f7cdb875387f511c980dbed9ce;hp=5a0c1066cbe18cdb5164afbbfd89451d9613e4ab;hpb=f3131c62778817a98db6f8812e1f322fee3ed0ce;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 5a0c1066cb..5cc72b0580 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -363,7 +363,7 @@ class Item
 		return true;
 	}
 
-	private static function guid($item, $notify)
+	public static function guid($item, $notify)
 	{
 		if (!empty($item['guid'])) {
 			return Strings::escapeTags(trim($item['guid']));
@@ -468,18 +468,14 @@ class Item
 		// Checking if there is already an item with the same guid
 		$condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
 		if (Post::exists($condition)) {
-			Logger::notice('Found already existing item', [
-				'guid' => $item['guid'],
-				'uid' => $item['uid'],
-				'network' => $item['network']
-			]);
+			Logger::notice('Found already existing item', $condition);
 			return true;
 		}
 
 		$condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'],
 			'network' => [$item['network'], Protocol::DFRN]];
 		if (Post::exists($condition)) {
-			Logger::notice('duplicated item with the same uri found.', $item);
+			Logger::notice('duplicated item with the same uri found.', $condition);
 			return true;
 		}
 
@@ -487,7 +483,7 @@ class Item
 		if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
 			$condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
 			if (Post::exists($condition)) {
-				Logger::notice('duplicated item with the same guid found.', $item);
+				Logger::notice('duplicated item with the same guid found.', $condition);
 				return true;
 			}
 		} elseif ($item['network'] == Protocol::OSTATUS) {
@@ -710,7 +706,7 @@ class Item
 		return GRAVITY_UNKNOWN;   // Should not happen
 	}
 
-	public static function insert($item, $notify = false, $dontcache = false)
+	public static function insert(array $item, bool $notify = false, bool $post_local = true)
 	{
 		$orig_item = $item;
 
@@ -935,7 +931,7 @@ class Item
 			$item["private"] = self::PRIVATE;
 		}
 
-		if ($notify) {
+		if ($notify && $post_local) {
 			$item['edit'] = false;
 			$item['parent'] = $parent_id;
 
@@ -957,7 +953,7 @@ class Item
 				unset($_SESSION['authenticated']);
 				unset($_SESSION['uid']);
 			}
-		} else {
+		} elseif (!$notify) {
 			Hook::callAll('post_remote', $item);
 		}
 
@@ -1043,7 +1039,7 @@ class Item
 				}
 
 				$event_id = Event::store($ev);
-				$item = Event::getItemArrayForId($event_id, $item);
+				$item = Event::getItemArrayForImportedId($event_id, $item);
 
 				Logger::info('Event was stored', ['id' => $event_id]);
 			}
@@ -1065,7 +1061,7 @@ class Item
 
 		// Create Diaspora signature
 		if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
-			$signed = Diaspora::createCommentSignature($uid, $item);
+			$signed = Diaspora::createCommentSignature($item);
 			if (!empty($signed)) {
 				$item['diaspora_signed_text'] = json_encode($signed);
 			}
@@ -1145,12 +1141,13 @@ class Item
 			return 0;
 		}
 
-		if (!$dontcache) {
-			if ($notify) {
-				Hook::callAll('post_local_end', $posted_item);
-			} else {
-				Hook::callAll('post_remote_end', $posted_item);
+		if ($notify) {
+			if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) {
+				Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']);
 			}
+			Hook::callAll('post_local_end', $posted_item);
+		} else {
+			Hook::callAll('post_remote_end', $posted_item);
 		}
 
 		if ($posted_item['gravity'] === GRAVITY_PARENT) {
@@ -1163,8 +1160,6 @@ class Item
 
 		Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']);
 
-		check_user_notification($posted_item['uri-id'], $posted_item['uid']);
-
 		// Distribute items to users who subscribed to their tags
 		self::distributeByTags($posted_item);
 
@@ -1466,7 +1461,7 @@ class Item
 			}
 		}
 
-		$distributed = self::insert($item, $notify, true);
+		$distributed = self::insert($item, $notify);
 
 		if (!$distributed) {
 			Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
@@ -1535,7 +1530,7 @@ class Item
 				$item['contact-id'] = $item['author-id'];
 			}
 
-			$public_shadow = self::insert($item, false, true);
+			$public_shadow = self::insert($item);
 
 			Logger::info('Stored public shadow', ['thread' => $itemid, 'id' => $public_shadow]);
 		}
@@ -1594,7 +1589,7 @@ class Item
 		unset($item['post-reason']);
 		$item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
-		$public_shadow = self::insert($item, false, true);
+		$public_shadow = self::insert($item);
 
 		Logger::info('Stored public shadow', ['uri-id' => $item['uri-id'], 'id' => $public_shadow]);
 
@@ -2689,7 +2684,7 @@ class Item
 					continue;
 				}
 
-				if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) {
+				if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->getContactId()) && ($item['network'] == Protocol::DFRN)) {
 					$img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
 					$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
 				}
@@ -2730,22 +2725,6 @@ class Item
 		$item['hashtags'] = $tags['hashtags'];
 		$item['mentions'] = $tags['mentions'];
 
-		// Compile eventual content filter reasons
-		$filter_reasons = [];
-		if (!$is_preview && public_contact() != $item['author-id']) {
-			if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
-				$filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
-			}
-
-			$hook_data = [
-				'item' => $item,
-				'filter_reasons' => $filter_reasons
-			];
-			Hook::callAll('prepare_body_content_filter', $hook_data);
-			$filter_reasons = $hook_data['filter_reasons'];
-			unset($hook_data);
-		}
-
 		$body = $item['body'] ?? '';
 		$shared = BBCode::fetchShareAttributes($body);
 		if (!empty($shared['guid'])) {
@@ -2769,6 +2748,24 @@ class Item
 		$item['body'] = $body;
 		$s = $item["rendered-html"];
 
+		// Compile eventual content filter reasons
+		$filter_reasons = [];
+		if (!$is_preview && public_contact() != $item['author-id']) {
+			if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
+				$filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
+			}
+
+			$item['attachments'] = $attachments;
+
+			$hook_data = [
+				'item' => $item,
+				'filter_reasons' => $filter_reasons
+			];
+			Hook::callAll('prepare_body_content_filter', $hook_data);
+			$filter_reasons = $hook_data['filter_reasons'];
+			unset($hook_data);
+		}
+
 		$hook_data = [
 			'item' => $item,
 			'html' => $s,
@@ -2806,8 +2803,8 @@ class Item
 		}
 
 		// Replace friendica image url size with theme preference.
-		if (!empty($a->theme_info['item_image_size'])) {
-			$ps = $a->theme_info['item_image_size'];
+		if (!empty($a->getThemeInfoValue('item_image_size'))) {
+			$ps = $a->getThemeInfoValue('item_image_size');
 			$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
 		}
 
@@ -2862,7 +2859,7 @@ class Item
 	 */
 	private static function replaceVisualAttachments(array $attachments, string $body)
 	{
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('rendering');
 
 		foreach ($attachments['visual'] as $attachment) {
 			if (!empty($attachment['preview'])) {
@@ -2871,7 +2868,7 @@ class Item
 				$body = str_replace($attachment['url'], Post\Media::getUrlForId($attachment['id']), $body);
 			}
 		}
-		DI::profiler()->saveTimestamp($stamp1, 'rendering');
+		DI::profiler()->stopRecording();
 		return $body;
 	}
 
@@ -2885,7 +2882,7 @@ class Item
 	 */
 	private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared)
 	{
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('rendering');
 		$leading = '';
 		$trailing = '';
 
@@ -2961,7 +2958,7 @@ class Item
 			}
 		}
 
-		DI::profiler()->saveTimestamp($stamp1, 'rendering');
+		DI::profiler()->stopRecording();
 		return $content;
 	}
 
@@ -2977,7 +2974,7 @@ class Item
 	 */
 	private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links)
 	{
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('rendering');
 		// @ToDo Check only for audio and video
 		$preview = empty($attachments['visual']);
 
@@ -3042,7 +3039,7 @@ class Item
 		} elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
 			$data = BBCode::getAttachmentData($match[1]);
 		}
-		DI::profiler()->saveTimestamp($stamp1, 'rendering');
+		DI::profiler()->stopRecording();
 
 		if (isset($data['url']) && !in_array($data['url'], $ignore_links)) {
 			if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) {
@@ -3090,7 +3087,7 @@ class Item
 	 */
 	private static function addNonVisualAttachments(array $attachments, array $item, string $content)
 	{
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('rendering');
 		$trailing = '';
 		foreach ($attachments['additional'] as $attachment) {
 			if (strpos($item['body'], $attachment['url'])) {
@@ -3116,7 +3113,7 @@ class Item
 			$content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
 		}
 
-		DI::profiler()->saveTimestamp($stamp1, 'rendering');
+		DI::profiler()->stopRecording();
 		return $content;
 	}