From 504cedfb1f7a75953b2286d9c20a35d4ca3b374f Mon Sep 17 00:00:00 2001
From: n1rwana <93197434+n1rwana@users.noreply.github.com>
Date: Sun, 28 Aug 2022 04:22:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/Presenters/WallPresenter.php              | 32 ++++++++++++-------
 .../components/post/microblogpost.xml         | 19 ++++++++---
 .../templates/components/post/oldpost.xml     | 21 ++++++++++--
 Web/routes.yml                                |  2 ++
 Web/static/js/openvk.cls.js                   |  6 ++--
 5 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index f8997cd7..5dd0de58 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -207,7 +207,7 @@ final class WallPresenter extends OpenVKPresenter
         ];
     }
     
-    function renderMakePost(int $wall): void
+    function renderMakePost(int $wall, ?int $editTarget = 0): void
     {
         $this->assertUserLoggedIn();
         $this->willExecuteWriteAction();
@@ -270,17 +270,27 @@ final class WallPresenter extends OpenVKPresenter
         
         if(empty($this->postParam("text")) && !$photo && !$video)
             $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_empty_or_too_big"));
-        
+
         try {
-            $post = new Post;
-            $post->setOwner($this->user->id);
-            $post->setWall($wall);
-            $post->setCreated(time());
-            $post->setContent($this->postParam("text"));
-            $post->setAnonymous($anon);
-            $post->setFlags($flags);
-            $post->setNsfw($this->postParam("nsfw") === "on");
-            $post->save();
+            if ($editTarget) {
+                $post = $this->posts->getPostById($this->user->id, $editTarget);
+                $post->setEdited(time());
+                $post->setContent($this->postParam("text"));
+                $post->setFlags($flags);
+                $post->setNsfw($this->postParam("nsfw") === "on");
+                $post->save();
+            } else {
+                $post = new Post;
+                $post->setOwner($this->user->id);
+                $post->setWall($wall);
+                $post->setCreated(time());
+                $post->setContent($this->postParam("text"));
+                $post->setAnonymous($anon);
+                $post->setFlags($flags);
+                $post->setNsfw($this->postParam("nsfw") === "on");
+                $post->save();
+            }
+
         } catch (\LengthException $ex) {
             $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_too_big"));
         }
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index d8a3e594..3224e942 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -60,9 +60,13 @@
                     {/if}
                 </div>
                 <div class="post-content" id="{$post->getPrettyId()}">
-                    <div class="text" id="text{$post->getPrettyId()}">
-                        {$post->getText()|noescape}
-                        
+                    <div class="text">
+                        <span id="text{$post->getPrettyId()}">{$post->getText()|noescape}</span>
+
+                        <div class="edit" id="text_edit{$post->getPrettyId()}" style="display: none;">
+                            {include "../textArea.xml", route => "/wall$owner/makePost/{$post->getVirtualId()}"}
+                        </div>
+
                         <div n:ifcontent class="attachments_b">
                             <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
                                 {include "../attachment.xml", attachment => $attachment}
@@ -73,6 +77,9 @@
                         <br/>
                         &nbsp;! Этот пост был размещён за взятку.
                     </div>
+                    <div n:if="$post->getEditTime()" style="color:grey;">
+                        &nbsp; ред. {$post->getEditTime()}
+                    </div>
                     <div n:if="$post->isSigned()" class="post-signature">
                         {var $actualAuthor = $post->getOwner(false)}
                         <span>
@@ -87,7 +94,11 @@
                     <a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a>
                     {if isset($thisUser)}
                         &nbsp;
-                        
+
+                        {if !($forceNoEditLink ?? false) && $post->canBePinnedBy($thisUser)}
+                            <a onClick="edit_post({$author->getId()}, {$post->getVirtualId()})">Редактировать</a> &nbsp;|&nbsp;
+                        {/if}
+
                         <a n:if="!($forceNoCommentsLink ?? false) && $commentsCount == 0" href="javascript:expand_comment_textarea({$commentTextAreaId})">{_comment}</a>
                         
                         <div class="like_wrap">
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml
index dbfd0ff0..1e2f0540 100644
--- a/Web/Presenters/templates/components/post/oldpost.xml
+++ b/Web/Presenters/templates/components/post/oldpost.xml
@@ -5,6 +5,8 @@
     {var $deac = "post_deact_silent"}
 {/if}
 
+
+
 <table border="0" style="font-size: 11px;" n:class="post, $post->isExplicit() ? post-nsfw">
     <tbody>
         <tr>
@@ -41,9 +43,15 @@
                     </a>
                 </div>
                 <div class="post-content" id="{$post->getPrettyId()}">
-                    <div class="text" id="text{$post->getPrettyId()}">
-                        {$post->getText()|noescape}
-                        
+                    <div class="text">
+                        {var $owner = $author->getId()}
+
+                        <span id="text{$post->getPrettyId()}">{$post->getText()|noescape}</span>
+
+                        <div class="edit" id="text_edit{$post->getPrettyId()}" style="display: none;">
+                            {include "../textArea.xml", route => "/wall$owner/makePost/{$post->getVirtualId()}"}
+                        </div>
+
                         <div n:ifcontent class="attachments_b">
                             <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
                                 {include "../attachment.xml", attachment => $attachment}
@@ -54,6 +62,9 @@
                         <br/>
                         &nbsp;! Этот пост был размещён за взятку.
                     </div>
+                    <div n:if="$post->getEditTime()" style="color:grey;">
+                        &nbsp; ред. {$post->getEditTime()}
+                    </div>
                     <div n:if="$post->isSigned()" class="post-signature">
                         {var $actualAuthor = $post->getOwner(false)}
                         <span>
@@ -70,6 +81,10 @@
                         {var $forceNoPinLink = true}
                     {/if}
 
+                    {if !($forceNoEditLink ?? false) && $post->canBePinnedBy($thisUser)}
+                        <a onClick="edit_post({$author->getId()}, {$post->getVirtualId()})">Редактировать</a> &nbsp;|&nbsp;
+                    {/if}
+
                     {if !($forceNoDeleteLink ?? false) && $post->canBeDeletedBy($thisUser)}
                         <a href="/wall{$post->getPrettyId()}/delete">{_delete}</a> &nbsp;|&nbsp;
                     {/if}
diff --git a/Web/routes.yml b/Web/routes.yml
index 2b346610..afb76b62 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -119,6 +119,8 @@ routes:
       handler: "Wall->rss"
     - url: "/wall{num}/makePost"
       handler: "Wall->makePost"
+    - url: "/wall{num}/makePost/{num}"
+      handler: "Wall->makePost"
     - url: "/wall{num}_{num}"
       handler: "Wall->post"
     - url: "/wall{num}_{num}/like"
diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 7532a1ad..85b3e200 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -13,8 +13,8 @@ function expand_comment_textarea(id) {
 }
 
 function edit_post(id, wid) {
-    var el = document.getElementById('text'+wid+'_'+id);
-    var ed = document.getElementById('text_edit'+wid+'_'+id);
+    var el = document.getElementById(`text${id}_${wid}`);
+    var ed = document.getElementById(`text_edit${id}_${wid}`);
     if (el.style.display == "none") {
         el.style.display = "block";
         ed.style.display = "none";
@@ -438,4 +438,4 @@ $(document).on("scroll", () => {
             $(".floating_sidebar")[0].classList.remove("hide_anim");
         }, 250);
     }
-})
+})
\ No newline at end of file