Merge pull request #12140 from annando/store-source
For debug reasons we now can store all incoming sources
This commit is contained in:
Philipp
GitHub
commit
a8c23e8cee
5 changed files with 148 additions and 68 deletions
|
|
@ -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 (!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']);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,12 +21,30 @@
|
|||
|
||||
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\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module\BaseModeration;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Navigation\SystemMessages;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
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
|
||||
{
|
||||
parent::content();
|
||||
|
|
@ -36,6 +54,7 @@ class Source extends BaseModeration
|
|||
$item_uri = '';
|
||||
$item_id = '';
|
||||
$terms = [];
|
||||
$source = '';
|
||||
if (!empty($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_uri = $item['uri'];
|
||||
$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');
|
||||
return Renderer::replaceMacros($tpl, [
|
||||
'$title' => $this->t('Item Source'),
|
||||
'$guid' => ['guid', $this->t('Item Guid'), $guid, ''],
|
||||
'$item_uri' => $item_uri,
|
||||
'$item_id' => $item_id,
|
||||
'$terms' => $terms,
|
||||
'$itemidlbl' => $this->t('Item Id'),
|
||||
'$itemurilbl' => $this->t('Item URI'),
|
||||
'$submit' => $this->t('Submit'),
|
||||
'$termslbl' => $this->t('Terms'),
|
||||
'$taglbl' => $this->t('Tag'),
|
||||
'$typelbl' => $this->t('Type'),
|
||||
'$termlbl' => $this->t('Term'),
|
||||
'$urllbl' => $this->t('URL'),
|
||||
'$mentionlbl' => $this->t('Mention'),
|
||||
'$implicitlbl' => $this->t('Implicit Mention'),
|
||||
'$l10n' => [
|
||||
'title' => $this->t('Item Source'),
|
||||
'itemidlbl' => $this->t('Item Id'),
|
||||
'itemurilbl' => $this->t('Item URI'),
|
||||
'submit' => $this->t('Submit'),
|
||||
'termslbl' => $this->t('Terms'),
|
||||
'taglbl' => $this->t('Tag'),
|
||||
'typelbl' => $this->t('Type'),
|
||||
'termlbl' => $this->t('Term'),
|
||||
'urllbl' => $this->t('URL'),
|
||||
'mentionlbl' => $this->t('Mention'),
|
||||
'implicitlbl' => $this->t('Implicit Mention'),
|
||||
'error' => $this->t('Error'),
|
||||
'notfound' => $this->t('Item not found'),
|
||||
'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,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -731,6 +731,10 @@ return [
|
|||
// ap_log_failure (Boolean)
|
||||
// Logs every ActivityPub activity that couldn't be compacted
|
||||
'ap_log_failure' => false,
|
||||
|
||||
// store_source (Boolean)
|
||||
// Store the source of any post that arrived
|
||||
'store_source' => false,
|
||||
],
|
||||
'smarty3' => [
|
||||
// config_dir (String)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 2022.12-dev\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"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -76,6 +76,7 @@ msgid "Permission denied."
|
|||
msgstr ""
|
||||
|
||||
#: mod/editpost.php:45 mod/editpost.php:55
|
||||
#: src/Module/Moderation/Item/Source.php:88
|
||||
msgid "Item not found"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -519,7 +520,7 @@ msgstr ""
|
|||
#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
|
||||
#: src/Module/Install.php:252 src/Module/Install.php:294
|
||||
#: 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/Settings/Profile/Index.php:231 src/Object/Post.php:986
|
||||
#: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171
|
||||
|
|
@ -1947,7 +1948,7 @@ msgstr ""
|
|||
msgid "show more"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Item.php:294 src/Model/Item.php:2870
|
||||
#: src/Content/Item.php:294 src/Model/Item.php:2871
|
||||
msgid "event"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1956,7 +1957,7 @@ msgstr ""
|
|||
msgid "status"
|
||||
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
|
||||
msgid "photo"
|
||||
msgstr ""
|
||||
|
|
@ -2338,8 +2339,8 @@ msgid ""
|
|||
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3482
|
||||
#: src/Model/Item.php:3488 src/Model/Item.php:3489
|
||||
#: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3483
|
||||
#: src/Model/Item.php:3489 src/Model/Item.php:3490
|
||||
msgid "Link to source"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3484,66 +3485,66 @@ msgstr ""
|
|||
msgid "Edit groups"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:1982
|
||||
#: src/Model/Item.php:1983
|
||||
#, php-format
|
||||
msgid "Detected languages in this post:\\n%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:2874
|
||||
#: src/Model/Item.php:2875
|
||||
msgid "activity"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:2876
|
||||
#: src/Model/Item.php:2877
|
||||
msgid "comment"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:2879
|
||||
#: src/Model/Item.php:2880
|
||||
msgid "post"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:3020
|
||||
#: src/Model/Item.php:3021
|
||||
#, php-format
|
||||
msgid "Content warning: %s"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:3394
|
||||
#: src/Model/Item.php:3395
|
||||
msgid "bytes"
|
||||
msgstr ""
|
||||
|
||||
#: src/Model/Item.php:3425
|
||||
#: src/Model/Item.php:3426
|
||||
#, php-format
|
||||
msgid "%2$s (%3$d%%, %1$d vote)"
|
||||
msgid_plural "%2$s (%3$d%%, %1$d votes)"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/Model/Item.php:3427
|
||||
#: src/Model/Item.php:3428
|
||||
#, php-format
|
||||
msgid "%2$s (%1$d vote)"
|
||||
msgid_plural "%2$s (%1$d votes)"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/Model/Item.php:3432
|
||||
#: src/Model/Item.php:3433
|
||||
#, php-format
|
||||
msgid "%d voter. Poll end: %s"
|
||||
msgid_plural "%d voters. Poll end: %s"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/Model/Item.php:3434
|
||||
#: src/Model/Item.php:3435
|
||||
#, php-format
|
||||
msgid "%d voter."
|
||||
msgid_plural "%d voters."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: src/Model/Item.php:3436
|
||||
#: src/Model/Item.php:3437
|
||||
#, php-format
|
||||
msgid "Poll end: %s"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5747,7 +5748,7 @@ msgstr ""
|
|||
msgid "Delete Item"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6613,7 +6614,8 @@ msgid "Result Item"
|
|||
msgstr ""
|
||||
|
||||
#: 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_plural "Errors"
|
||||
msgstr[0] ""
|
||||
|
|
@ -7819,49 +7821,59 @@ msgstr ""
|
|||
msgid "The GUID of the item you want to delete."
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:52
|
||||
msgid "Item Guid"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:56
|
||||
#: src/Module/Moderation/Item/Source.php:77
|
||||
msgid "Item Id"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:57
|
||||
#: src/Module/Moderation/Item/Source.php:78
|
||||
msgid "Item URI"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:59
|
||||
#: src/Module/Moderation/Item/Source.php:80
|
||||
msgid "Terms"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:60
|
||||
#: src/Module/Moderation/Item/Source.php:81
|
||||
msgid "Tag"
|
||||
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/Blocked.php:126
|
||||
#: src/Module/Moderation/Users/Index.php:140
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:62
|
||||
#: src/Module/Moderation/Item/Source.php:83
|
||||
msgid "Term"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:63
|
||||
#: src/Module/Moderation/Item/Source.php:84
|
||||
msgid "URL"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:64
|
||||
#: src/Module/Moderation/Item/Source.php:85
|
||||
msgid "Mention"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Item/Source.php:65
|
||||
#: src/Module/Moderation/Item/Source.php:86
|
||||
msgid "Implicit Mention"
|
||||
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
|
||||
msgid "Normal Account"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
<div id="source" class="generic-page-wrapper">
|
||||
<h2>{{$title}}</h2>
|
||||
<form action="admin/item/source" method="get" class="panel panel-default">
|
||||
<h2>{{$l10n.title}}</h2>
|
||||
<form action="moderation/item/source" method="get" class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<div class="form-group">
|
||||
{{include file="field_input.tpl" field=$guid}}
|
||||
{{include file="field_input.tpl" field=$guid_field}}
|
||||
</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>
|
||||
</form>
|
||||
|
||||
{{if $source}}
|
||||
{{if $guid}}
|
||||
<div class="itemsource-results">
|
||||
{{if $item_id}}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{$itemidlbl}}</h3>
|
||||
<h3 class="panel-title">{{$l10n.itemidlbl}}</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
{{$item_id}}
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
</div>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{$itemurilbl}}</h3>
|
||||
<h3 class="panel-title">{{$l10n.itemurilbl}}</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
{{$item_uri}}
|
||||
|
|
@ -29,21 +30,27 @@
|
|||
</div>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{$termslbl}}</h3>
|
||||
<h3 class="panel-title">{{$l10n.termslbl}}</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<table class="table table-condensed table-striped">
|
||||
<tr>
|
||||
<th>{{$typelbl}}</th>
|
||||
<th>{{$termlbl}}</th>
|
||||
<th>{{$urllbl}}</th>
|
||||
<th>{{$l10n.typelbl}}</th>
|
||||
<th>{{$l10n.termlbl}}</th>
|
||||
<th>{{$l10n.urllbl}}</th>
|
||||
</tr>
|
||||
{{foreach $terms as $term}}
|
||||
{{foreach $terms as $term}}
|
||||
<tr>
|
||||
<td>
|
||||
{{if $term.type == 1}}{{$tag}}{{/if}}
|
||||
{{if $term.type == 2}}{{$mentionlbl}}{{/if}}
|
||||
{{if $term.type == 8}}{{$implicitlbl}}{{/if}}
|
||||
{{if $term.type == 1}}
|
||||
{{$l10n.taglbl}}
|
||||
{{/if}}
|
||||
{{if $term.type == 2}}
|
||||
{{$l10n.mentionlbl}}
|
||||
{{/if}}
|
||||
{{if $term.type == 8}}
|
||||
{{$l10n.implicitlbl}}
|
||||
{{/if}}
|
||||
</td>
|
||||
<td>
|
||||
{{$term.name}}
|
||||
|
|
@ -52,16 +59,40 @@
|
|||
{{$term.url}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{{if $source}}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{$sourcelbl}}</h3>
|
||||
</div>
|
||||
<pre><code class="language-php">{{$source}}</code></pre>
|
||||
</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>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue