Merge pull request #12078 from MrPetovan/task/4090-move-mod-wallmessage

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 4c0af4a53227692da3b079554ad3cf4fd837c7bc..dae9cbc2bc76a0ad81053d0240fd4a2a34caa582 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -35,9 +34,9 @@ use Friendica\Protocol\Activity;
 use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
 
-function tagger_content(App $a) {
-
-       if (!Session::isAuthenticated()) {
+function tagger_content(App $a)
+{
+       if (!DI::userSession()->isAuthenticated()) {
                return;
        }
 
@@ -51,7 +50,7 @@ function tagger_content(App $a) {
 
        $item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0);
 
-       Logger::notice('tagger: tag ' . $term . ' item ' . $item_id);
+       Logger::info('tagger: tag', ['term' =>  $term, 'item' => $item_id]);
 
 
        $item = Post::selectFirst([], ['id' => $item_id]);
@@ -63,17 +62,17 @@ function tagger_content(App $a) {
 
        $owner_uid = $item['uid'];
 
-       if (local_user() != $owner_uid) {
+       if (DI::userSession()->getLocalUserId() != $owner_uid) {
                return;
        }
 
-       $contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]);
+       $contact = Contact::selectFirst([], ['self' => true, 'uid' => DI::userSession()->getLocalUserId()]);
        if (!DBA::isResult($contact)) {
-               Logger::notice('tagger: no contact_id');
+               Logger::warning('Self contact not found.', ['uid' => DI::userSession()->getLocalUserId()]);
                return;
        }
 
-       $uri = Item::newURI($owner_uid);
+       $uri = Item::newURI();
        $xterm = XML::escape($term);
        $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
        $targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
@@ -116,41 +115,41 @@ EOT;
 
        $termlink = html_entity_decode('⌗') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
-       $arr = [];
-
-       $arr['guid'] = System::createUUID();
-       $arr['uri'] = $uri;
-       $arr['uid'] = $owner_uid;
-       $arr['contact-id'] = $contact['id'];
-       $arr['wall'] = $item['wall'];
-       $arr['gravity'] = GRAVITY_COMMENT;
-       $arr['parent'] = $item['id'];
-       $arr['thr-parent'] = $item['uri'];
-       $arr['owner-name'] = $item['author-name'];
-       $arr['owner-link'] = $item['author-link'];
-       $arr['owner-avatar'] = $item['author-avatar'];
-       $arr['author-name'] = $contact['name'];
-       $arr['author-link'] = $contact['url'];
-       $arr['author-avatar'] = $contact['thumb'];
-
        $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
        $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
        $plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
-       $arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink, $termlink );
-
-       $arr['verb'] = Activity::TAG;
-       $arr['target-type'] = $targettype;
-       $arr['target'] = $target;
-       $arr['object-type'] = $objtype;
-       $arr['object'] = $obj;
-       $arr['private'] = $item['private'];
-       $arr['allow_cid'] = $item['allow_cid'];
-       $arr['allow_gid'] = $item['allow_gid'];
-       $arr['deny_cid'] = $item['deny_cid'];
-       $arr['deny_gid'] = $item['deny_gid'];
-       $arr['visible'] = 1;
-       $arr['unseen'] = 1;
-       $arr['origin'] = 1;
+
+       $arr = [
+               'guid'          => System::createUUID(),
+               'uri'           => $uri,
+               'uid'           => $owner_uid,
+               'contact-id'    => $contact['id'],
+               'wall'          => $item['wall'],
+               'gravity'       => Item::GRAVITY_COMMENT,
+               'parent'        => $item['id'],
+               'thr-parent'    => $item['uri'],
+               'owner-name'    => $item['author-name'],
+               'owner-link'    => $item['author-link'],
+               'owner-avatar'  => $item['author-avatar'],
+               'author-name'   => $contact['name'],
+               'author-link'   => $contact['url'],
+               'author-avatar' => $contact['thumb'],
+               'body'          => sprintf($bodyverb, $ulink, $alink, $plink, $termlink),
+               'verb'          => Activity::TAG,
+               'target-type'   => $targettype,
+               'target'        => $target,
+               'object-type'   => $objtype,
+               'object'        => $obj,
+               'private'       => $item['private'],
+               'allow_cid'     => $item['allow_cid'],
+               'allow_gid'     => $item['allow_gid'],
+               'deny_cid'      => $item['deny_cid'],
+               'deny_gid'      => $item['deny_gid'],
+               'visible'       => 1,
+               'unseen'        => 1,
+               'origin'        => 1,
+       ];
+
 
        $post_id = Item::insert($arr);
 
@@ -166,7 +165,6 @@ EOT;
 
        $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
 
-       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
-       DI::page()->logRuntime();
-       exit();
+       Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
+       System::exit();
 }