X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=a6f35cea12432c9c2cb41533de8b26bef607ea6f;hb=4683cfee123904032cebc5b6d6719c8c712caa24;hp=5d3d1923e4425958b4d53a00e3ea436cd8553c76;hpb=c9cce8492e5b2607b2a092474d1de4d188b7a2c9;p=friendica.git
diff --git a/mod/tagger.php b/mod/tagger.php
index 5d3d1923e4..a6f35cea12 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,21 +1,41 @@
.
+ *
*/
+
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\Protocol\Activity;
use Friendica\Util\Strings;
use Friendica\Util\XML;
+use Friendica\Worker\Delivery;
function tagger_content(App $a) {
- if (!local_user() && !remote_user()) {
+ if (!Session::isAuthenticated()) {
return;
}
@@ -65,9 +85,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'));
- $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
- $href = System::baseUrl() . '/display/' . $item['guid'];
+ $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
+ $targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
+ $href = DI::baseUrl() . '/display/' . $item['guid'];
$link = XML::escape('' . "\n");
@@ -84,8 +104,8 @@ function tagger_content(App $a) {
EOT;
- $tagid = System::baseUrl() . '/search?tag=' . $xterm;
- $objtype = ACTIVITY_OBJ_TAGTERM;
+ $tagid = DI::baseUrl() . '/search?tag=' . $xterm;
+ $objtype = Activity\ObjectType::TAGTERM;
$obj = <<< EOT
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('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
+ $termlink = html_entity_decode('⌗') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
$arr = [];
@@ -128,7 +148,7 @@ EOT;
$plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink, $termlink );
- $arr['verb'] = ACTIVITY_TAG;
+ $arr['verb'] = Activity::TAG;
$arr['target-type'] = $targettype;
$arr['target'] = $target;
$arr['object-type'] = $objtype;
@@ -194,7 +214,7 @@ EOT;
Hook::callAll('post_local_end', $arr);
- Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post_id);
exit();
}