From e747d09b7f356949e2cd8f3a982e76b52f290dac Mon Sep 17 00:00:00 2001
From: xRy0 <me@ry0.ru>
Date: Wed, 21 May 2025 18:41:46 +0300
Subject: [PATCH] feat(FeedReports): oldpost button + moved reportPost() js
 function to al_feed.js

---
 Web/Presenters/templates/Wall/Post.xml        | 25 +------------------
 .../templates/components/post/oldpost.xml     |  6 ++++-
 Web/static/js/al_feed.js                      | 23 +++++++++++++++++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml
index 3d136ebd..2e08f70f 100644
--- a/Web/Presenters/templates/Wall/Post.xml
+++ b/Web/Presenters/templates/Wall/Post.xml
@@ -56,29 +56,6 @@
         >
             {_changes_history}
         </a>
-        <a n:if="$canReport ?? false" class="profile_link" style="display:block;width:96%;" href="javascript:reportPost()">{_report}</a>
+        <a n:if="$canReport ?? false" class="profile_link" style="display:block;width:96%;" href="javascript:reportPost({$post->getId()})">{_report}</a>
     </div>
-    <script n:if="$canReport ?? false">
-        function reportPost() {
-            uReportMsgTxt  = tr("going_to_report_post");
-            uReportMsgTxt += "<br/>"+tr("report_question_text");
-            uReportMsgTxt += "<br/><br/><b>"+tr("report_reason")+"</b>: <input type='text' id='uReportMsgInput' placeholder='" + tr("reason") + "' />"
-
-            MessageBox(tr("report_question"), uReportMsgTxt, [tr("confirm_m"), tr("cancel")], [
-                (function() {
-                    res = document.querySelector("#uReportMsgInput").value;
-                    xhr = new XMLHttpRequest();
-                    xhr.open("GET", "/report/" + {$post->getId()} + "?reason=" + res + "&type=post", true);
-                    xhr.onload = (function() {
-                        if(xhr.responseText.indexOf("reason") === -1)
-                            MessageBox(tr("error"), tr("error_sending_report"), ["OK"], [Function.noop]);
-                        else
-                            MessageBox(tr("action_successfully"), tr("will_be_watched"), ["OK"], [Function.noop]);
-                    });
-                    xhr.send(null);
-                }),
-                Function.noop
-            ]);
-        }
-    </script>
 {/block}
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml
index 7c86382a..bece0c51 100644
--- a/Web/Presenters/templates/components/post/oldpost.xml
+++ b/Web/Presenters/templates/components/post/oldpost.xml
@@ -138,7 +138,11 @@
                     {if $feedIgnoreButton && !$canBeDeleted}
                     <a id="__ignoreSomeoneFeed" data-val='1' data-id="{$wallOwner->getRealId()}">{_feed_ignore}</a> &nbsp;|&nbsp;
                     {/if}
-                    
+
+                    {if !$canBeDeleted}
+                        <a href="javascript:reportPost({$post->getId()})">{_report}</a> &nbsp;|&nbsp;
+                    {/if}
+
                     {if !($forceNoPinLink ?? false) && $canBePinned}
                         {if $post->isPinned()}
                             <a href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}">{_unpin}</a>
diff --git a/Web/static/js/al_feed.js b/Web/static/js/al_feed.js
index c35161bc..14fb2385 100644
--- a/Web/static/js/al_feed.js
+++ b/Web/static/js/al_feed.js
@@ -353,3 +353,26 @@ function openJsSettings() {
         </tr>    
     `)
 }
+
+
+function reportPost(postId) {
+            uReportMsgTxt  = tr("going_to_report_post");
+            uReportMsgTxt += "<br/>"+tr("report_question_text");
+            uReportMsgTxt += "<br/><br/><b>"+tr("report_reason")+"</b>: <input type='text' id='uReportMsgInput' placeholder='" + tr("reason") + "' />"
+
+            MessageBox(tr("report_question"), uReportMsgTxt, [tr("confirm_m"), tr("cancel")], [
+                (function() {
+                    res = document.querySelector("#uReportMsgInput").value;
+                    xhr = new XMLHttpRequest();
+                    xhr.open("GET", "/report/" + postId + "?reason=" + res + "&type=post", true);
+                    xhr.onload = (function() {
+                        if(xhr.responseText.indexOf("reason") === -1)
+                            MessageBox(tr("error"), tr("error_sending_report"), ["OK"], [Function.noop]);
+                        else
+                            MessageBox(tr("action_successfully"), tr("will_be_watched"), ["OK"], [Function.noop]);
+                    });
+                    xhr.send(null);
+                }),
+                Function.noop
+            ]);
+        }
\ No newline at end of file