From 1ba9a65fd8b266f410e0c981b101d9db096679bf Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 3 Nov 2022 22:26:48 -0400 Subject: [PATCH] Add new Post/Tag/Add module class - Convert GET to POST --- src/Module/Post/Tag/Add.php | 173 +++++++++++++++++++ static/routes.config.php | 1 + view/templates/jot-header.tpl | 2 +- view/theme/frio/templates/jot-header.tpl | 2 +- view/theme/smoothly/templates/jot-header.tpl | 2 +- 5 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 src/Module/Post/Tag/Add.php diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php new file mode 100644 index 000000000..adc846378 --- /dev/null +++ b/src/Module/Post/Tag/Add.php @@ -0,0 +1,173 @@ +. + * + */ + +namespace Friendica\Module\Post\Tag; + +use Friendica\App; +use Friendica\Core\Hook; +use Friendica\Core\L10n; +use Friendica\Core\Session\Capability\IHandleUserSessions; +use Friendica\Core\System; +use Friendica\Core\Worker; +use Friendica\Model\Contact; +use Friendica\Model\Item; +use Friendica\Model\Post; +use Friendica\Model\Tag; +use Friendica\Module\Response; +use Friendica\Protocol\Activity; +use Friendica\Util\Profiler; +use Friendica\Util\XML; +use Friendica\Worker\Delivery; +use Psr\Log\LoggerInterface; + +/** + * Asynchronous post tagging endpoint. Only used in Ajax calls. + */ +class Add extends \Friendica\BaseModule +{ + /** @var IHandleUserSessions */ + private $session; + + public function __construct(IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + { + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->session = $session; + } + + protected function post(array $request = []) + { + if (!$this->session->isAuthenticated()) { + return; + } + + $term = trim($request['term'] ?? ''); + // no commas allowed + $term = str_replace([',', ' ', '<', '>'], ['', '_', '', ''], $term); + + if (!$term) { + return; + } + + $item_id = $this->parameters['item_id']; + + $this->logger->debug('Tag', ['term' => $term, 'item_id' => $item_id]); + + $item = Post::selectFirst([], ['id' => $item_id]); + if (!$item) { + $this->logger->info('Item not found', ['item_id' => $item_id]); + return; + } + + $owner_uid = $item['uid']; + if ($this->session->getLocalUserId() != $owner_uid) { + return; + } + + $contact = Contact::selectFirst([], ['self' => true, 'uid' => $this->session->getLocalUserId()]); + if (!$contact) { + $this->logger->warning('Self contact not found.', ['uid' => $this->session->getLocalUserId()]); + return; + } + + $targettype = $item['resource-id'] ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE; + $link = XML::escape('' . "\n"); + $body = XML::escape($item['body']); + + $target = <<< EOT + + $targettype + 1 + {$item['uri']} + $link + + $body + +EOT; + + $objtype = Activity\ObjectType::TAGTERM; + $tagid = $this->baseUrl . '/search?tag=' . urlencode($term); + $xterm = XML::escape($term); + + $obj = <<< EOT + + $objtype + 1 + $tagid + $tagid + $xterm + $xterm + +EOT; + + $tagger_link = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; + $aauthor_link = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; + $post_link = '[url=' . $item['plink'] . ']' . ($item['resource-id'] ? $this->t('photo') : $this->t('status')) . '[/url]'; + $term_link = '#[url=' . $tagid . ']' . $term . '[/url]'; + + $post = [ + 'guid' => System::createUUID(), + 'uri' => Item::newURI(), + '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' => $this->t('%1$s tagged %2$s\'s %3$s with %4$s', $tagger_link, $aauthor_link, $post_link, $term_link), + '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($post); + + if (!$item['visible']) { + Item::update(['visible' => true], ['id' => $item['id']]); + } + + Tag::store($item['uri-id'], Tag::HASHTAG, $term); + + $post['id'] = $post_id; + Hook::callAll('post_local_end', $post); + + $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]); + + Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::POST, $post['uri-id'], $post['uid']); + System::exit(); + } +} diff --git a/static/routes.config.php b/static/routes.config.php index 9066c4876..ef4b1345c 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -533,6 +533,7 @@ return [ '/ping' => [Module\Notifications\Ping::class, [R::GET]], '/post' => [ + '/{item_id}/tag/add' => [Module\Post\Tag\Add::class, [ R::POST]], '/{item_id}/tag/remove[/{tag_name}]' => [Module\Post\Tag\Remove::class, [R::GET, R::POST]], ], diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl index c6656d886..9b47ed56a 100644 --- a/view/templates/jot-header.tpl +++ b/view/templates/jot-header.tpl @@ -184,7 +184,7 @@ function enableOnUser(){ commentBusy = true; $('body').css('cursor', 'wait'); - $.get('tagger/' + id + '?term=' + reply); + $.post('post/' + id + '/tag/add', {term: reply}); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); liking = 1; diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl index bc5b20888..23aa8663f 100644 --- a/view/theme/frio/templates/jot-header.tpl +++ b/view/theme/frio/templates/jot-header.tpl @@ -260,7 +260,7 @@ commentBusy = true; $('body').css('cursor', 'wait'); - $.get('tagger/' + id + '?term=' + reply); + $.post('post/' + id + '/tag/add', {term: reply}); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); liking = 1; diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl index cfd21035d..a2be04302 100644 --- a/view/theme/smoothly/templates/jot-header.tpl +++ b/view/theme/smoothly/templates/jot-header.tpl @@ -210,7 +210,7 @@ function enableOnUser(){ commentBusy = true; $('body').css('cursor', 'wait'); - $.get('tagger/' + id + '?term=' + reply); + $.post('post/' + id + '/tag/add', {term: reply}); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); liking = 1;