Only import new OStatus posts if they are from our followers

[friendica.git] / include / tags.php

diff --git a/include/tags.php b/include/tags.php
index e3e4edfa17f9c21a024083b01b365839b7b496de..0a094384782bb4358af16ac28811182ade537a84 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,13 +1,11 @@
 <?php
 function create_tags_from_item($itemid) {
-       global $a;
-
-       $profile_base = $a->get_baseurl();
+       $profile_base = App::get_baseurl();
        $profile_data = parse_url($profile_base);
        $profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
        $profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
 
-       $searchpath = $a->get_baseurl()."/search?tag=";
+       $searchpath = App::get_baseurl()."/search?tag=";
 
        $messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
@@ -37,6 +35,9 @@ function create_tags_from_item($itemid) {
 
        $data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
 
+       // ignore anything in a code block
+       $data = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$data);
+
        $tags = array();
 
        $pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
@@ -112,8 +113,7 @@ function create_tags_from_itemuri($itemuri, $uid) {
 function update_items() {
        global $db;
 
-//        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''", true);
-        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1", true);
+        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''", true);
 
         logger("fetched messages: ".count($messages));
         while ($message = $db->qfetch()) {
@@ -129,12 +129,21 @@ function update_items() {
 
                        $global = (count($isglobal) > 0);
                }
-echo $message["created"]." - ".$message["guid"]."\n";
+
                q("UPDATE `term` SET `guid` = '%s', `created` = '%s', `received` = '%s', `global` = %d WHERE `otype` = %d AND `oid` = %d",
                        dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]),
                        intval($global), intval(TERM_OBJ_POST), intval($message["oid"]));
        }
 
         $db->qclose();
+
+       $messages = $db->q("SELECT `guid` FROM `item` WHERE `uid` = 0", true);
+
+       logger("fetched messages: ".count($messages));
+       while ($message = $db->qfetch()) {
+               q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message["guid"]));
+       }
+
+       $db->qclose();
 }
 ?>