Improve non-torrent reporting experience

OPSnet · Oct 15, 2022 · aecd807 · aecd807
1 parent f974d99
commit aecd807
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 22 deletions.
diff --git a/app/Report/AbstractReport.php b/app/Report/AbstractReport.php
@@ -31,7 +31,7 @@ public function showReason(): bool {
     public function reason(): string {
         return (string)self::$db->scalar("
             SELECT Reason FROM reports WHERE ID = ?
-            ", $this->subject->id() /** @phpstan-ignore-line */
+            ", $this->reportId /** @phpstan-ignore-line */
         );
     }
 }
diff --git a/app/Report/Collage.php b/app/Report/Collage.php
@@ -4,6 +4,7 @@
 
 class Collage extends AbstractReport {
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\Collage $subject
     ) { }
 

diff --git a/app/Report/Comment.php b/app/Report/Comment.php
@@ -4,6 +4,7 @@
 
 class Comment extends AbstractReport {
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\Comment\AbstractComment $subject
     ) { }
 

diff --git a/app/Report/ForumPost.php b/app/Report/ForumPost.php
@@ -5,6 +5,7 @@
 class ForumPost extends AbstractReport {
 
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\ForumPost $subject
     ) { }
 

diff --git a/app/Report/ForumThread.php b/app/Report/ForumThread.php
@@ -5,6 +5,7 @@
 class ForumThread extends AbstractReport {
 
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\ForumThread $subject
     ) { }
 
@@ -13,10 +14,10 @@ public function template(): string {
     }
 
     public function bbLink(): string {
-        return "the forum thread [url={$this->subject->id()}]" . display_str($this->title()) . '[/url]';
+        return "the forum thread [thread]{$this->subject->id()}[/thread]";
     }
 
     public function title(): string {
-        return 'Forum Thread Report: ' . display_str($this->title());
+        return 'Forum Thread Report: ' . display_str($this->subject->title());
     }
 }
diff --git a/app/Report/Request.php b/app/Report/Request.php
@@ -6,6 +6,7 @@ class Request extends AbstractReport {
     protected bool $isUpdate = false;
 
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\Request $subject
     ) { }
 

diff --git a/app/Report/User.php b/app/Report/User.php
@@ -4,6 +4,7 @@
 
 class User extends AbstractReport {
     public function __construct(
+        protected int $reportId,
         protected \Gazelle\User $subject
     ) { }
 

diff --git a/sections/reports/compose.php b/sections/reports/compose.php
@@ -4,10 +4,10 @@
     error(403);
 }
 
-$ReportID = (int)($_GET['reportid'] ?? 0);
+$reportId = (int)($_GET['reportid'] ?? 0);
 $id       = (int)($_GET['thingid'] ?? 0);
 $type     = $_GET['type'] ?? null;
-if (!$ReportID || !$id || is_null($type)) {
+if (!$reportId || !$id || is_null($type)) {
     error(403);
 }
 
@@ -32,7 +32,7 @@
         if (is_null($reported)) {
             error(404);
         }
-        $report = new Gazelle\Report\User($reported);
+        $report = new Gazelle\Report\User($reportId, $reported);
         break;
 
     case 'request':
@@ -41,15 +41,15 @@
         if (is_null($request)) {
             error(404);
         }
-        $report = new Gazelle\Report\Request($request);
+        $report = new Gazelle\Report\Request($reportId, $request);
         break;
 
     case 'collage':
         $collage = (new Gazelle\Manager\Collage)->findById($id);
         if (is_null($collage)) {
             error(404);
         }
-        $report = new Gazelle\Report\Collage($collage);
+        $report = new Gazelle\Report\Collage($reportId, $collage);
         break;
 
     case 'thread':
@@ -60,7 +60,7 @@
         if (!$Viewer->readAccess($thread->forum())) {
             error(403);
         }
-        $report = new Gazelle\Report\ForumThread($thread);
+        $report = new Gazelle\Report\ForumThread($reportId, $thread);
         break;
 
     case 'post':
@@ -71,15 +71,15 @@
         if (!$Viewer->readAccess($post->thread()->forum())) {
             error(403);
         }
-        $report = new Gazelle\Report\ForumPost($post);
+        $report = new Gazelle\Report\ForumPost($reportId, $post);
         break;
 
     case 'comment':
         $comment = (new Gazelle\Manager\Comment)->findById($id);
         if (is_null($comment)) {
             error(404);
         }
-        $report = (new Gazelle\Report\Comment($comment))->setContext($reportType['title']);
+        $report = (new Gazelle\Report\Comment($reportId, $comment))->setContext($reportType['title']);
         break;
 
     default:

diff --git a/sections/reports/report.php b/sections/reports/report.php
@@ -18,15 +18,15 @@
         if (is_null($user)) {
             error(404);
         }
-        $report = new Gazelle\Report\User($user);
+        $report = new Gazelle\Report\User($id, $user);
         break;
 
     case 'request':
         $request = (new Gazelle\Manager\Request)->findById($id);
         if (is_null($request)) {
             error(404);
         }
-        $report = new Gazelle\Report\Request($request);
+        $report = new Gazelle\Report\Request($id, $request);
         break;
 
     case 'request_update':
@@ -37,15 +37,15 @@
         if ($request->isFilled() || $request->categoryName() != 'Music' || $request->year() != 0) {
             error(403);
         }
-        $report = (new Gazelle\Report\Request($request))->isUpdate(true);
+        $report = (new Gazelle\Report\Request($id, $request))->isUpdate(true);
         break;
 
     case 'collage':
         $collage = (new Gazelle\Manager\Collage)->findById($id);
         if (is_null($collage)) {
             error(404);
         }
-        $report = new Gazelle\Report\Collage($collage);
+        $report = new Gazelle\Report\Collage($id, $collage);
         break;
 
     case 'thread':
@@ -56,7 +56,7 @@
         if (!$Viewer->readAccess($thread->forum())) {
             error(403);
         }
-        $report = new Gazelle\Report\ForumThread($thread);
+        $report = new Gazelle\Report\ForumThread($id, $thread);
         break;
 
     case 'post':
@@ -67,15 +67,15 @@
         if (!$Viewer->readAccess($post->thread()->forum())) {
             error(403);
         }
-        $report = new Gazelle\Report\ForumPost($post);
+        $report = new Gazelle\Report\ForumPost($id, $post);
         break;
 
     case 'comment':
         $comment = (new Gazelle\Manager\Comment)->findById($id);
         if (is_null($comment)) {
             error(404);
         }
-        $report = (new Gazelle\Report\Comment($comment))->setContext($reportType['title']);
+        $report = (new Gazelle\Report\Comment($id, $comment))->setContext($reportType['title']);
         break;
 }
 

diff --git a/templates/report/forum-post.twig b/templates/report/forum-post.twig
@@ -1,4 +1,4 @@
-<p>You are reporting the post {{ subject.thread.forum.name }} &raquo; {{ report.bbLink|bb_format }}</p>
+<p>You are reporting the post {{ subject.thread.forum.link|raw }} &raquo; {{ report.bbLink|bb_format }}</p>
 <table>
     <tr class="colhead">
         <td width="12%">Username</td>

diff --git a/templates/report/forum-thread.twig b/templates/report/forum-thread.twig
@@ -1,12 +1,12 @@
 <p>You are reporting the thread:</p>
 <table>
     <tr class="colhead">
-        <td width="12%">Username</td>
+        <td width="12%">Author</td>
         <td>Title</td>
     </tr>
     <tr>
-        <td>{{ context.author_id|user_url }}</td>
-        <td>{{ context.title }}</td>
+        <td>{{ report.subject.author.id|user_url }}</td>
+        <td>{{ ("[thread]" ~ report.subject.id ~ "[/thread]")|bb_format }}</td>
     </tr>
 </table>
 
diff --git a/templates/report/index.twig b/templates/report/index.twig
@@ -17,7 +17,9 @@
                     <td><strong>{{ report.link|raw }}</strong></td>
                     <td>
                         <strong>{{ type[report.subjectType].title }}</strong> was reported by {{ report.reporter.id|user_url }} {{ report.created|time_diff }}
+    {% if report.reporter.id != viewer.id %}
                         <a href="reports.php?action=compose&amp;toid={{ report.reporter.id }}&amp;reportid={{ report.id }}&amp;type={{ report.subjectType }}&amp;thingid={{ report.subjectId }}" class="brackets">Contact</a>
+    {% endif %}
                     </td>
                 </tr>
                 <tr>