X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=50c5e56c129e9dcacd366ff97298ceca21905865;hb=0dce36bdbce7482329105e2c1ef4f3c8b3043803;hp=0c3c8b1d7aa8cd341c4dcc6beaaf9c51bad41b11;hpb=5dcc10a5d9d2be79070716fbcaf5c054f7ed9efa;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 0c3c8b1d7a..50c5e56c12 100644
--- a/include/items.php
+++ b/include/items.php
@@ -143,7 +143,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	$salmon = feed_salmonlinks($owner_nick);
 
 	$atom .= replace_macros($feed_template, array(
-		'$version'      => xmlify(FRIENDIKA_VERSION),
+		'$version'      => xmlify(FRIENDICA_VERSION),
 		'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
 		'$feed_title'   => xmlify($owner['name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
@@ -617,7 +617,7 @@ function get_atom_elements($feed,$item) {
 			if(! $body)
 				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
+			$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
 				$body = html2bb_video($body);
@@ -730,6 +730,7 @@ function item_store($arr,$force_parent = false) {
 	$arr['tag']           = ((x($arr,'tag'))           ? notags(trim($arr['tag']))           : '');
 	$arr['attach']        = ((x($arr,'attach'))        ? notags(trim($arr['attach']))        : '');
 	$arr['app']           = ((x($arr,'app'))           ? notags(trim($arr['app']))           : '');
+	$arr['origin']        = ((x($arr,'origin'))        ? intval($arr['origin'])              : 0 );
 	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid());
 
 	if($arr['parent-uri'] === $arr['uri']) {
@@ -892,6 +893,8 @@ function item_store($arr,$force_parent = false) {
 		);
 	}
 
+	tgroup_deliver($arr['uid'],$current_post);
+
 	return $current_post;
 }
 
@@ -908,6 +911,69 @@ function get_item_contact($item,$contacts) {
 }
 
 
+function tgroup_deliver($uid,$item_id) {
+
+
+	// setup a second delivery chain for forum/community posts if appropriate
+
+	$a = get_app();
+
+	$deliver_to_tgroup = false;
+
+	$u = q("select * from user where uid = %d and `page-flags` = %d limit 1",
+		intval($uid),
+		intval(PAGE_COMMUNITY)
+	);
+	if(! count($u))
+		return;
+
+	$i = q("select * from item where id = %d and uid = %d limit 1",
+		intval($item_id),
+		intval($uid)
+	);
+	if(! count($i))
+		return;
+
+	$item = $i[0];
+
+	// prevent delivery looping - only proceed
+	// if the message originated elsewhere and is a top-level post
+
+	if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
+		return;
+
+
+	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+
+	$cnt = preg_match_all('/\@\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			if(link_compare($link,$mtch[1])) {
+				$deliver_to_tgroup = true;
+				logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
+			}
+		}
+	}
+
+	if(! $deliver_to_tgroup)
+		return;
+
+	// now change this copy of the post to a forum head message and deliver to all the tgroup members
+
+
+	q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
+		intval($item_id)
+	);
+
+	proc_run('php','include/notifier.php','tgroup',$item_id);			
+
+}
+
+
+
+
+
+
 function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$a = get_app();
@@ -1262,7 +1328,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
 			}
 			if($deleted && is_array($contact)) {
-				$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` 
+					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
 					dbesc($uri),
 					intval($importer['uid']),
 					intval($contact['id'])
@@ -1273,6 +1340,41 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if(! $item['deleted'])
 						logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+						$xo = parse_xml_string($item['object'],false);
+						$xt = parse_xml_string($item['target'],false);
+						if($xt->type === ACTIVITY_OBJ_NOTE) {
+							$i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
+								dbesc($xt->id),
+								intval($importer['importer_uid'])
+							);
+							if(count($i)) {
+
+								// For tags, the owner cannot remove the tag on the author's copy of the post.
+
+								$owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+								$author_remove = (($item['origin'] && $item['self']) ? true : false);
+								$author_copy = (($item['origin']) ? true : false);
+
+								if($owner_remove && $author_copy)
+									continue;
+								if($author_remove || $owner_remove) {
+									$tags = explode(',',$i[0]['tag']);
+									$newtags = array();
+									if(count($tags)) {
+										foreach($tags as $tag)
+											if(trim($tag) !== trim($xo->body))
+												$newtags[] = trim($tag);
+									}
+									q("update item set tag = '%s' where id = %d limit 1",
+										dbesc(implode(',',$newtags)),
+										intval($i[0]['id'])
+									);
+								}
+							}
+						}
+					}
+
 					if($item['uri'] == $item['parent-uri']) {
 						$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 							`body` = '', `title` = ''
@@ -1340,7 +1442,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$parent_uri = $rawthread[0]['attribs']['']['ref'];
 			}
 
-			if(($is_reply) && is_array($contact) && $pass != 1) {
+			if(($is_reply) && is_array($contact)) {
+
+				if($pass == 1)
+					continue;
 
 				// Have we seen it? If not, import it.
 	
@@ -1416,6 +1521,31 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
 
+				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+					$xo = parse_xml_string($datarray['object'],false);
+					$xt = parse_xml_string($datarray['target'],false);
+
+					if($xt->type == ACTIVITY_OBJ_NOTE) {
+						$r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+							dbesc($xt->id),
+							intval($importer['importer_uid'])
+						);
+						if(! count($r))
+							continue;
+
+						// extract tag, if not duplicate, add to parent item
+						if($xo->id && $xo->content) {
+							$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+							if(! (stristr($r[0]['tag'],$newtag))) {
+								q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+									dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
+									intval($r[0]['id'])
+								);
+							}
+						}
+					}
+				}
+
 				$r = item_store($datarray,$force_parent);
 				continue;
 			}
@@ -1607,9 +1737,9 @@ function local_delivery($importer,$data) {
 
 		// Does our member already have a friend matching this description?
 
-		$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($fsugg['name']),
-			dbesc($fsugg['url']),
+			dbesc(normalise_link($fsugg['url'])),
 			intval($fsugg['uid'])
 		);
 		if(count($r))
@@ -1793,7 +1923,8 @@ function local_delivery($importer,$data) {
 			}
 			if($deleted) {
 
-				$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
+					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
 					dbesc($uri),
 					intval($importer['importer_uid']),
 					intval($importer['id'])
@@ -1802,8 +1933,45 @@ function local_delivery($importer,$data) {
 				if(count($r)) {
 					$item = $r[0];
 
-					if(! $item['deleted'])
-						logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
+					if($item['deleted'])
+						continue;
+
+					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
+
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+						$xo = parse_xml_string($item['object'],false);
+						$xt = parse_xml_string($item['target'],false);
+						if($xt->type === ACTIVITY_OBJ_NOTE) {
+							$i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
+								dbesc($xt->id),
+								intval($importer['importer_uid'])
+							);
+							if(count($i)) {
+
+								// For tags, the owner cannot remove the tag on the author's copy of the post.
+								
+								$owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+								$author_remove = (($item['origin'] && $item['self']) ? true : false);
+								$author_copy = (($item['origin']) ? true : false); 
+
+								if($owner_remove && $author_copy)
+									continue;
+								if($author_remove || $owner_remove) {								
+									$tags = explode(',',$i[0]['tag']);
+									$newtags = array();
+									if(count($tags)) {
+										foreach($tags as $tag)
+											if(trim($tag) !== trim($xo->body))
+												$newtags[] = trim($tag);
+									}
+									q("update item set tag = '%s' where id = %d limit 1",
+										dbesc(implode(',',$newtags)),
+										intval($i[0]['id'])
+									);
+								}
+							}
+						}
+					}
 
 					if($item['uri'] == $item['parent-uri']) {
 						$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s'
@@ -1860,17 +2028,31 @@ function local_delivery($importer,$data) {
 
 		if($is_reply) {
 
+			$community = false;
+
+			if($importer['page-flags'] == PAGE_COMMUNITY) {
+				$sql_extra = '';
+				$community = true;
+				logger('local_delivery: community reply');
+			}
+			else
+				$sql_extra = " and contact.self = 1 and item.wall = 1 ";
+ 
 			// was the top-level post for this reply written by somebody on this site? 
 			// Specifically, the recipient? 
 
-			$r = q("select `item`.`id`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
+			$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
+				`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
 				LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
-				WHERE `contact`.`self` = 1 AND `item`.`wall` = 1 AND `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
-				AND `item`.`uid` = %d LIMIT 1",
+				WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
+				AND `item`.`uid` = %d 
+				$sql_extra
+				LIMIT 1",
 				dbesc($parent_uri),
 				dbesc($parent_uri),
 				intval($importer['importer_uid'])
 			);
+
 			if($r && count($r)) {	
 
 				logger('local_delivery: received remote comment');
@@ -1878,11 +2060,14 @@ function local_delivery($importer,$data) {
 				// remote reply to our post. Import and then notify everybody else.
 				$datarray = get_atom_elements($feed,$item);
 
-				if(! link_compare($datarray['author-link'],$importer['url'])) {
-					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
+
+		// TODO: make this next part work against both delivery threads of a community post
+
+//				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
+//					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
 					// they won't know what to do so don't report an error. Just quietly die.
-					return 0;
-				}					
+//					return 0;
+//				}					
 
 				$datarray['type'] = 'remote-comment';
 				$datarray['wall'] = 1;
@@ -1892,12 +2077,51 @@ function local_delivery($importer,$data) {
 				$datarray['owner-link'] = $r[0]['url'];
 				$datarray['owner-avatar'] = $r[0]['thumb'];
 				$datarray['contact-id'] = $importer['id'];
-				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+				if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
 					$is_like = true;
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
 				}
+
+				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+
+					$xo = parse_xml_string($datarray['object'],false);
+					$xt = parse_xml_string($datarray['target'],false);
+
+					if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) {
+
+						// extract tag, if not duplicate, and this user allows tags, add to parent item						
+
+						if($xo->id && $xo->content) {
+							$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+
+							if(! (stristr($r[0]['tag'],$newtag))) {
+								$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
+									intval($importer['importer_uid'])
+								);
+								if(count($i) && ! ($i[0]['blocktags'])) {
+									q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+										dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
+										intval($r[0]['id'])
+									);
+								}
+							}
+						}													
+					}
+				}
+
+// 				if($community) {
+//					$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
+//					if(! stristr($datarray['tag'],$newtag)) {
+//						if(strlen($datarray['tag']))
+//							$datarray['tag'] .= ',';
+//						$datarray['tag'] .= $newtag;
+//					}
+//				}
+
+
 				$posted_id = item_store($datarray);
 				$parent = 0;
 
@@ -2045,6 +2269,32 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
+
+				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+					$xo = parse_xml_string($datarray['object'],false);
+					$xt = parse_xml_string($datarray['target'],false);
+
+					if($xt->type == ACTIVITY_OBJ_NOTE) {
+						$r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+							dbesc($xt->id),
+							intval($importer['importer_uid'])
+						);
+						if(! count($r))
+							continue;				
+
+						// extract tag, if not duplicate, add to parent item						
+						if($xo->content) {
+							if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+								q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+									dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+									intval($r[0]['id'])
+								);
+							}
+						}													
+					}
+				}
+
 				$posted_id = item_store($datarray);
 
 				// find out if our user is involved in this conversation and wants to be notified.
@@ -2232,12 +2482,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 	
 		// create contact record
 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, 
 			`blocked`, `readonly`, `pending`, `writable` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
 			intval($importer['uid']),
 			dbesc(datetime_convert()),
 			dbesc($url),
+			dbesc(normalise_link($url)),
 			dbesc($name),
 			dbesc($nick),
 			dbesc($photo),
@@ -2509,7 +2760,7 @@ function item_getfeedtags($item) {
 	$matches = false;
 	$cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
 	if($cnt) {
-		for($x = 0; $x < count($matches); $x ++) {
+		for($x = 0; $x < $cnt; $x ++) {
 			if($matches[1][$x])
 				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
 		}
@@ -2517,9 +2768,9 @@ function item_getfeedtags($item) {
 	$matches = false; 
 	$cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
 	if($cnt) {
-		for($x = 0; $x < count($matches); $x ++) {
+		for($x = 0; $x < $cnt; $x ++) {
 			if($matches[1][$x])
-				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+				$ret[] = array('@',$matches[1][$x], $matches[2][$x]);
 		}
 	} 
 	return $ret;
@@ -2563,14 +2814,32 @@ function item_expire($uid,$days) {
 
 	if(! count($r))
 		return;
+
+	$expire_items = get_pconfig($uid, 'expire','items');
+	$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
+	
+	$expire_notes = get_pconfig($uid, 'expire','notes');
+	$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
+
+	$expire_starred = get_pconfig($uid, 'expire','starred');
+	$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
+	
+	$expire_photos = get_pconfig($uid, 'expire','photos');
+	$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
  
-	logger('expire: # items=' . count($r) );
+	logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
 	foreach($r as $item) {
 
 		// Only expire posts, not photos and photo comments
 
-		if(strlen($item['resource-id']))
+		if($expire_photos==0 && strlen($item['resource-id']))
+			continue;
+		if($expire_starred==0 && intval($item['starred']))
+			continue;
+		if($expire_notes==0 && $item['type']=='note')
+			continue;
+		if($expire_items==0 && $item['type']!='note')
 			continue;
 
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
@@ -2591,7 +2860,7 @@ function item_expire($uid,$days) {
 	}
 
 	proc_run('php',"include/notifier.php","expire","$uid");
-
+	
 }
 
 
@@ -2719,4 +2988,4 @@ function drop_item($id,$interactive = true) {
 		//NOTREACHED
 	}
 	
-}
\ No newline at end of file
+}