X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=5a0658b0209fbf5bf5fd1cb038da0cbc6ac89169;hb=8841519c0dfae069aff6bee6325fa868e4b9b641;hp=0f2ef536d8e7b4323f4fa651f7b76b41f74dd9bc;hpb=c13dc549ed84b0636fb0d0384ca4f532e67eed82;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 0f2ef536d8..5a0658b020 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -21,6 +21,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -38,7 +39,7 @@ require_once 'include/items.php';
 
 function item_post(App $a) {
 	if (!local_user() && !remote_user()) {
-		return;
+		return 0;
 	}
 
 	require_once 'include/security.php';
@@ -151,14 +152,14 @@ function item_post(App $a) {
 
 	// Check for multiple posts with the same message id (when the post was created via API)
 	if (($message_id != '') && ($profile_uid != 0)) {
-		if (DBA::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) {
+		if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
 			logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
-			return;
+			return 0;
 		}
 	}
 
 	// Allow commenting if it is an answer to a public post
-	$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+	$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
 	// Now check that valid personal details have been provided
 	if (!can_write_wall($profile_uid) && !$allow_comment) {
@@ -182,7 +183,7 @@ function item_post(App $a) {
 	$user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
 
 	if (!DBA::isResult($user) && !$parent) {
-		return;
+		return 0;
 	}
 
 	$categories = '';
@@ -238,8 +239,8 @@ function item_post(App $a) {
 		$verb              =      notags(trim(defaults($_REQUEST, 'verb'    , '')));
 		$emailcc           =      notags(trim(defaults($_REQUEST, 'emailcc' , '')));
 		$body              = escape_tags(trim(defaults($_REQUEST, 'body'    , '')));
-		$network           =      notags(trim(defaults($_REQUEST, 'network' , NETWORK_DFRN)));
-		$guid              =      System::createGUID(32);
+		$network           =      notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
+		$guid              =      System::createUUID();
 
 		$postopts = defaults($_REQUEST, 'postopts', '');
 
@@ -253,8 +254,8 @@ function item_post(App $a) {
 
 		if ($parent_item) {
 			// for non native networks use the network of the original post as network of the item
-			if (($parent_item['network'] != NETWORK_DIASPORA)
-				&& ($parent_item['network'] != NETWORK_OSTATUS)
+			if (($parent_item['network'] != Protocol::DIASPORA)
+				&& ($parent_item['network'] != Protocol::OSTATUS)
 				&& ($network == "")) {
 				$network = $parent_item['network'];
 			}
@@ -342,20 +343,11 @@ function item_post(App $a) {
 
 	$tags = get_tags($body);
 
-	// Add a tag if the parent contact is from OStatus (This will notify them during delivery)
-	if ($parent) {
-		if ($thr_parent_contact['network'] == NETWORK_OSTATUS) {
-			$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
-			if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
-				$tags[] = $contact;
-			}
-		}
-
-		if ($parent_contact['network'] == NETWORK_OSTATUS) {
-			$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
-			if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
-				$tags[] = $contact;
-			}
+	// Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
+	if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
+		$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
+		if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
+			$tags[] = $contact;
 		}
 	}
 
@@ -394,12 +386,12 @@ function item_post(App $a) {
 				$tagged[] = $tag;
 			}
 			// When the forum is private or the forum is addressed with a "!" make the post private
-			if (is_array($success['contact']) && ($success['contact']['prv'] || ($tag_type == '!'))) {
+			if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
 				$private_forum = $success['contact']['prv'];
 				$only_to_forum = ($tag_type == '!');
 				$private_id = $success['contact']['id'];
 				$forum_contact = $success['contact'];
-			} elseif (is_array($success['contact']) && $success['contact']['forum'] &&
+			} elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
 				($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
 				$private_forum = false;
 				$only_to_forum = true;
@@ -559,7 +551,7 @@ function item_post(App $a) {
 	}
 
 	if ($network == "") {
-		$network = NETWORK_DFRN;
+		$network = Protocol::DFRN;
 	}
 
 	$gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
@@ -674,7 +666,7 @@ function item_post(App $a) {
 		// doesn't have an ID.
 		$datarray["id"] = -1;
 		$datarray["item_id"] = -1;
-		$datarray["author-network"] = NETWORK_DFRN;
+		$datarray["author-network"] = Protocol::DFRN;
 
 		$o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
 		logger('preview: ' . $o);
@@ -842,6 +834,10 @@ function item_post(App $a) {
 
 	logger('post_complete');
 
+	if ($api_source) {
+		return $post_id;
+	}
+
 	item_post_return(System::baseUrl(), $api_source, $return_path);
 	// NOTREACHED
 }
@@ -1021,8 +1017,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			$alias   = $contact["alias"];
 			$newname = $contact["nick"];
 
-			if (($newname == "") || (($contact["network"] != NETWORK_OSTATUS) && ($contact["network"] != NETWORK_TWITTER)
-				&& ($contact["network"] != NETWORK_STATUSNET) && ($contact["network"] != NETWORK_APPNET))) {
+			if (($newname == "") || !in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::TWITTER, Protocol::STATUSNET])) {
 				$newname = $contact["name"];
 			}
 		}