From: Hypolite Petovan Date: Tue, 8 Nov 2022 08:24:20 +0000 (-0500) Subject: Restore Item\Source module functionality X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99d54dc711f613b4452d4af360057638fda2486f;p=friendica.git Restore Item\Source module functionality --- diff --git a/src/Module/Moderation/Item/Source.php b/src/Module/Moderation/Item/Source.php index 38304883a1..87f06b9f1d 100644 --- a/src/Module/Moderation/Item/Source.php +++ b/src/Module/Moderation/Item/Source.php @@ -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 debug.store_source config key is set in config/local.config.php 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, ]); } } diff --git a/view/templates/moderation/item/source.tpl b/view/templates/moderation/item/source.tpl index 41e613b49c..d56bbeacf6 100644 --- a/view/templates/moderation/item/source.tpl +++ b/view/templates/moderation/item/source.tpl @@ -1,19 +1,20 @@
-

{{$title}}

-
+

{{$l10n.title}}

+
- {{include file="field_input.tpl" field=$guid}} + {{include file="field_input.tpl" field=$guid_field}}
-

+

- {{if $source}} +{{if $guid}}
+ {{if $item_id}}
-

{{$itemidlbl}}

+

{{$l10n.itemidlbl}}

{{$item_id}} @@ -21,7 +22,7 @@
-

{{$itemurilbl}}

+

{{$l10n.itemurilbl}}

{{$item_uri}} @@ -29,21 +30,27 @@
-

{{$termslbl}}

+

{{$l10n.termslbl}}

- - - + + + - {{foreach $terms as $term}} + {{foreach $terms as $term}} - {{/foreach}} + {{/foreach}}
{{$typelbl}}{{$termlbl}}{{$urllbl}}{{$l10n.typelbl}}{{$l10n.termlbl}}{{$l10n.urllbl}}
- {{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}} {{$term.name}} @@ -52,16 +59,40 @@ {{$term.url}}
+ {{if $source}}

{{$sourcelbl}}

{{$source}}
+ {{else}} +
+
+

{{$l10n.error}}

+
+
+

{{$l10n.nosource}}

+ {{if $l10n.noconfig}} +

{{$l10n.noconfig nofilter}}

+ {{/if}} +
+
+ {{/if}} + {{else}} +
+
+

{{$l10n.error}}

+
+
+ {{$l10n.notfound}} +
+
+ {{/if}}
-
{{/if}} +