Fix travis services entry

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 7532adb3fba69b407f2566366e28d61b7061b56e..b3ba472eab829d53f16bd4f21cfa7964162ec085 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,17 +1,35 @@
 <?php
 /**
- * @file mod/tagger.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Tag;
+use Friendica\Model\Term;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -69,9 +87,9 @@ function tagger_content(App $a) {
 
        $uri = Item::newURI($owner_uid);
        $xterm = XML::escape($term);
-       $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
+       $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
        $targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
-       $href = System::baseUrl() . '/display/' . $item['guid'];
+       $href = DI::baseUrl() . '/display/' . $item['guid'];
 
        $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
@@ -88,7 +106,7 @@ function tagger_content(App $a) {
        </target>
 EOT;
 
-       $tagid = System::baseUrl() . '/search?tag=' . $xterm;
+       $tagid = DI::baseUrl() . '/search?tag=' . $xterm;
        $objtype = Activity\ObjectType::TAGTERM;
 
        $obj = <<< EOT
@@ -102,13 +120,13 @@ EOT;
        </object>
 EOT;
 
-       $bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
+       $bodyverb = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s');
 
        if (!isset($bodyverb)) {
                return;
        }
 
-       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('&#x2317;') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
        $arr = [];
 
@@ -152,7 +170,9 @@ EOT;
                Item::update(['visible' => true], ['id' => $item['id']]);
        }
 
-       $term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
+       $term_objtype = ($item['resource-id'] ? Term::OBJECT_TYPE_PHOTO : Term::OBJECT_TYPE_POST);
+
+       Tag::store($item['uri-id'], Tag::HASHTAG, $term);
 
        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
                intval($item['id']),
@@ -163,7 +183,7 @@ EOT;
                q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
                   intval($item['id']),
                   $term_objtype,
-                  TERM_HASHTAG,
+                  Term::HASHTAG,
                   DBA::escape($term),
                   '',
                   intval($owner_uid)
@@ -185,7 +205,7 @@ EOT;
                        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,
+                               Term::HASHTAG,
                                DBA::escape($term),
                                '',
                                intval($owner_uid)