From ee58f81df31e2ae64bb7bcd7393a72ab1bd98362 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Fri, 4 Feb 2022 16:41:19 +0300
Subject: [PATCH 01/13] [WIP] Textarea: Add upload multiple pictures

Now there's thumbnail feature in TextArea box.

This is WIP, as the video is broken and posts doesn't feel good with multiple images
---
 Web/Presenters/WallPresenter.php              | 63 +++++++++----------
 .../templates/components/textArea.xml         |  8 +--
 Web/static/css/style.css                      | 61 ++++++++++++++++++
 Web/static/js/al_wall.js                      | 57 +++++++++++++----
 4 files changed, 139 insertions(+), 50 deletions(-)

diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index ccb13886..574832e9 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -202,48 +202,45 @@ final class WallPresenter extends OpenVKPresenter
         if($this->postParam("force_sign") === "on")
             $flags |= 0b01000000;
         
-        try {
-            $photo = NULL;
-            $video = NULL;
-            if($_FILES["_pic_attachment"]["error"] === UPLOAD_ERR_OK) {
-                $album = NULL;
-                if(!$anon && $wall > 0 && $wall === $this->user->id)
-                    $album = (new Albums)->getUserWallAlbum($wallOwner);
-                
-                $photo = Photo::fastMake($this->user->id, $this->postParam("text"), $_FILES["_pic_attachment"], $album, $anon);
+        $photos = [];
+        $_FILES["_pic_attachment"] = null;
+        foreach($_FILES as $file) {
+        	bdump($file);
+            try {
+                if($file["error"] === UPLOAD_ERR_OK && preg_match('/^image\//', $file['type'])) {
+                    $album = NULL;
+                    if(!$anon && $wall > 0 && $wall === $this->user->id)
+                        $album = (new Albums)->getUserWallAlbum($wallOwner);
+                    
+                    $photos[] = Photo::fastMake($this->user->id, $this->postParam("text"), $file, $album, $anon);
+                }
+            } catch(\DomainException $ex) {
+                $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён.");
+            } catch(ISE $ex) {
+                $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён или слишком велик.");
             }
-            
-            if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
-                $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"], $anon);
-            }
-        } catch(\DomainException $ex) {
-            $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён.");
-        } catch(ISE $ex) {
-            $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён или слишком велик.");
         }
-        
-        if(empty($this->postParam("text")) && !$photo && !$video)
+                
+        if(empty($this->postParam("text")) && empty($photos))
             $this->flashFail("err", "Не удалось опубликовать пост", "Пост пустой или слишком большой.");
         
         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 = 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", "Не удалось опубликовать пост", "Пост слишком большой.");
         }
-        
-        if(!is_null($photo))
-            $post->attach($photo);
-        
-        if(!is_null($video))
-            $post->attach($video);
+
+        foreach($photos as $photo) {
+        	$post->attach($photo);
+        }
         
         if($wall > 0 && $wall !== $this->user->identity->getId())
             (new WallPostNotification($wallOwner, $post, $this->user->identity))->emit();
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index c27d0506..6c0b5065 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -8,8 +8,8 @@
             <!-- padding to fix <br/> bug -->
         </div>
         <div id="post-buttons{$textAreaId}" style="display: none;">
-            <div class="post-upload">
-                {_attachment}: <span>(unknown)</span>
+            <div class="upload">
+                
             </div>
             <div n:if="$postOpts ?? true" class="post-opts">
                 {var anonEnabled = OPENVK_ROOT_CONF['openvk']['preferences']['wall']['anonymousPosting']['enable']}
@@ -80,10 +80,6 @@
 
 <script>
     $(document).ready(() => {
-        u("#post-buttons{$textAreaId} .postFileSel").on("change", function() {
-            handleUpload.bind(this, {$textAreaId})();
-        });
-
         setupWallPostInputHandlers({$textAreaId});
     });
 </script>
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 3579c71c..d982af1c 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -1841,3 +1841,64 @@ body.scrolled .toTop:hover {
 .center {
     margin: 0 auto;
 }
+
+.progress {
+    border: 1px solid #eee;
+    height: 15px;
+    background: linear-gradient(to bottom, #fefefe, #fafafa);
+}
+
+.progress .progress-bar {
+    background: url('progress.png');
+    background-repeat: repeat-x;
+    height: 15px;
+    animation-name: progress;
+    animation-duration: 1s;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+}
+
+@keyframes progress {
+    from {
+        background-position: 0;
+    }
+
+    to {
+        background-position: 20px;
+    }
+}
+
+.upload {
+    margin-top: 8px;
+}
+
+.upload .upload-item {
+    width: 75px;
+    height: 60px;
+    overflow: hidden;
+    display: inline-block;
+    margin-right: 3px;
+}
+
+.upload-item .upload-delete {
+    position: absolute;
+    background: rgba(0,0,0,0.5);
+    padding: 2px 5px;
+    text-decoration: none;
+    color: #fff;
+    font-size: 11px;
+    margin-left: 57px; /* мне лень переделывать :DDDD */
+    opacity: 0;
+    transition: 0.25s;
+}
+
+.upload-item:hover > .upload-delete {
+    opacity: 1;
+}
+
+.upload-item img {
+    width: 100%;
+    max-height: 60px;
+    object-fit: cover;
+    border-radius: 3px;
+}
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 35b964da..a91f87b4 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -22,7 +22,7 @@ function trim(string) {
     return newStr;
 }
 
-function handleUpload(id) {
+/* function handleUpload(id) {
     console.warn("блять...");
     
     u("#post-buttons" + id + " .postFileSel").not("#" + this.id).each(input => input.value = null);
@@ -37,7 +37,7 @@ function handleUpload(id) {
     }
 
     document.querySelector("#post-buttons" + id + " #wallAttachmentMenu").classList.add("hidden");
-}
+} */
 
 function initGraffiti(id) {
     let canvas = null;
@@ -95,16 +95,9 @@ u(".post-like-button").on("click", function(e) {
     return false;
 });
 
+let picCount = 0;
+
 function setupWallPostInputHandlers(id) {
-    u("#wall-post-input" + id).on("paste", function(e) {
-        if(e.clipboardData.files.length === 1) {
-            var input = u("#post-buttons" + id + " input[name=_pic_attachment]").nodes[0];
-            input.files = e.clipboardData.files;
-            
-            u(input).trigger("change");
-        }
-    });
-    
     u("#wall-post-input" + id).on("input", function(e) {
         var boost             = 5;
         var textArea          = e.target;
@@ -116,4 +109,46 @@ function setupWallPostInputHandlers(id) {
         // revert to original size if it is larger (possibly changed by user)
         // textArea.style.height = (newHeight > originalHeight ? (newHeight + boost) : originalHeight) + "px";
     });
+
+    u(`#wall-post-input${id}`).on("paste", function(e) {
+        for (let i = 0; i < e.clipboardData.files.length; i++) {
+            console.log(e.clipboardData.files[i]);
+            if(e.clipboardData.files[i].type.match('^image/')) {
+                let blobURL = URL.createObjectURL(e.clipboardData.files[i]);
+                addPhotoMedia(e.clipboardData.files, blobURL);
+            }
+        }
+    });
+
+    u(`#post-buttons${id} input[name=_pic_attachment]`).on("change", function(e) {
+        let blobURL = URL.createObjectURL(e.target.files[0]);
+        addPhotoMedia(e.target.files, blobURL);
+    });
+
+    function addPhotoMedia(files, preview) {
+        if(getMediaCount() >= 4) {
+            alert('Низя.');
+        } else {
+            picCount++;
+            u(`#post-buttons${id} .upload`).append(u(`
+                <div class="upload-item" id="aP${picCount}">
+                    <a href="javascript:removePicture(${picCount})" class="upload-delete">×</a>
+                    <img src="${preview}">
+                </div>
+            `));
+            u(`div#aP${picCount}`).nodes[0].append(u(`<input type="file" accept="image/*" name="attachPic${picCount}" id="attachPic${picCount}" style="display: none;">`).first());
+            let input = u(`#attachPic${picCount}`).nodes[0];
+            input.files = files; // нужен рефактор, но щас не
+            console.log(input);
+            u(input).trigger("change");
+        }
+    }
+
+    function getMediaCount() {
+        return u(`#post-buttons${id} .upload`).nodes[0].children.length;
+    }
+}
+
+function removePicture(idA) {
+    u(`div#aP${idA}`).nodes[0].remove();
 }

From 40338a67fc587dd64adc52acfee8e45911ee463e Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Tue, 26 Apr 2022 10:23:16 +0300
Subject: [PATCH 02/13] =?UTF-8?q?=D1=87=D0=B5=D1=82=20=D1=8F=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=D0=BD=D1=83=D0=BB=20=D0=BB=D0=BE=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/Presenters/WallPresenter.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 7fd59994..79aaafb6 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -260,19 +260,15 @@ final class WallPresenter extends OpenVKPresenter
                     
                     $photos[] = Photo::fastMake($this->user->id, $this->postParam("text"), $file, $album, $anon);
                 }
-            } catch(\DomainException $ex) {
-                $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён.");
-            } catch(ISE $ex) {
-                $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён или слишком велик.");
-            }
+			} catch(\DomainException $ex) {
+	            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted"));
+	        } catch(ISE $ex) {
+	            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large"));
+	        }
             
             if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
                 $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"], $anon);
             }
-        } catch(\DomainException $ex) {
-            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted"));
-        } catch(ISE $ex) {
-            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large"));
         }
         
         if(empty($this->postParam("text")) && !$photo && !$video)

From 730de65b80a036bd3a3d70235d7119314412c64b Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Tue, 26 Apr 2022 12:07:41 +0300
Subject: [PATCH 03/13] Photos: (kinda) correctly display multiple pics in
 posts

---
 .../components/post/microblogpost.xml          |  2 +-
 Web/static/css/style.css                       | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index 60cc9e6d..c06e54e9 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -7,7 +7,7 @@
 <table border="0" style="font-size: 11px;" n:class="post, !$compact ? post-divider, $post->isExplicit() ? post-nsfw">
     <tbody>
         <tr>
-            <td width="54" valign="top">
+            <td width="{ifset $compact}27{else}54{/ifset}" style="{ifset $compact}display: block;{/ifset}" valign="top">
                 <a href="{$author->getURL()}">
                     <img src="{$author->getAvatarURL('miniscule')}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} />
                     <span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span>
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 17b63ad1..e4d152d1 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -629,7 +629,23 @@ h4 {
 }
 
 .post-content .attachments_b {
-    margin-top: 8px;
+	margin-top: 8px;
+	display: grid;
+	grid-gap: 2px;
+	height: 100%;
+	max-height: 300px;
+	overflow: hidden;
+}
+
+.post-content .attachments_b > div {
+    min-width: 0;
+    min-height: 0;
+}
+
+.post-content .attachments_b > div a img {
+    height: 100%;
+    object-fit: cover;
+    width: 100%;
 }
 
 .attachment .post {

From 16bc311bbc309b76f7722d68eb3ea7f4a33c5902 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Sat, 7 May 2022 02:33:22 +0300
Subject: [PATCH 04/13] Coin: A very early implementation of Toncoin fetching

It actually works! But there is a several problems:
1. Notification displays 0 coins instead of real number. Maybe @celestora will fix it idk
2. There is no real configuration of server, currency (rn there is TONs per 1 coin), regex or precise (aka count cents)

There is a lot of work, like integrating interactive interface with TON address and QR code, etcetera...

And btw only CLI is available right now. openvkcli fetch-ton command should be putted into cron, just to regularly check for new transactions :D

Related to #474
---
 CLI/FetchToncoinTransactions.php | 112 +++++++++++++++++++++++++++++++
 openvkctl                        |   1 +
 2 files changed, 113 insertions(+)
 create mode 100755 CLI/FetchToncoinTransactions.php

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
new file mode 100755
index 00000000..fac83eae
--- /dev/null
+++ b/CLI/FetchToncoinTransactions.php
@@ -0,0 +1,112 @@
+<?php declare(strict_types=1);
+namespace openvk\CLI;
+use Chandler\Database\DatabaseConnection;
+use openvk\Web\Models\Repositories\Users;
+use openvk\Web\Models\Entities\Notifications\CoinsTransferNotification;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Nette\Utils\ImageException;
+
+define("NANOTON", 1000000000); 
+
+class FetchToncoinTransactions extends Command
+{
+    private $images;
+
+    protected static $defaultName = "fetch-ton";
+
+    function __construct()
+    {
+        $this->transactions = DatabaseConnection::i()->getContext()->table("cryptotransactions");
+
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this->setDescription("Fetches TON transactions to top up the users' balance")
+             ->setHelp("This command checks for new transactions on TON Wallet and then top up the balance of specified users");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $header  = $output->section();
+        $counter = $output->section();
+
+        $header->writeln([
+            "TONCOIN Fetcher",
+            "=====================",
+            "",
+        ]);
+
+        if(!OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["enabled"])
+        {
+            $header->writeln([
+                "Sorry, but you handn't enabled the TON support in your config file yet.",
+                "",
+            ]);
+            return Command::FAILURE;
+        }
+
+        $testnet_subdomain = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["testnet"] ? "testnet." : "";
+        $url = "https://" . $testnet_subdomain . "toncenter.com/api/v2/getTransactions?";
+
+        $opts = [
+            "http" => [
+                "method" => "GET",
+                "header" => "Accept: application/json"
+            ]
+        ];
+
+        $selection = $this->transactions->select('hash, lt')->order("id DESC")->limit(1)->fetch();
+        $tr_hash = $selection->hash ?? NULL;
+        $tr_lt = $selection->lt ?? NULL;
+
+        $data = http_build_query([
+            "address" => OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["address"],
+            "limit" => 100,
+            "hash" => $tr_hash,
+            "to_lt" => $tr_lt
+        ]);
+
+        $response = file_get_contents($url . $data, false, stream_context_create($opts));
+        $response = json_decode($response, true);
+
+        $header->writeln(["Gonna up the balance of users"]);
+        foreach($response["result"] as $transfer)
+        {
+            $output_array;
+            preg_match('/ovk=([0-9]+)/', $transfer["in_msg"]["message"], $output_array);
+            $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : null;
+            if($userid === null)
+            {
+                $header->writeln(["Well, that's a donation. Thanks! XD"]);
+            }
+            else
+            {
+                $user = (new Users)->get($userid);
+                if(!$user) 
+                {
+                    $header->writeln(["Well, that's a donation. Thanks! XD"]);
+                } else {
+                    $value = ($transfer["in_msg"]["value"] / NANOTON) / OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["rate"];
+                    $user->setCoins($user->getCoins() + $value);
+                    $user->save();
+                    (new CoinsTransferNotification($user, (new Users)->get(OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["adminAccount"]), 0, "Via TON cryptocurrency"))->emit();
+                    $header->writeln([$value . " coins are added to " . $user->getId() . " user id"]);
+                    $this->transactions->insert([
+                        "id" => null,
+                        "hash" => $transfer["transaction_id"]["hash"],
+                        "lt" => $transfer["transaction_id"]["lt"]
+                    ]);
+                }
+            }
+        }
+
+        $counter->overwrite("Processing finished :3");
+
+        return Command::SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/openvkctl b/openvkctl
index 6c913aeb..6dd2d3e7 100755
--- a/openvkctl
+++ b/openvkctl
@@ -9,5 +9,6 @@ $bootstrap->ignite(true);
 
 $application = new Application();
 $application->add(new CLI\RebuildImagesCommand);
+$application->add(new CLI\FetchToncoinTransactions);
 
 $application->run();
\ No newline at end of file

From cc6771ea7054ab54209ef45f6902c2d75c754fc4 Mon Sep 17 00:00:00 2001
From: Alexander Minkin <weryskok@gmail.com>
Date: Sat, 7 May 2022 11:55:38 +0300
Subject: [PATCH 05/13] Coin: add sql 'migration' file Still, there is no
 separate table to check which migrations were applied

---
 install/sqls/00024-toncoin-fetching.sql | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 install/sqls/00024-toncoin-fetching.sql

diff --git a/install/sqls/00024-toncoin-fetching.sql b/install/sqls/00024-toncoin-fetching.sql
new file mode 100644
index 00000000..6de0c925
--- /dev/null
+++ b/install/sqls/00024-toncoin-fetching.sql
@@ -0,0 +1,6 @@
+CREATE TABLE `cryptotransactions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hash` varchar(45) COLLATE utf8mb4_general_nopad_ci NOT NULL,
+  `lt` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_nopad_ci;

From 04ab84538215cefeab890ee59f26f053b658ac31 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Sat, 7 May 2022 15:42:25 +0300
Subject: [PATCH 06/13] Coin: Add dialog with QR-code and requisites + tweak
 config

---
 CLI/FetchToncoinTransactions.php           | 24 ++++++++-----------
 Web/Presenters/UserPresenter.php           | 12 ++++++++++
 Web/Presenters/templates/User/Settings.xml | 27 +++++++++++++++++++++-
 locales/en.strings                         |  5 ++++
 locales/ru.strings                         |  5 ++++
 openvk-example.yml                         |  8 +++++++
 6 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
index fac83eae..82cbc2f9 100755
--- a/CLI/FetchToncoinTransactions.php
+++ b/CLI/FetchToncoinTransactions.php
@@ -51,7 +51,7 @@ class FetchToncoinTransactions extends Command
         }
 
         $testnet_subdomain = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["testnet"] ? "testnet." : "";
-        $url = "https://" . $testnet_subdomain . "toncenter.com/api/v2/getTransactions?";
+        $url               = "https://" . $testnet_subdomain . "toncenter.com/api/v2/getTransactions?";
 
         $opts = [
             "http" => [
@@ -61,8 +61,8 @@ class FetchToncoinTransactions extends Command
         ];
 
         $selection = $this->transactions->select('hash, lt')->order("id DESC")->limit(1)->fetch();
-        $tr_hash = $selection->hash ?? NULL;
-        $tr_lt = $selection->lt ?? NULL;
+        $tr_hash   = $selection->hash ?? NULL;
+        $tr_lt     = $selection->lt ?? NULL;
 
         $data = http_build_query([
             "address" => OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["address"],
@@ -78,17 +78,13 @@ class FetchToncoinTransactions extends Command
         foreach($response["result"] as $transfer)
         {
             $output_array;
-            preg_match('/ovk=([0-9]+)/', $transfer["in_msg"]["message"], $output_array);
-            $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : null;
-            if($userid === null)
-            {
+            preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $output_array);
+            $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : NULL;
+            if($userid === NULL) {
                 $header->writeln(["Well, that's a donation. Thanks! XD"]);
-            }
-            else
-            {
+            } else {
                 $user = (new Users)->get($userid);
-                if(!$user) 
-                {
+                if(!$user) {
                     $header->writeln(["Well, that's a donation. Thanks! XD"]);
                 } else {
                     $value = ($transfer["in_msg"]["value"] / NANOTON) / OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["rate"];
@@ -97,9 +93,9 @@ class FetchToncoinTransactions extends Command
                     (new CoinsTransferNotification($user, (new Users)->get(OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["adminAccount"]), 0, "Via TON cryptocurrency"))->emit();
                     $header->writeln([$value . " coins are added to " . $user->getId() . " user id"]);
                     $this->transactions->insert([
-                        "id" => null,
+                        "id"   => NULL,
                         "hash" => $transfer["transaction_id"]["hash"],
-                        "lt" => $transfer["transaction_id"]["lt"]
+                        "lt"   => $transfer["transaction_id"]["lt"]
                     ]);
                 }
             }
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index 0f741654..b55d9f5e 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -449,6 +449,18 @@ final class UserPresenter extends OpenVKPresenter
             "main", "privacy", "finance", "finance.top-up", "interface"
         ]) ? $this->queryParam("act")
             : "main";
+
+        if($this->template->mode == "finance") {
+            $address = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["address"];
+            $text    = str_replace("$1", $this->user->identity->getId(), OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["hint"]);
+            $qrCode  = explode("base64,", (new QRCode(new QROptions([
+                "imageTransparent" => false
+            ])))->render("ton://transfer/$address?text=$text"));
+
+            $this->template->qrCodeType = substr($qrCode[0], 5);
+            $this->template->qrCodeData = $qrCode[1];
+        }
+        
         $this->template->user   = $user;
         $this->template->themes = Themepacks::i()->getThemeList();
     }
diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml
index 03300a81..31433a91 100644
--- a/Web/Presenters/templates/User/Settings.xml
+++ b/Web/Presenters/templates/User/Settings.xml
@@ -383,7 +383,10 @@
                 {_on_your_account}
                 <div style="width: 100%; height: 60px; font-weight: 100;" id="balance">{$thisUser->getCoins()}</div>
                 {_points_count}<br/>
-                <small><a href="?act=finance.top-up">[{_have_voucher}?]</a></small>
+                <small><a href="?act=finance.top-up">[{_have_voucher}?]</a></small><br>
+                <small n:if="OPENVK_ROOT_CONF['openvk']['preferences']['ton']['enabled']">
+                    <a href="javascript:showCoinsTopUpTroughTon()">[{_transfer_trough_ton}]</a>
+                </small>
             </p>
         </div>
         
@@ -393,6 +396,28 @@
             
             balance.style.width = Math.ceil(balance.parentNode.getBoundingClientRect().width) + "px";
             textFit(balance, { alignVert: true });
+
+            function convertCurrency(coin) {
+                var currencyTON = {php echo OPENVK_ROOT_CONF['openvk']['preferences']['ton']['rate']};
+                u('.coins_dialog_conv').nodes[0].innerHTML = tr("transfer_ton_currency_per_ton", coin * currencyTON); 
+            }
+
+            function showCoinsTopUpTroughTon() {
+                MessageBox(tr("transfer_trough_ton"), `
+                    <div class="messagebox-content-header">
+                        ${ tr("transfer_ton_contents") }
+                    </div>
+                    <div style="margin-top: 30px">` +
+                    {tr("transfer_ton_address", OPENVK_ROOT_CONF['openvk']['preferences']['ton']['address'], str_replace("$1", $thisUser->getId(), OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["hint"]))} + 
+                    `<div style="text-align: center;">
+                        <img width="225" height="225" src="data:` + {$qrCodeType} + `;base64,` + {$qrCodeData} + `"><br>
+                        <input oninput="convertCurrency(this.value)"> = <span class="coins_dialog_conv">0 TON</span>
+                    </div>
+                    </div>`
+                , [tr("close")], [
+                    Function.noop
+                ]);
+            }
         </script>
         
         {elseif $isFinanceTU}
diff --git a/locales/en.strings b/locales/en.strings
index 398d14ef..abec1983 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -592,6 +592,11 @@
 
 "transferred_to_you" = "transferred to you";
 
+"transfer_trough_ton" = "Top up with TON";
+"transfer_ton_contents" = "You can top up your balance with TON cryptocurrency. It's just enough to scan the QR-code with the Tonkeeper app, or manually send TON according to the requisites. Within a few minutes you will receive a certain amount of votes.";
+"transfer_ton_address" = "<b>Wallet address:</b> $1<br/><b>Message content:</b> $2";
+"transfer_ton_currency_per_ton" = "$1 TON";
+
 "receiver_address" = "Receiver address";
 "coins_count" = "Number of votes";
 "message" = "Message";
diff --git a/locales/ru.strings b/locales/ru.strings
index 0e65c0eb..2d4fe21a 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -624,6 +624,11 @@
 
 "transferred_to_you" = "передал вам";
 
+"transfer_trough_ton" = "Пополнить с помощью TON";
+"transfer_ton_contents" = "Вы можете пополнить ваш баланс с помощью криптовалюты TON. Достаточно отсканировать QR-code приложением Tonkeeper, или вручную отправить TON по реквизитам. В течении нескольких минут вам придут определенное количество голосов.";
+"transfer_ton_address" = "<b>Адрес кошелька:</b> $1<br/><b>Содержание сообщения:</b> $2";
+"transfer_ton_currency_per_ton" = "$1 TON";
+
 "receiver_address" = "Адрес получателя";
 "coins_count" = "Количество голосов";
 "message" = "Сообщение";
diff --git a/openvk-example.yml b/openvk-example.yml
index 9e4a5d58..cceb2be3 100644
--- a/openvk-example.yml
+++ b/openvk-example.yml
@@ -53,6 +53,14 @@ openvk:
                 processingLimit: 3000
                 emojiProcessingLimit: 1000
         commerce: false
+        ton:
+            enabled: false
+            address: "🅿"
+            testnet: false # Only for testing purposes.
+            rate: 0.02     # TONs per 1 coin
+            regex: "ovk=([0-9]+)"
+            hint: "ovk=$1"
+            # Please read docs to understand how to turn on automatic checking for new translations
         menu:
             links:
                 - name: "@left_menu_donate"

From 13f0cc8a6686b5e571dd29d29400fb6e63670b81 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Sat, 7 May 2022 18:49:14 +0300
Subject: [PATCH 07/13] Coin: cleanup code

---
 CLI/FetchToncoinTransactions.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
index 82cbc2f9..8f6517b1 100755
--- a/CLI/FetchToncoinTransactions.php
+++ b/CLI/FetchToncoinTransactions.php
@@ -32,8 +32,7 @@ class FetchToncoinTransactions extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $header  = $output->section();
-        $counter = $output->section();
+        $header = $output->section();
 
         $header->writeln([
             "TONCOIN Fetcher",
@@ -41,12 +40,9 @@ class FetchToncoinTransactions extends Command
             "",
         ]);
 
-        if(!OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["enabled"])
-        {
-            $header->writeln([
-                "Sorry, but you handn't enabled the TON support in your config file yet.",
-                "",
-            ]);
+        if(!OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["enabled"]) {
+            $header->writeln("Sorry, but you handn't enabled the TON support in your config file yet.");
+
             return Command::FAILURE;
         }
 
@@ -75,8 +71,7 @@ class FetchToncoinTransactions extends Command
         $response = json_decode($response, true);
 
         $header->writeln(["Gonna up the balance of users"]);
-        foreach($response["result"] as $transfer)
-        {
+        foreach($response["result"] as $transfer) {
             $output_array;
             preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $output_array);
             $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : NULL;
@@ -91,7 +86,7 @@ class FetchToncoinTransactions extends Command
                     $user->setCoins($user->getCoins() + $value);
                     $user->save();
                     (new CoinsTransferNotification($user, (new Users)->get(OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["adminAccount"]), 0, "Via TON cryptocurrency"))->emit();
-                    $header->writeln([$value . " coins are added to " . $user->getId() . " user id"]);
+                    $header->writeln($value . " coins are added to " . $user->getId() . " user id");
                     $this->transactions->insert([
                         "id"   => NULL,
                         "hash" => $transfer["transaction_id"]["hash"],

From 85cd1c7554a84e658cd0f857d2e1fb1e0985eb7f Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Mon, 9 May 2022 15:12:14 +0300
Subject: [PATCH 08/13] Coin: Clean up the code

---
 CLI/FetchToncoinTransactions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
index 8f6517b1..1bcdb7e7 100755
--- a/CLI/FetchToncoinTransactions.php
+++ b/CLI/FetchToncoinTransactions.php
@@ -70,17 +70,17 @@ class FetchToncoinTransactions extends Command
         $response = file_get_contents($url . $data, false, stream_context_create($opts));
         $response = json_decode($response, true);
 
-        $header->writeln(["Gonna up the balance of users"]);
+        $header->writeln("Gonna up the balance of users");
         foreach($response["result"] as $transfer) {
             $output_array;
             preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $output_array);
             $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : NULL;
             if($userid === NULL) {
-                $header->writeln(["Well, that's a donation. Thanks! XD"]);
+                $header->writeln("Well, that's a donation. Thanks! XD");
             } else {
                 $user = (new Users)->get($userid);
                 if(!$user) {
-                    $header->writeln(["Well, that's a donation. Thanks! XD"]);
+                    $header->writeln("Well, that's a donation. Thanks! XD");
                 } else {
                     $value = ($transfer["in_msg"]["value"] / NANOTON) / OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["rate"];
                     $user->setCoins($user->getCoins() + $value);
@@ -96,7 +96,7 @@ class FetchToncoinTransactions extends Command
             }
         }
 
-        $counter->overwrite("Processing finished :3");
+        $header->writeln("Processing finished :3");
 
         return Command::SUCCESS;
     }

From 7fc19ff5e74db6201454dcfdb707a33a5e819af5 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Mon, 9 May 2022 15:13:05 +0300
Subject: [PATCH 09/13] Global: Cancel changed from past commits that was
 created by accident

---
 Web/Presenters/WallPresenter.php              | 39 +++++-----
 .../components/post/microblogpost.xml         |  2 +-
 .../templates/components/textArea.xml         |  8 +-
 Web/static/css/style.css                      | 77 -------------------
 Web/static/js/al_wall.js                      | 59 ++------------
 5 files changed, 33 insertions(+), 152 deletions(-)

diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 79aaafb6..b61f28ae 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -248,27 +248,24 @@ final class WallPresenter extends OpenVKPresenter
         if($this->postParam("force_sign") === "on")
             $flags |= 0b01000000;
         
-        $photos = [];
-        $_FILES["_pic_attachment"] = null;
-        foreach($_FILES as $file) {
-        	bdump($file);
-            try {
-                if($file["error"] === UPLOAD_ERR_OK && preg_match('/^image\//', $file['type'])) {
-                    $album = NULL;
-                    if(!$anon && $wall > 0 && $wall === $this->user->id)
-                        $album = (new Albums)->getUserWallAlbum($wallOwner);
-                    
-                    $photos[] = Photo::fastMake($this->user->id, $this->postParam("text"), $file, $album, $anon);
-                }
-			} catch(\DomainException $ex) {
-	            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted"));
-	        } catch(ISE $ex) {
-	            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large"));
-	        }
+        try {
+            $photo = NULL;
+            $video = NULL;
+            if($_FILES["_pic_attachment"]["error"] === UPLOAD_ERR_OK) {
+                $album = NULL;
+                if(!$anon && $wall > 0 && $wall === $this->user->id)
+                    $album = (new Albums)->getUserWallAlbum($wallOwner);
+
+                $photo = Photo::fastMake($this->user->id, $this->postParam("text"), $_FILES["_pic_attachment"], $album, $anon);
+            }
             
             if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
                 $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"], $anon);
             }
+        } catch(\DomainException $ex) {
+            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted"));
+        } catch(ISE $ex) {
+            $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large"));
         }
         
         if(empty($this->postParam("text")) && !$photo && !$video)
@@ -288,9 +285,11 @@ final class WallPresenter extends OpenVKPresenter
             $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_too_big"));
         }
 
-        foreach($photos as $photo) {
-        	$post->attach($photo);
-        }
+        if(!is_null($photo))
+            $post->attach($photo);
+        
+        if(!is_null($video))
+            $post->attach($video);
         
         if($wall > 0 && $wall !== $this->user->identity->getId())
             (new WallPostNotification($wallOwner, $post, $this->user->identity))->emit();
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index c06e54e9..249dee45 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -7,7 +7,7 @@
 <table border="0" style="font-size: 11px;" n:class="post, !$compact ? post-divider, $post->isExplicit() ? post-nsfw">
     <tbody>
         <tr>
-            <td width="{ifset $compact}27{else}54{/ifset}" style="{ifset $compact}display: block;{/ifset}" valign="top">
+            <td width="54" style="{ifset $compact}display: block;{/ifset}" valign="top">
                 <a href="{$author->getURL()}">
                     <img src="{$author->getAvatarURL('miniscule')}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} />
                     <span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span>
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index fc0cd97d..9d81ac6d 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -8,8 +8,8 @@
             <!-- padding to fix <br/> bug -->
         </div>
         <div id="post-buttons{$textAreaId}" style="display: none;">
-            <div class="upload">
-                
+            <div class="post-upload">
+                {_attachment}: <span>(unknown)</span>
             </div>
             <div n:if="$postOpts ?? true" class="post-opts">
                 {var $anonEnabled = OPENVK_ROOT_CONF['openvk']['preferences']['wall']['anonymousPosting']['enable']}
@@ -80,6 +80,10 @@
 
 <script>
     $(document).ready(() => {
+        u("#post-buttons{$textAreaId} .postFileSel").on("change", function() {
+            handleUpload.bind(this, {$textAreaId})();
+        });
+
         setupWallPostInputHandlers({$textAreaId});
     });
 </script>
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index e4d152d1..6ae44614 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -630,22 +630,6 @@ h4 {
 
 .post-content .attachments_b {
 	margin-top: 8px;
-	display: grid;
-	grid-gap: 2px;
-	height: 100%;
-	max-height: 300px;
-	overflow: hidden;
-}
-
-.post-content .attachments_b > div {
-    min-width: 0;
-    min-height: 0;
-}
-
-.post-content .attachments_b > div a img {
-    height: 100%;
-    object-fit: cover;
-    width: 100%;
 }
 
 .attachment .post {
@@ -1922,67 +1906,6 @@ table td[width="120"] {
     margin: 0 auto;
 }
 
-.progress {
-    border: 1px solid #eee;
-    height: 15px;
-    background: linear-gradient(to bottom, #fefefe, #fafafa);
-}
-
-.progress .progress-bar {
-    background: url('progress.png');
-    background-repeat: repeat-x;
-    height: 15px;
-    animation-name: progress;
-    animation-duration: 1s;
-    animation-iteration-count: infinite;
-    animation-timing-function: linear;
-}
-
-@keyframes progress {
-    from {
-        background-position: 0;
-    }
-
-    to {
-        background-position: 20px;
-    }
-}
-
-.upload {
-    margin-top: 8px;
-}
-
-.upload .upload-item {
-    width: 75px;
-    height: 60px;
-    overflow: hidden;
-    display: inline-block;
-    margin-right: 3px;
-}
-
-.upload-item .upload-delete {
-    position: absolute;
-    background: rgba(0,0,0,0.5);
-    padding: 2px 5px;
-    text-decoration: none;
-    color: #fff;
-    font-size: 11px;
-    margin-left: 57px; /* мне лень переделывать :DDDD */
-    opacity: 0;
-    transition: 0.25s;
-}
-
-.upload-item:hover > .upload-delete {
-    opacity: 1;
-}
-
-.upload-item img {
-    width: 100%;
-    max-height: 60px;
-    object-fit: cover;
-    border-radius: 3px;
-}
-
 #votesBalance {
     margin-top: 50px;
     padding: 7px;
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index fa1f26f5..cce477a2 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -22,7 +22,7 @@ function trim(string) {
     return newStr;
 }
 
-/* function handleUpload(id) {
+function handleUpload(id) {
     console.warn("блять...");
     
     u("#post-buttons" + id + " .postFileSel").not("#" + this.id).each(input => input.value = null);
@@ -37,7 +37,7 @@ function trim(string) {
     }
 
     document.querySelector("#post-buttons" + id + " #wallAttachmentMenu").classList.add("hidden");
-} */
+}
 
 function initGraffiti(id) {
     let canvas = null;
@@ -98,59 +98,14 @@ u(".post-like-button").on("click", function(e) {
 let picCount = 0;
 
 function setupWallPostInputHandlers(id) {
-    u("#wall-post-input" + id).on("input", function(e) {
-        var boost             = 5;
-        var textArea          = e.target;
-        textArea.style.height = "5px";
-        var newHeight = textArea.scrollHeight;
-        textArea.style.height = newHeight + boost + "px";
-        return;
-        
-        // revert to original size if it is larger (possibly changed by user)
-        // textArea.style.height = (newHeight > originalHeight ? (newHeight + boost) : originalHeight) + "px";
-    });
+    u("#wall-post-input" + id).on("paste", function(e) {
+        if(e.clipboardData.files.length === 1) {
+            var input = u("#post-buttons" + id + " input[name=_pic_attachment]").nodes[0];
+            input.files = e.clipboardData.files;
 
-    u(`#wall-post-input${id}`).on("paste", function(e) {
-        for (let i = 0; i < e.clipboardData.files.length; i++) {
-            console.log(e.clipboardData.files[i]);
-            if(e.clipboardData.files[i].type.match('^image/')) {
-                let blobURL = URL.createObjectURL(e.clipboardData.files[i]);
-                addPhotoMedia(e.clipboardData.files, blobURL);
-            }
-        }
-    });
-
-    u(`#post-buttons${id} input[name=_pic_attachment]`).on("change", function(e) {
-        let blobURL = URL.createObjectURL(e.target.files[0]);
-        addPhotoMedia(e.target.files, blobURL);
-    });
-
-    function addPhotoMedia(files, preview) {
-        if(getMediaCount() >= 4) {
-            alert('Низя.');
-        } else {
-            picCount++;
-            u(`#post-buttons${id} .upload`).append(u(`
-                <div class="upload-item" id="aP${picCount}">
-                    <a href="javascript:removePicture(${picCount})" class="upload-delete">×</a>
-                    <img src="${preview}">
-                </div>
-            `));
-            u(`div#aP${picCount}`).nodes[0].append(u(`<input type="file" accept="image/*" name="attachPic${picCount}" id="attachPic${picCount}" style="display: none;">`).first());
-            let input = u(`#attachPic${picCount}`).nodes[0];
-            input.files = files; // нужен рефактор, но щас не
-            console.log(input);
             u(input).trigger("change");
         }
-    }
-
-    function getMediaCount() {
-        return u(`#post-buttons${id} .upload`).nodes[0].children.length;
-    }
-}
-
-function removePicture(idA) {
-    u(`div#aP${idA}`).nodes[0].remove();
+    });
 }
 
 u("#write > form").on("keydown", function(event) {

From 160f2c9383e800bdd342fbb60b768f5f5056e400 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Mon, 9 May 2022 15:14:19 +0300
Subject: [PATCH 10/13] Global: Still canceling changes from past commits

---
 Web/static/js/al_wall.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index cce477a2..4457b7c1 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -95,8 +95,6 @@ u(".post-like-button").on("click", function(e) {
     return false;
 });
 
-let picCount = 0;
-
 function setupWallPostInputHandlers(id) {
     u("#wall-post-input" + id).on("paste", function(e) {
         if(e.clipboardData.files.length === 1) {
@@ -106,6 +104,18 @@ function setupWallPostInputHandlers(id) {
             u(input).trigger("change");
         }
     });
+
+    u("#wall-post-input" + id).on("input", function(e) {
+        var boost             = 5;
+        var textArea          = e.target;
+        textArea.style.height = "5px";
+        var newHeight = textArea.scrollHeight;
+        textArea.style.height = newHeight + boost + "px";
+        return;
+
+        // revert to original size if it is larger (possibly changed by user)
+        // textArea.style.height = (newHeight > originalHeight ? (newHeight + boost) : originalHeight) + "px";
+    });
 }
 
 u("#write > form").on("keydown", function(event) {

From fb6c9d396341c67806bd201390520429c30baac2 Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Mon, 23 May 2022 15:36:19 +0300
Subject: [PATCH 11/13] Coin: Clear up the code

---
 CLI/FetchToncoinTransactions.php                   | 14 +++++++-------
 Web/Presenters/WallPresenter.php                   |  1 +
 Web/Presenters/templates/User/Settings.xml         |  4 ++--
 .../templates/components/post/microblogpost.xml    |  2 +-
 Web/static/css/style.css                           |  2 +-
 Web/static/js/al_wall.js                           |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
index 1bcdb7e7..11bfa417 100755
--- a/CLI/FetchToncoinTransactions.php
+++ b/CLI/FetchToncoinTransactions.php
@@ -46,8 +46,8 @@ class FetchToncoinTransactions extends Command
             return Command::FAILURE;
         }
 
-        $testnet_subdomain = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["testnet"] ? "testnet." : "";
-        $url               = "https://" . $testnet_subdomain . "toncenter.com/api/v2/getTransactions?";
+        $testnetSubdomain = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["testnet"] ? "testnet." : "";
+        $url               = "https://" . $testnetSubdomain . "toncenter.com/api/v2/getTransactions?";
 
         $opts = [
             "http" => [
@@ -57,14 +57,14 @@ class FetchToncoinTransactions extends Command
         ];
 
         $selection = $this->transactions->select('hash, lt')->order("id DESC")->limit(1)->fetch();
-        $tr_hash   = $selection->hash ?? NULL;
-        $tr_lt     = $selection->lt ?? NULL;
+        $trHash   = $selection->hash ?? NULL;
+        $trLt     = $selection->lt ?? NULL;
 
         $data = http_build_query([
             "address" => OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["address"],
             "limit" => 100,
-            "hash" => $tr_hash,
-            "to_lt" => $tr_lt
+            "hash" => $trHash,
+            "to_lt" => $trLt
         ]);
 
         $response = file_get_contents($url . $data, false, stream_context_create($opts));
@@ -75,7 +75,7 @@ class FetchToncoinTransactions extends Command
             $output_array;
             preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $output_array);
             $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : NULL;
-            if($userid === NULL) {
+            if(is_null($userid)) {
                 $header->writeln("Well, that's a donation. Thanks! XD");
             } else {
                 $user = (new Users)->get($userid);
diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 8706f82f..ee3cc651 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -273,6 +273,7 @@ final class WallPresenter extends OpenVKPresenter
         
         try {
 	        $post = new Post;
+            
 	        $post->setOwner($this->user->id);
 	        $post->setWall($wall);
 	        $post->setCreated(time());
diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml
index 31433a91..424e08c6 100644
--- a/Web/Presenters/templates/User/Settings.xml
+++ b/Web/Presenters/templates/User/Settings.xml
@@ -399,13 +399,13 @@
 
             function convertCurrency(coin) {
                 var currencyTON = {php echo OPENVK_ROOT_CONF['openvk']['preferences']['ton']['rate']};
-                u('.coins_dialog_conv').nodes[0].innerHTML = tr("transfer_ton_currency_per_ton", coin * currencyTON); 
+                u(".coins_dialog_conv").nodes[0].innerHTML = tr("transfer_ton_currency_per_ton", coin * currencyTON); 
             }
 
             function showCoinsTopUpTroughTon() {
                 MessageBox(tr("transfer_trough_ton"), `
                     <div class="messagebox-content-header">
-                        ${ tr("transfer_ton_contents") }
+                        ${tr("transfer_ton_contents")}
                     </div>
                     <div style="margin-top: 30px">` +
                     {tr("transfer_ton_address", OPENVK_ROOT_CONF['openvk']['preferences']['ton']['address'], str_replace("$1", $thisUser->getId(), OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["hint"]))} + 
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index 352d9684..37dfb5da 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -7,7 +7,7 @@
 <table border="0" style="font-size: 11px;" n:class="post, !$compact ? post-divider, $post->isExplicit() ? post-nsfw">
     <tbody>
         <tr>
-            <td width="54" style="{ifset $compact}display: block;{/ifset}" valign="top">
+            <td width="54" valign="top">
                 <a href="{$author->getURL()}">
                     <img src="{$author->getAvatarURL('miniscule')}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} />
                     <span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span>
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 2d257e89..9db53696 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -629,7 +629,7 @@ h4 {
 }
 
 .post-content .attachments_b {
-	margin-top: 8px;
+    margin-top: 8px;
 }
 
 .attachment .post {
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 4457b7c1..4a8ab4e9 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -100,7 +100,7 @@ function setupWallPostInputHandlers(id) {
         if(e.clipboardData.files.length === 1) {
             var input = u("#post-buttons" + id + " input[name=_pic_attachment]").nodes[0];
             input.files = e.clipboardData.files;
-
+            
             u(input).trigger("change");
         }
     });

From 10040332ed7ea9c47bdaad9253aa0beea345e8be Mon Sep 17 00:00:00 2001
From: veselcraft <veselcraft@icloud.com>
Date: Mon, 23 May 2022 16:13:02 +0300
Subject: [PATCH 12/13] Coin: Code cleanup

---
 CLI/FetchToncoinTransactions.php | 22 +++++++++++-----------
 Web/Presenters/WallPresenter.php | 17 ++++++++---------
 Web/static/js/al_wall.js         |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/CLI/FetchToncoinTransactions.php b/CLI/FetchToncoinTransactions.php
index 11bfa417..f6a2fb56 100755
--- a/CLI/FetchToncoinTransactions.php
+++ b/CLI/FetchToncoinTransactions.php
@@ -47,7 +47,7 @@ class FetchToncoinTransactions extends Command
         }
 
         $testnetSubdomain = OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["testnet"] ? "testnet." : "";
-        $url               = "https://" . $testnetSubdomain . "toncenter.com/api/v2/getTransactions?";
+        $url              = "https://" . $testnetSubdomain . "toncenter.com/api/v2/getTransactions?";
 
         $opts = [
             "http" => [
@@ -57,14 +57,14 @@ class FetchToncoinTransactions extends Command
         ];
 
         $selection = $this->transactions->select('hash, lt')->order("id DESC")->limit(1)->fetch();
-        $trHash   = $selection->hash ?? NULL;
-        $trLt     = $selection->lt ?? NULL;
+        $trHash    = $selection->hash ?? NULL;
+        $trLt      = $selection->lt ?? NULL;
 
         $data = http_build_query([
             "address" => OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["address"],
-            "limit" => 100,
-            "hash" => $trHash,
-            "to_lt" => $trLt
+            "limit"   => 100,
+            "hash"    => $trHash,
+            "to_lt"   => $trLt
         ]);
 
         $response = file_get_contents($url . $data, false, stream_context_create($opts));
@@ -72,13 +72,13 @@ class FetchToncoinTransactions extends Command
 
         $header->writeln("Gonna up the balance of users");
         foreach($response["result"] as $transfer) {
-            $output_array;
-            preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $output_array);
-            $userid = ctype_digit($output_array[1]) ? intval($output_array[1]) : NULL;
-            if(is_null($userid)) {
+            $outputArray;
+            preg_match('/' . OPENVK_ROOT_CONF["openvk"]["preferences"]["ton"]["regex"] . '/', $transfer["in_msg"]["message"], $outputArray);
+            $userId = ctype_digit($outputArray[1]) ? intval($outputArray[1]) : NULL;
+            if(is_null($userId)) {
                 $header->writeln("Well, that's a donation. Thanks! XD");
             } else {
-                $user = (new Users)->get($userid);
+                $user = (new Users)->get($userId);
                 if(!$user) {
                     $header->writeln("Well, that's a donation. Thanks! XD");
                 } else {
diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index ee3cc651..0dd6b66d 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -272,15 +272,14 @@ final class WallPresenter extends OpenVKPresenter
             $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 = 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/static/js/al_wall.js b/Web/static/js/al_wall.js
index 4a8ab4e9..d9dba115 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -104,7 +104,7 @@ function setupWallPostInputHandlers(id) {
             u(input).trigger("change");
         }
     });
-
+    
     u("#wall-post-input" + id).on("input", function(e) {
         var boost             = 5;
         var textArea          = e.target;

From f0a51237def0fff5fc78bd84a160f5bf56b9f88c Mon Sep 17 00:00:00 2001
From: Maxim Leshchenko <cnmaks90@gmail.com>
Date: Mon, 23 May 2022 15:20:36 +0100
Subject: [PATCH 13/13] Coin: Revert redundant indentation changes

---
 Web/Presenters/WallPresenter.php | 4 ++--
 Web/static/js/al_wall.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 0dd6b66d..5bdac066 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -255,7 +255,7 @@ final class WallPresenter extends OpenVKPresenter
                 $album = NULL;
                 if(!$anon && $wall > 0 && $wall === $this->user->id)
                     $album = (new Albums)->getUserWallAlbum($wallOwner);
-
+                
                 $photo = Photo::fastMake($this->user->id, $this->postParam("text"), $_FILES["_pic_attachment"], $album, $anon);
             }
             
@@ -284,7 +284,7 @@ final class WallPresenter extends OpenVKPresenter
         } catch (\LengthException $ex) {
             $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_too_big"));
         }
-
+        
         if(!is_null($photo))
             $post->attach($photo);
         
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index d9dba115..bee1bb1f 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -112,7 +112,7 @@ function setupWallPostInputHandlers(id) {
         var newHeight = textArea.scrollHeight;
         textArea.style.height = newHeight + boost + "px";
         return;
-
+        
         // revert to original size if it is larger (possibly changed by user)
         // textArea.style.height = (newHeight > originalHeight ? (newHeight + boost) : originalHeight) + "px";
     });