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

Merge pull request #12140 from annando/store-source

Browse source 
For debug reasons we now can store all incoming sources
This commit is contained in:
Philipp 2022-11-08 18:30:50 +01:00 committed by GitHub
commit a8c23e8cee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 148 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Model/Item.php
View file

@ -1328,10 +1328,11 @@ class Item
} }
} }
if (!empty($source) && ($transmit || DI::config()->get('debug', 'store_source'))) {
Post\Activity::insert($item['uri-id'], $source);
}
if ($transmit) { if ($transmit) {
if (!empty($source)) {
Post\Activity::insert($item['uri-id'], $source);
}
Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, (int)$posted_item['uri-id'], (int)$posted_item['uid']); Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, (int)$posted_item['uri-id'], (int)$posted_item['uid']);
} }

62
src/Module/Moderation/Item/Source.php
View file

@ -21,12 +21,30 @@
namespace Friendica\Module\Moderation\Item; namespace Friendica\Module\Moderation\Item;
use Friendica\App;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Model; use Friendica\Model;
use Friendica\Module\BaseModeration; use Friendica\Module\BaseModeration;
use Friendica\Module\Response;
use Friendica\Navigation\SystemMessages;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
class Source extends BaseModeration class Source extends BaseModeration
{ {
/** @var IManageConfigValues */
private $config;
public function __construct(IManageConfigValues $config, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->config = $config;
}
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
parent::content(); parent::content();
@ -36,6 +54,7 @@ class Source extends BaseModeration
$item_uri = ''; $item_uri = '';
$item_id = ''; $item_id = '';
$terms = []; $terms = [];
$source = '';
if (!empty($guid)) { if (!empty($guid)) {
$item = Model\Post::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]); $item = Model\Post::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]);
@ -43,26 +62,39 @@ class Source extends BaseModeration
$item_id = $item['id']; $item_id = $item['id'];
$item_uri = $item['uri']; $item_uri = $item['uri'];
$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]); $terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
$activity = Model\Post\Activity::getByURIId($item['uri-id']);
if (!empty($activity)) {
$source = $activity['activity'];
}
} }
} }
$tpl = Renderer::getMarkupTemplate('moderation/item/source.tpl'); $tpl = Renderer::getMarkupTemplate('moderation/item/source.tpl');
return Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [
'$title' => $this->t('Item Source'), '$l10n' => [
'$guid' => ['guid', $this->t('Item Guid'), $guid, ''], 'title' => $this->t('Item Source'),
'$item_uri' => $item_uri, 'itemidlbl' => $this->t('Item Id'),
'$item_id' => $item_id, 'itemurilbl' => $this->t('Item URI'),
'$terms' => $terms, 'submit' => $this->t('Submit'),
'$itemidlbl' => $this->t('Item Id'), 'termslbl' => $this->t('Terms'),
'$itemurilbl' => $this->t('Item URI'), 'taglbl' => $this->t('Tag'),
'$submit' => $this->t('Submit'), 'typelbl' => $this->t('Type'),
'$termslbl' => $this->t('Terms'), 'termlbl' => $this->t('Term'),
'$taglbl' => $this->t('Tag'), 'urllbl' => $this->t('URL'),
'$typelbl' => $this->t('Type'), 'mentionlbl' => $this->t('Mention'),
'$termlbl' => $this->t('Term'), 'implicitlbl' => $this->t('Implicit Mention'),
'$urllbl' => $this->t('URL'), 'error' => $this->t('Error'),
'$mentionlbl' => $this->t('Mention'), 'notfound' => $this->t('Item not found'),
'$implicitlbl' => $this->t('Implicit Mention'), 'nosource' => $this->t('No source recorded'),
'noconfig' => !$this->config->get('debug', 'store_source') ? $this->t('Please make sure the <code>debug.store_source</code> config key is set in <code>config/local.config.php</code> for future items to have sources.') : '',
],
'$guid_field' => ['guid', $this->t('Item Guid'), $guid, ''],
'$guid' => $guid,
'$item_uri' => $item_uri,
'$item_id' => $item_id,
'$terms' => $terms,
'$source' => $source,
]); ]);
} }
} }

4
static/defaults.config.php
View file

@ -731,6 +731,10 @@ return [
// ap_log_failure (Boolean) // ap_log_failure (Boolean)
// Logs every ActivityPub activity that couldn't be compacted // Logs every ActivityPub activity that couldn't be compacted
'ap_log_failure' => false, 'ap_log_failure' => false,
// store_source (Boolean)
// Store the source of any post that arrived
'store_source' => false,
], ],
'smarty3' => [ 'smarty3' => [
// config_dir (String) // config_dir (String)

78
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-08 04:31-0500\n" "POT-Creation-Date: 2022-11-08 09:11-0500\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"
@ -76,6 +76,7 @@ msgid "Permission denied."
msgstr "" msgstr ""
#: mod/editpost.php:45 mod/editpost.php:55 #: mod/editpost.php:45 mod/editpost.php:55
#: src/Module/Moderation/Item/Source.php:88
msgid "Item not found" msgid "Item not found"
msgstr "" msgstr ""
@ -519,7 +520,7 @@ msgstr ""
#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145 #: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
#: src/Module/Install.php:252 src/Module/Install.php:294 #: src/Module/Install.php:252 src/Module/Install.php:294
#: src/Module/Install.php:331 src/Module/Invite.php:178 #: src/Module/Install.php:331 src/Module/Invite.php:178
#: src/Module/Item/Compose.php:189 src/Module/Moderation/Item/Source.php:58 #: src/Module/Item/Compose.php:189 src/Module/Moderation/Item/Source.php:79
#: src/Module/Profile/Profile.php:246 src/Module/Profile/UnkMail.php:156 #: src/Module/Profile/Profile.php:246 src/Module/Profile/UnkMail.php:156
#: src/Module/Settings/Profile/Index.php:231 src/Object/Post.php:986 #: src/Module/Settings/Profile/Index.php:231 src/Object/Post.php:986
#: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171 #: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171
@ -1947,7 +1948,7 @@ msgstr ""
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/Item.php:294 src/Model/Item.php:2870 #: src/Content/Item.php:294 src/Model/Item.php:2871
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -1956,7 +1957,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: src/Content/Item.php:303 src/Model/Item.php:2872 #: src/Content/Item.php:303 src/Model/Item.php:2873
#: src/Module/Post/Tag/Add.php:123 #: src/Module/Post/Tag/Add.php:123
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -2338,8 +2339,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:1245 src/Model/Item.php:3482 #: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3483
#: src/Model/Item.php:3488 src/Model/Item.php:3489 #: src/Model/Item.php:3489 src/Model/Item.php:3490
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -3484,66 +3485,66 @@ msgstr ""
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
#: src/Model/Item.php:1982 #: src/Model/Item.php:1983
#, 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:2874 #: src/Model/Item.php:2875
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2876 #: src/Model/Item.php:2877
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2879 #: src/Model/Item.php:2880
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3020 #: src/Model/Item.php:3021
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3394 #: src/Model/Item.php:3395
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3425 #: src/Model/Item.php:3426
#, 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:3427 #: src/Model/Item.php:3428
#, 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:3432 #: src/Model/Item.php:3433
#, 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:3434 #: src/Model/Item.php:3435
#, 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:3436 #: src/Model/Item.php:3437
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3470 src/Model/Item.php:3471 #: src/Model/Item.php:3471 src/Model/Item.php:3472
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
@ -5747,7 +5748,7 @@ msgstr ""
msgid "Delete Item" msgid "Delete Item"
msgstr "" msgstr ""
#: src/Module/BaseModeration.php:120 src/Module/Moderation/Item/Source.php:51 #: src/Module/BaseModeration.php:120 src/Module/Moderation/Item/Source.php:76
msgid "Item Source" msgid "Item Source"
msgstr "" msgstr ""
@ -6613,7 +6614,8 @@ msgid "Result Item"
msgstr "" msgstr ""
#: src/Module/Debug/ActivityPubConversion.php:129 #: src/Module/Debug/ActivityPubConversion.php:129
#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:98 #: src/Module/Debug/Babel.php:293 src/Module/Moderation/Item/Source.php:87
#: src/Module/Security/TwoFactor/Verify.php:98
msgid "Error" msgid "Error"
msgid_plural "Errors" msgid_plural "Errors"
msgstr[0] "" msgstr[0] ""
@ -7819,49 +7821,59 @@ msgstr ""
msgid "The GUID of the item you want to delete." msgid "The GUID of the item you want to delete."
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:52 #: src/Module/Moderation/Item/Source.php:77
msgid "Item Guid"
msgstr ""
#: src/Module/Moderation/Item/Source.php:56
msgid "Item Id" msgid "Item Id"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:57 #: src/Module/Moderation/Item/Source.php:78
msgid "Item URI" msgid "Item URI"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:59 #: src/Module/Moderation/Item/Source.php:80
msgid "Terms" msgid "Terms"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:60 #: src/Module/Moderation/Item/Source.php:81
msgid "Tag" msgid "Tag"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:61 #: src/Module/Moderation/Item/Source.php:82
#: src/Module/Moderation/Users/Active.php:126 #: src/Module/Moderation/Users/Active.php:126
#: src/Module/Moderation/Users/Blocked.php:126 #: src/Module/Moderation/Users/Blocked.php:126
#: src/Module/Moderation/Users/Index.php:140 #: src/Module/Moderation/Users/Index.php:140
msgid "Type" msgid "Type"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:62 #: src/Module/Moderation/Item/Source.php:83
msgid "Term" msgid "Term"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:63 #: src/Module/Moderation/Item/Source.php:84
msgid "URL" msgid "URL"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:64 #: src/Module/Moderation/Item/Source.php:85
msgid "Mention" msgid "Mention"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:65 #: src/Module/Moderation/Item/Source.php:86
msgid "Implicit Mention" msgid "Implicit Mention"
msgstr "" msgstr ""
#: src/Module/Moderation/Item/Source.php:89
msgid "No source recorded"
msgstr ""
#: src/Module/Moderation/Item/Source.php:90
msgid ""
"Please make sure the <code>debug.store_source</code> config key is set in "
"<code>config/local.config.php</code> for future items to have sources."
msgstr ""
#: src/Module/Moderation/Item/Source.php:92
msgid "Item Guid"
msgstr ""
#: src/Module/Moderation/Summary.php:53 #: src/Module/Moderation/Summary.php:53
msgid "Normal Account" msgid "Normal Account"
msgstr "" msgstr ""

65
view/templates/moderation/item/source.tpl
View file

@ -1,19 +1,20 @@
<div id="source" class="generic-page-wrapper"> <div id="source" class="generic-page-wrapper">
<h2>{{$title}}</h2> <h2>{{$l10n.title}}</h2>
<form action="admin/item/source" method="get" class="panel panel-default"> <form action="moderation/item/source" method="get" class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
{{include file="field_input.tpl" field=$guid}} {{include file="field_input.tpl" field=$guid_field}}
</div> </div>
<p><button type="submit" class="btn btn-primary">{{$submit}}</button></p> <p><button type="submit" class="btn btn-primary">{{$l10n.submit}}</button></p>
</div> </div>
</form> </form>
{{if $source}} {{if $guid}}
<div class="itemsource-results"> <div class="itemsource-results">
{{if $item_id}}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{{$itemidlbl}}</h3> <h3 class="panel-title">{{$l10n.itemidlbl}}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
{{$item_id}} {{$item_id}}
@ -21,7 +22,7 @@
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{{$itemurilbl}}</h3> <h3 class="panel-title">{{$l10n.itemurilbl}}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
{{$item_uri}} {{$item_uri}}
@ -29,21 +30,27 @@
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{{$termslbl}}</h3> <h3 class="panel-title">{{$l10n.termslbl}}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<table class="table table-condensed table-striped"> <table class="table table-condensed table-striped">
<tr> <tr>
<th>{{$typelbl}}</th> <th>{{$l10n.typelbl}}</th>
<th>{{$termlbl}}</th> <th>{{$l10n.termlbl}}</th>
<th>{{$urllbl}}</th> <th>{{$l10n.urllbl}}</th>
</tr> </tr>
{{foreach $terms as $term}} {{foreach $terms as $term}}
<tr> <tr>
<td> <td>
{{if $term.type == 1}}{{$tag}}{{/if}} {{if $term.type == 1}}
{{if $term.type == 2}}{{$mentionlbl}}{{/if}} {{$l10n.taglbl}}
{{if $term.type == 8}}{{$implicitlbl}}{{/if}} {{/if}}
{{if $term.type == 2}}
{{$l10n.mentionlbl}}
{{/if}}
{{if $term.type == 8}}
{{$l10n.implicitlbl}}
{{/if}}
</td> </td>
<td> <td>
{{$term.name}} {{$term.name}}
@ -52,16 +59,40 @@
{{$term.url}} {{$term.url}}
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}
</table> </table>
</div> </div>
</div> </div>
{{if $source}}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{{$sourcelbl}}</h3> <h3 class="panel-title">{{$sourcelbl}}</h3>
</div> </div>
<pre><code class="language-php">{{$source}}</code></pre> <pre><code class="language-php">{{$source}}</code></pre>
</div> </div>
{{else}}
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">{{$l10n.error}}</h3>
</div>
<div class="panel-body">
<p>{{$l10n.nosource}}</p>
{{if $l10n.noconfig}}
<p>{{$l10n.noconfig nofilter}}</p>
{{/if}}
</div>
</div>
{{/if}}
{{else}}
<div class="panel panel-danger">
<div class="panel-heading">
<h3 class="panel-title">{{$l10n.error}}</h3>
</div>
<div class="panel-body">
{{$l10n.notfound}}
</div>
</div>
{{/if}}
</div> </div>
</div>
{{/if}} {{/if}}
</div>