X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=adb1c89f46731a30ffa67c590cd72e012cadc06f;hb=7cdd2d1336e768def2f9b2dc1d4026f8d9bb3804;hp=7cb43e330c951989b94e61cb7375dfe9836e20f0;hpb=854cc3e47296d4a1b01b893376064cf254d84f79;p=friendica.git
diff --git a/mod/tagger.php b/mod/tagger.php
index 7cb43e330c..adb1c89f46 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,21 +1,43 @@
.
+ *
*/
+
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\Post;
+use Friendica\Model\Tag;
+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;
}
@@ -27,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);
@@ -40,14 +62,12 @@ function tagger_content(App $a) {
}
$owner_uid = $item['uid'];
- $owner_nick = '';
$blocktags = 0;
- $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
+ $r = q("select `blocktags` from user where uid = %d limit 1",
intval($owner_uid)
);
if (DBA::isResult($r)) {
- $owner_nick = $r[0]['nickname'];
$blocktags = $r[0]['blocktags'];
}
@@ -67,14 +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'));
- $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-
- if ($owner_nick) {
- $href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
- } else {
- $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");
@@ -91,8 +106,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 = [];
@@ -122,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'];
@@ -135,7 +150,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;
@@ -155,53 +170,15 @@ EOT;
Item::update(['visible' => true], ['id' => $item['id']]);
}
- $term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_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", "tag", $post_id);
+ $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
+
+ Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
exit();
}