The thread table is replaced by post-thread and post-thread-user

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index a6f35cea12432c9c2cb41533de8b26bef607ea6f..38575a21596cd9c13c3bd840e34825e108dad257 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -28,6 +28,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -52,7 +54,7 @@ function tagger_content(App $a) {
        Logger::log('tagger: tag ' . $term . ' item ' . $item_id);
 
 
-       $item = Item::selectFirst([], ['id' => $item_id]);
+       $item = Post::selectFirst([], ['id' => $item_id]);
 
        if (!$item_id || !DBA::isResult($item)) {
                Logger::log('tagger: no item ' . $item_id);
@@ -135,7 +137,7 @@ EOT;
        $arr['wall'] = $item['wall'];
        $arr['gravity'] = GRAVITY_COMMENT;
        $arr['parent'] = $item['id'];
-       $arr['parent-uri'] = $item['uri'];
+       $arr['thr-parent'] = $item['uri'];
        $arr['owner-name'] = $item['author-name'];
        $arr['owner-link'] = $item['author-link'];
        $arr['owner-avatar'] = $item['author-avatar'];
@@ -168,47 +170,7 @@ EOT;
                Item::update(['visible' => true], ['id' => $item['id']]);
        }
 
-       $term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
-
-       $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
-               intval($item['id']),
-               DBA::escape($term)
-       );
-
-       if (!$blocktags && $t[0]['tcount'] == 0) {
-               q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
-                  intval($item['id']),
-                  $term_objtype,
-                  TERM_HASHTAG,
-                  DBA::escape($term),
-                  '',
-                  intval($owner_uid)
-               );
-       }
-
-       // if the original post is on this site, update it.
-       $original_item = Item::selectFirst(['tag', 'id', 'uid'], ['origin' => true, 'uri' => $item['uri']]);
-       if (DBA::isResult($original_item)) {
-               $x = q("SELECT `blocktags` FROM `user` WHERE `uid`=%d LIMIT 1",
-                       intval($original_item['uid'])
-               );
-               $t = q("SELECT COUNT(`tid`) AS `tcount` FROM `term` WHERE `oid`=%d AND `term`='%s'",
-                       intval($original_item['id']),
-                       DBA::escape($term)
-               );
-
-               if (DBA::isResult($x) && !$x[0]['blocktags'] && $t[0]['tcount'] == 0){
-                       q("INSERT INTO term (`oid`, `otype`, `type`, `term`, `url`, `uid`) VALUE (%d, %d, %d, '%s', '%s', %d)",
-                               intval($original_item['id']),
-                               $term_objtype,
-                               TERM_HASHTAG,
-                               DBA::escape($term),
-                               '',
-                               intval($owner_uid)
-                       );
-               }
-       }
-
+       Tag::store($item['uri-id'], Tag::HASHTAG, $term);
 
        $arr['id'] = $post_id;