X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=310e3c6140347851bd3f59ff75186a49d8da1593;hb=98f55ddb2ba8888dfc75845ed5aaa4c663b90b64;hp=717c0947769d47b9fb30bd6101332e4a90c22e47;hpb=8a3cae686b9067b43055a5d3ee7ba3313b88f495;p=friendica.git diff --git a/mod/tagger.php b/mod/tagger.php index 717c094776..310e3c6140 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -1,84 +1,87 @@ . + * */ + use Friendica\App; -use Friendica\Core\Addon; -use Friendica\Core\L10n; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Contact; use Friendica\Model\Item; - -require_once 'include/security.php'; -require_once 'include/items.php'; +use Friendica\Model\Post; +use Friendica\Model\Tag; +use Friendica\Protocol\Activity; +use Friendica\Util\XML; +use Friendica\Worker\Delivery; function tagger_content(App $a) { - if (!local_user() && !remote_user()) { + if (!Session::isAuthenticated()) { return; } - $term = notags(trim($_GET['term'])); + $term = trim($_GET['term'] ?? ''); // no commas allowed - $term = str_replace([',',' '],['','_'],$term); + $term = str_replace([',',' ', '<', '>'],['','_', '', ''], $term); if (!$term) { return; } - $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0); + $item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0); - logger('tagger: tag ' . $term . ' item ' . $item_id); + Logger::notice('tagger: tag ' . $term . ' item ' . $item_id); - $item = Item::selectFirst([], ['id' => $item_id]); + $item = Post::selectFirst([], ['id' => $item_id]); - if (!$item_id || !DBM::is_result($item)) { - logger('tagger: no item ' . $item_id); + if (!$item_id || !DBA::isResult($item)) { + Logger::notice('tagger: no item ' . $item_id); return; } $owner_uid = $item['uid']; - $owner_nick = ''; - $blocktags = 0; - - $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1", - intval($owner_uid) - ); - if (DBM::is_result($r)) { - $owner_nick = $r[0]['nickname']; - $blocktags = $r[0]['blocktags']; - } if (local_user() != $owner_uid) { return; } - $r = q("select * from contact where self = 1 and uid = %d limit 1", - intval(local_user()) - ); - if (DBM::is_result($r)) { - $contact = $r[0]; - } else { - logger('tagger: no contact_id'); + $contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]); + if (!DBA::isResult($contact)) { + Logger::notice('tagger: no contact_id'); return; } $uri = Item::newURI($owner_uid); - $xterm = xmlify($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']; - } + $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 ); + $href = DI::baseUrl() . '/display/' . $item['guid']; - $link = xmlify('' . "\n") ; + $link = XML::escape('' . "\n"); - $body = xmlify($item['body']); + $body = XML::escape($item['body']); $target = <<< EOT @@ -91,8 +94,8 @@ function tagger_content(App $a) { EOT; - $tagid = System::baseUrl() . '/search?tag=' . $term; - $objtype = ACTIVITY_OBJ_TAGTERM; + $tagid = DI::baseUrl() . '/search?tag=' . $xterm; + $objtype = Activity\ObjectType::TAGTERM; $obj = <<< EOT @@ -105,25 +108,24 @@ 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=' . urlencode($term) . ']'. $term . '[/url]'; + $termlink = html_entity_decode('⌗') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'; $arr = []; - $arr['guid'] = get_guid(32); + $arr['guid'] = System::createUUID(); $arr['uri'] = $uri; $arr['uid'] = $owner_uid; $arr['contact-id'] = $contact['id']; - $arr['type'] = 'activity'; $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']; @@ -136,7 +138,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; @@ -156,55 +158,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']), - dbesc($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, - dbesc($term), - dbesc(System::baseUrl() . '/search?tag=' . $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 (DBM::is_result($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']), - dbesc($term) - ); - - if (DBM::is_result($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, - dbesc($term), - dbesc(System::baseUrl() . '/search?tag=' . $term), - intval($owner_uid) - ); - } - } - + Tag::store($item['uri-id'], Tag::HASHTAG, $term); $arr['id'] = $post_id; - Addon::callHooks('post_local_end', $arr); + Hook::callAll('post_local_end', $arr); - Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id); + $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]); - killme(); + Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']); - return; // NOTREACHED + exit(); }