keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12100 from MrPetovan/task/4090-move-mod-tagger

Browse source 
Move mod/tagger.php to src/Module
This commit is contained in:
Philipp 2022-11-04 07:17:45 +01:00 committed by GitHub
commit 891f686dcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 208 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

170
mod/tagger.php
View file

@ -1,170 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2022, the Friendica project
*
* @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\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
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 (!DI::userSession()->isAuthenticated()) {
return;
}
$term = trim($_GET['term'] ?? '');
// no commas allowed
$term = str_replace([',',' ', '<', '>'],['','_', '', ''], $term);
if (!$term) {
return;
}
$item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0);
Logger::info('tagger: tag', ['term' => $term, 'item' => $item_id]);
$item = Post::selectFirst([], ['id' => $item_id]);
if (!$item_id || !DBA::isResult($item)) {
Logger::notice('tagger: no item ' . $item_id);
return;
}
$owner_uid = $item['uid'];
if (DI::userSession()->getLocalUserId() != $owner_uid) {
return;
}
$contact = Contact::selectFirst([], ['self' => true, 'uid' => DI::userSession()->getLocalUserId()]);
if (!DBA::isResult($contact)) {
Logger::warning('Self contact not found.', ['uid' => DI::userSession()->getLocalUserId()]);
return;
}
$uri = Item::newURI();
$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 = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
$body = XML::escape($item['body']);
$target = <<< EOT
<target>
<type>$targettype</type>
<local>1</local>
<id>{$item['uri']}</id>
<link>$link</link>
<title></title>
<content>$body</content>
</target>
EOT;
$tagid = DI::baseUrl() . '/search?tag=' . $xterm;
$objtype = Activity\ObjectType::TAGTERM;
$obj = <<< EOT
<object>
<type>$objtype</type>
<local>1</local>
<id>$tagid</id>
<link>$tagid</link>
<title>$xterm</title>
<content>$xterm</content>
</object>
EOT;
$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=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
$arr = [
'guid' => System::createUUID(),
'uri' => $uri,
'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' => sprintf($bodyverb, $ulink, $alink, $plink, $termlink),
'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($arr);
if (!$item['visible']) {
Item::update(['visible' => true], ['id' => $item['id']]);
}
Tag::store($item['uri-id'], Tag::HASHTAG, $term);
$arr['id'] = $post_id;
Hook::callAll('post_local_end', $arr);
$post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
System::exit();
}

173
src/Module/Post/Tag/Add.php Normal file
View file

@ -0,0 +1,173 @@
<?php
/**
* @copyright Copyright (C) 2010-2022, the Friendica project
*
* @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/>.
*
*/
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('<link rel="alternate" type="text/html" href="' . $this->baseUrl . '/display/' . $item['guid'] . '" />' . "\n");
$body = XML::escape($item['body']);
$target = <<< EOT
<target>
<type>$targettype</type>
<local>1</local>
<id>{$item['uri']}</id>
<link>$link</link>
<title></title>
<content>$body</content>
</target>
EOT;
$objtype = Activity\ObjectType::TAGTERM;
$tagid = $this->baseUrl . '/search?tag=' . urlencode($term);
$xterm = XML::escape($term);
$obj = <<< EOT
<object>
<type>$objtype</type>
<local>1</local>
<id>$tagid</id>
<link>$tagid</link>
<title>$xterm</title>
<content>$xterm</content>
</object>
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();
}
}

1
static/routes.config.php
View file

@ -533,6 +533,7 @@ return [
'/ping' => [Module\Notifications\Ping::class, [R::GET]], '/ping' => [Module\Notifications\Ping::class, [R::GET]],
'/post' => [ '/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]], '/{item_id}/tag/remove[/{tag_name}]' => [Module\Post\Tag\Remove::class, [R::GET, R::POST]],
], ],

60
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.12-dev\n" "Project-Id-Version: 2022.12-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-03 20:18+0000\n" "POT-Creation-Date: 2022-11-03 22:30-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1333,19 +1333,6 @@ msgstr ""
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
#: mod/tagger.php:77 src/Content/Item.php:304 src/Model/Item.php:2873
msgid "photo"
msgstr ""
#: mod/tagger.php:77 src/Content/Item.php:298 src/Content/Item.php:308
msgid "status"
msgstr ""
#: mod/tagger.php:110 src/Content/Item.php:318
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
#: src/App.php:490 #: src/App.php:490
msgid "No system theme config value set." msgid "No system theme config value set."
msgstr "" msgstr ""
@ -2096,10 +2083,25 @@ msgstr ""
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/Item.php:295 src/Model/Item.php:2871 #: src/Content/Item.php:295 src/Model/Item.php:2875
msgid "event" msgid "event"
msgstr "" msgstr ""
#: src/Content/Item.php:298 src/Content/Item.php:308
#: src/Module/Post/Tag/Add.php:123
msgid "status"
msgstr ""
#: src/Content/Item.php:304 src/Model/Item.php:2877
#: src/Module/Post/Tag/Add.php:123
msgid "photo"
msgstr ""
#: src/Content/Item.php:318 src/Module/Post/Tag/Add.php:141
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
#: src/Content/Item.php:387 view/theme/frio/theme.php:267 #: src/Content/Item.php:387 view/theme/frio/theme.php:267
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
@ -2449,8 +2451,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1243 src/Model/Item.php:3472 #: src/Content/Text/BBCode.php:1243 src/Model/Item.php:3476
#: src/Model/Item.php:3478 src/Model/Item.php:3479 #: src/Model/Item.php:3482 src/Model/Item.php:3483
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -3560,66 +3562,66 @@ msgstr ""
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
#: src/Model/Item.php:1983 #: src/Model/Item.php:1987
#, php-format #, php-format
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:2875 #: src/Model/Item.php:2879
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2877 #: src/Model/Item.php:2881
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2880 #: src/Model/Item.php:2884
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3021 #: src/Model/Item.php:3025
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3384 #: src/Model/Item.php:3388
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3415 #: src/Model/Item.php:3419
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3417 #: src/Model/Item.php:3421
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3422 #: src/Model/Item.php:3426
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3424 #: src/Model/Item.php:3428
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3426 #: src/Model/Item.php:3430
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3460 src/Model/Item.php:3461 #: src/Model/Item.php:3464 src/Model/Item.php:3465
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""

2
view/templates/jot-header.tpl
View file

@ -184,7 +184,7 @@ function enableOnUser(){
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply); $.post('post/' + id + '/tag/add', {term: reply});
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;

2
view/theme/frio/templates/jot-header.tpl
View file

@ -260,7 +260,7 @@
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply); $.post('post/' + id + '/tag/add', {term: reply});
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;

2
view/theme/smoothly/templates/jot-header.tpl
View file

@ -210,7 +210,7 @@ function enableOnUser(){
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply); $.post('post/' + id + '/tag/add', {term: reply});
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;