Restore Item\Source module functionality

diff --git a/src/Module/Moderation/Item/Source.php b/src/Module/Moderation/Item/Source.php
index 38304883a171895b18bb9855605bbacbd17b2f81..87f06b9f1d3056d1ab6583400118089b795efcea 100644 (file)
--- 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 <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,
                ]);
        }
 }

diff --git a/view/templates/moderation/item/source.tpl b/view/templates/moderation/item/source.tpl
index 41e613b49c2a44ab0bb9941626df7cfaeb1fda64..d56bbeacf662586de6c4d23385989bd09d83a2ec 100644 (file)
--- a/view/templates/moderation/item/source.tpl
+++ b/view/templates/moderation/item/source.tpl
@@ -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>