Update mod/salmon.php

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index e3ae6b9b5c0c4139cc56d28e8a4a4409f25078f3..af555790a53fda3a083758d36ca30d44187bce31 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,8 +27,10 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -48,39 +50,27 @@ function tagger_content(App $a) {
                return;
        }
 
-       $item_id = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0);
+       $item_id = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : 0);
 
-       Logger::log('tagger: tag ' . $term . ' item ' . $item_id);
+       Logger::notice('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);
+               Logger::notice('tagger: no item ' . $item_id);
                return;
        }
 
        $owner_uid = $item['uid'];
-       $blocktags = 0;
-
-       $r = q("select `blocktags` from user where uid = %d limit 1",
-               intval($owner_uid)
-       );
-       if (DBA::isResult($r)) {
-               $blocktags = $r[0]['blocktags'];
-       }
 
        if (local_user() != $owner_uid) {
                return;
        }
 
-       $r = q("select * from contact where self = 1 and uid = %d limit 1",
-               intval(local_user())
-       );
-       if (DBA::isResult($r)) {
-                       $contact = $r[0];
-       } else {
-               Logger::log('tagger: no contact_id');
+       $contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]);
+       if (!DBA::isResult($contact)) {
+               Logger::notice('tagger: no contact_id');
                return;
        }
 
@@ -136,7 +126,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'];
@@ -169,53 +159,15 @@ EOT;
                Item::update(['visible' => true], ['id' => $item['id']]);
        }
 
-       $term_objtype = ($item['resource-id'] ? Term::OBJECT_TYPE_PHOTO : Term::OBJECT_TYPE_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;
 
        Hook::callAll('post_local_end', $arr);
 
-       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post_id);
+       $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
+
+       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
 
        exit();
 }