Merge remote-tracking branch 'upstream/develop' into improved-payload

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 86a6ff69f302c3d97ea1b2100716a7e417e43e90..adb1c89f46731a30ffa67c590cd72e012cadc06f 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
  *
@@ -28,6 +28,7 @@ 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;
@@ -48,12 +49,12 @@ 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);
 
 
-       $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);
@@ -136,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'];
@@ -175,7 +176,9 @@ EOT;
 
        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();
 }