X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftags.php;h=fbb9e6ff776fdbe28850b683076c78555eb68bce;hb=30efb0c1e641b0b9d3aa40a5a79897c6d06ac3ef;hp=c81a752d544ce2bb66947391982b41b47a9b8cb6;hpb=41f31f32824849a475b0259b4d5987e179f00b16;p=friendica.git

diff --git a/include/tags.php b/include/tags.php
index c81a752d54..fbb9e6ff77 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,20 +1,4 @@
 <?php
-/*
-require_once("boot.php");
-if(@is_null($a)) {
-        $a = new App;
-}
-
-if(is_null($db)) {
-        @include(".htconfig.php");
-        require_once("dba.php");
-        $db = new dba($db_host, $db_user, $db_pass, $db_data);
-        unset($db_host, $db_user, $db_pass, $db_data);
-};
-
-$a->set_baseurl("https://pirati.ca");
-*/
-
 function create_tags_from_item($itemid) {
 	global $a;
 
@@ -25,7 +9,7 @@ function create_tags_from_item($itemid) {
 
 	$searchpath = $a->get_baseurl()."/search?tag=";
 
-	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `title`, `body`, `tag` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
+	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
 	if (!$messages)
 		return;
@@ -79,6 +63,12 @@ function create_tags_from_item($itemid) {
 	foreach ($tags as $tag=>$link) {
 
 		if (substr(trim($tag), 0, 1) == "#") {
+			// try to ignore #039 or #1 or anything like that
+			if(ctype_digit(substr(trim($tag),1)))
+				continue;
+			// try to ignore html hex escapes, e.g. #x2317
+			if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
+				continue;
 			$type = TERM_HASHTAG;
 			$term = substr($tag, 1);
 		} elseif (substr(trim($tag), 0, 1) == "@") {
@@ -96,8 +86,11 @@ function create_tags_from_item($itemid) {
 		if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) {
 			$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
 			foreach ($users AS $user) {
-				if ($user["uid"] == $message["uid"])
+				if ($user["uid"] == $message["uid"]) {
 					q("UPDATE `item` SET `mention` = 1 WHERE `id` = %d", intval($itemid));
+
+					q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($message["parent"]));
+				}
 			}
 		}
 	}
@@ -106,8 +99,10 @@ function create_tags_from_item($itemid) {
 function create_tags_from_itemuri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	foreach ($messages as $message)
-		create_tags_from_item($message["id"]);
+	if(count($messages)) {
+		foreach ($messages as $message)
+			create_tags_from_item($message["id"]);
+	}
 }
 
 function update_items() {
@@ -117,11 +112,4 @@ function update_items() {
 	foreach ($messages as $message)
 		create_tags_from_item($message["id"]);
 }
-
-//print_r($tags);
-//print_r($hashtags);
-//print_r($mentions);
-//update_items();
-//create_tags_from_item(265194);
-//create_tags_from_itemuri("infoagent@diasp.org:cce94abd104c06e8", 2);
 ?>