Merge 498df20f2e into bbef3a8518

feat(friends): delete leftovers
feat(friends): add ajax
2024-11-15 03:31:18 +03:00 · 2024-09-23 06:16:28 +03:00 · 2024-09-18 22:07:17 +03:00 · 2024-09-18 01:02:56 +03:00 · 2024-09-16 02:11:28 +03:00 · 2024-09-07 18:29:44 +03:00
22 changed files with 195 additions and 109 deletions
--- a/VKAPI/Handlers/Friends.php
+++ b/VKAPI/Handlers/Friends.php
@ -147,7 +147,7 @@ final class Friends extends VKAPIRequestHandler
 		return $response;
 	}

-	function getRequests(string $fields = "", int $offset = 0, int $count = 100, int $extended = 0): object
+	function getRequests(string $fields = "", int $out = 0, int $offset = 0, int $count = 100, int $extended = 0): object
 	{
 		if ($count >= 1000)
 			$this->fail(100, "One of the required parameters was not passed or is invalid.");
@ -158,9 +158,18 @@ final class Friends extends VKAPIRequestHandler
 		$offset++;
 		$followers = [];

-		foreach($this->getUser()->getFollowers($offset, $count) as $follower) {
-			$followers[$i] = $follower->getId();
-			$i++;
+		if ($out != 0) {	
+			foreach($this->getUser()->getFollowers($offset, $count) as $follower) {
+				$followers[$i] = $follower->getId();
+				$i++;
+			}
+		}
+		else
+		{
+			foreach($this->getUser()->getRequests($offset, $count) as $follower) {
+				$followers[$i] = $follower->getId();
+				$i++;
+			}
 		}

 		$response = $followers;
--- a/Web/Models/Entities/Traits/TSubscribable.php
+++ b/Web/Models/Entities/Traits/TSubscribable.php
@ -39,4 +39,25 @@ trait TSubscribable
        $sub->delete();
        return false;
    }
+
+    function changeFlags(User $user, int $flags, bool $reverse): bool
+    {
+        $ctx  = DatabaseConnection::i()->getContext();
+        $data = [
+            "follower" => $reverse ? $this->getId() : $user->getId(),
+            "model"    => static::class,
+            "target"   => $reverse ? $user->getId() : $this->getId(),
+        ];
+        $sub  = $ctx->table("subscriptions")->where($data);
+
+        bdump($data);
+        
+        if (!$sub) 
+            return false;
+
+        $sub->update([
+            'flags' => $flags
+        ]);
+        return true;
+    }
 }
--- a/Web/Models/Entities/User.php
+++ b/Web/Models/Entities/User.php
@ -592,6 +592,16 @@ class User extends RowModel
        return $this->_abstractRelationCount("get-followers");
    }

+    function getRequests(int $page = 1, int $limit = 6): \Traversable
+    {
+        return $this->_abstractRelationGenerator("get-requests", $page, $limit);
+    }
+
+    function getRequestsCount(): int
+    {
+        return $this->_abstractRelationCount("get-requests");
+    }
+
    function getSubscriptions(int $page = 1, int $limit = 6): \Traversable
    {
        return $this->_abstractRelationGenerator("get-subscriptions-user", $page, $limit);
--- a/Web/Models/sql/get-followers.tsql
+++ b/Web/Models/sql/get-followers.tsql
@ -1,5 +1,5 @@
  (SELECT DISTINCT(follower) AS __id FROM
-    (SELECT follower FROM subscriptions WHERE target=? AND model="openvk\\Web\\Models\\Entities\\User") u0
+    (SELECT follower, flags FROM subscriptions WHERE target=? AND model="openvk\\Web\\Models\\Entities\\User") u0
    LEFT JOIN
    (SELECT target FROM subscriptions WHERE follower=? AND model="openvk\\Web\\Models\\Entities\\User") u1
  ON u0.follower = u1.target WHERE u1.target IS NULL) u2
--- a/Web/Models/sql/get-requests.tsql
+++ b/Web/Models/sql/get-requests.tsql
@ -0,0 +1,6 @@
+  (SELECT DISTINCT(follower) AS __id FROM
+    (SELECT follower FROM subscriptions WHERE target=? AND flags=0 AND model="openvk\\Web\\Models\\Entities\\User") u0
+    LEFT JOIN
+    (SELECT target FROM subscriptions WHERE follower=? AND flags=0 AND model="openvk\\Web\\Models\\Entities\\User") u1
+  ON u0.follower = u1.target WHERE u1.target IS NULL) u2
+INNER JOIN profiles ON profiles.id = u2.__id
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@ -329,9 +329,12 @@ final class UserPresenter extends OpenVKPresenter
        $user = $this->users->get((int) $this->postParam("id"));
        if(!$user) exit("Invalid state");
        
-        $user->toggleSubscription($this->user->identity);
+        if ($this->postParam("act") == "rej")
+            $user->changeFlags($this->user->identity, 0b10000000, true);
+        else
+            $user->toggleSubscription($this->user->identity);
        
-        $this->redirect($user->getURL());
+        $this->redirect($_SERVER['HTTP_REFERER']);
    }
    
    function renderSetAvatar()
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@ -178,9 +178,9 @@
                            <a href="/edit" class="link edit-button">{_edit_button}</a>
                            <a href="{$thisUser->getURL()}" class="link" title="{_my_page} [Alt+Shift+.]" accesskey=".">{_my_page}</a>
                            <a href="/friends{$thisUser->getId()}" class="link">{_my_friends}
-                                <object type="internal/link" n:if="$thisUser->getFollowersCount() > 0">
+                                <object type="internal/link" n:if="$thisUser->getRequestsCount() > 0">
                                    <a href="/friends{$thisUser->getId()}?act=incoming" class="linkunderline">
-                                       (<b>{$thisUser->getFollowersCount()}</b>)
+                                       (<b>{$thisUser->getRequestsCount()}</b>)
                                    </a>
                                </object>
                            </a>
@ -403,13 +403,6 @@
            {script "js/al_notifs.js"}
        {/ifset}

-        {if OPENVK_ROOT_CONF['openvk']['preferences']['bellsAndWhistles']['fartscroll']}
-            <script src="https://unpkg.com/fartscroll@1.0.0/fartscroll.js"></script>
-            <script>
-                fartscroll(400);
-            </script>
-        {/if}
-
        <script>bsdnHydrate();</script>

        <script n:if="OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['enable']" async defer data-domain="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['domain']}" src="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['server']}js/plausible.js"></script>
--- a/Web/Presenters/templates/@listView.xml
+++ b/Web/Presenters/templates/@listView.xml
@ -49,7 +49,7 @@
                                                {include description, x => $dat}
                                            {/ifset}
                                        </td>
-                                        <td n:ifset="actions" valign="top" class="action_links" style="width: 150px;">
+                                        <td n:ifset="actions" valign="top" class="action_links" style="min-width: 150px;">
                                            {include actions, x => $dat}
                                        </td>
                                    </tr>
--- a/Web/Presenters/templates/About/Version.xml
+++ b/Web/Presenters/templates/About/Version.xml
@ -255,17 +255,6 @@
                        Disabled
                    </td>
                </tr>
-                <tr>
-                    <td class="e">
-                        Fartscroll
-                    </td>
-                    <td class="v">
-                        {php echo OPENVK_ROOT_CONF["openvk"]["preferences"]["bellsAndWhistles"]["fartscroll"] ? "Enabled" : "Disabled"}
-                    </td>
-                    <td class="v">
-                        Disabled
-                    </td>
-                </tr>
                <tr>
                    <td class="e">
                        NDA Test Label
--- a/Web/Presenters/templates/User/Friends.xml
+++ b/Web/Presenters/templates/User/Friends.xml
@ -4,11 +4,14 @@
 {var $act = $_GET["act"] ?? "friends"}

 {if $act == "incoming"}
-    {var $iterator = iterator_to_array($user->getFollowers($page))}
-    {var $count    = $user->getFollowersCount()}
+    {var $iterator = iterator_to_array($user->getRequests($page))}
+    {var $count    = $user->getRequestsCount()}
 {elseif $act == "outcoming"}
    {var $iterator = iterator_to_array($user->getSubscriptions($page))}
    {var $count    = $user->getSubscriptionsCount()}
+{elseif $act == "followers"}
+    {var $iterator = iterator_to_array($user->getFollowers($page))}
+    {var $count    = $user->getFollowersCount()}
 {elseif $act == "online"}
    {var $iterator = iterator_to_array($user->getFriendsOnline($page))}
    {var $count    = $user->getFriendsOnlineCount()}
@ -22,6 +25,8 @@
        {_incoming_req}
    {elseif $act == "outcoming"}
        {_outcoming_req}
+    {elseif $act == "followers"}
+        {_followers}
    {elseif $act == "online"}
        {_friends_online}
    {else}
@ -38,6 +43,8 @@
            {_incoming_req}
        {elseif $act == "outcoming"}
            {_outcoming_req}
+        {elseif $act == "followers"}
+            {_followers}
        {elseif $act == "online"}
            {_friends_online}
        {else}
@ -53,18 +60,23 @@
    <div n:attr="id => ($act === 'online' ? 'activetabs' : 'ki')" class="tab">
        <a n:attr="id => ($act === 'online' ? 'act_tab_a' : 'ki')" href="?act=online">{_online}</a>
    </div>
-    <div n:if="!is_null($thisUser) && $user->getId() === $thisUser->getId()" n:attr="id => ($act === 'incoming' || $act === 'outcoming' ? 'activetabs' : 'ki')" class="tab">
-        <a n:attr="id => ($act === 'incoming' || $act === 'outcoming' ? 'act_tab_a' : 'ki')" href="?act=incoming">{_req}</a>
+    <div n:if="!is_null($thisUser) && $user->getId() === $thisUser->getId()" n:attr="id => ($act === 'incoming' || $act === 'followers' || $act === 'outcoming' ? 'activetabs' : 'ki')" class="tab">
+        <a n:attr="id => ($act === 'incoming' || $act === 'followers' || $act === 'outcoming' ? 'act_tab_a' : 'ki')" href="?act=incoming">{_req}</a>
    </div>
 {/block}

 {block size}
-    <div n:if="$act === 'incoming' || $act === 'outcoming'" class="mb_tabs">
+    <div n:if="$act === 'incoming' || $act === 'followers' || $act === 'outcoming'" class="mb_tabs">
        <div n:attr="id => ($act === 'incoming' ? 'active' : 'ki')" class="mb_tab">
            <div>
                <a href="?act=incoming">{_incoming_req}</a>
            </div>
        </div>
+        <div n:attr="id => ($act === 'followers' ? 'active' : 'ki')" class="mb_tab">
+            <div>
+                <a href="?act=followers">{_followers}</a>
+            </div>
+        </div>
        <div n:attr="id => ($act === 'outcoming' ? 'active' : 'ki')" class="mb_tab">
            <div>
                <a href="?act=outcoming">{_outcoming_req}</a>
@ -78,6 +90,8 @@
                    {tr("req", $count)}
                {elseif $act == "outcoming"}
                    {tr("req", $count)}
+                {elseif $act == "followers"}
+                    {tr("followers", $count)}
                {elseif $act == "online"}
                    {tr("friends_list_online", $count)}
                {else}
@ -131,21 +145,29 @@
    {if ($x->getId() !== $thisUser->getId()) && ($thisUser->getId() === $user->getId())}
        {var $subStatus = $x->getSubscriptionStatus($thisUser)}
        {if $subStatus === 0}
-            <form action="/setSub/user" method="post" class="profile_link_form">
+            <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
                <input type="hidden" name="act" value="add" />
                <input type="hidden" name="id"  value="{$x->getId()}" />
                <input type="hidden" name="hash" value="{$csrfToken}" />
                <input type="submit" class="profile_link" value="{_friends_add}" />
            </form>
        {elseif $subStatus === 1}
-            <form action="/setSub/user" method="post" class="profile_link_form">
+            <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
                <input type="hidden" name="act" value="add" />
                <input type="hidden" name="id"  value="{$x->getId()}" />
                <input type="hidden" name="hash" value="{$csrfToken}" />
                <input type="submit" class="profile_link" value="{_friends_accept}" />
            </form>
+            {if $act !== 'followers'}
+                <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
+                    <input type="hidden" name="act" value="rej" />
+                    <input type="hidden" name="id"  value="{$x->getId()}" />
+                    <input type="hidden" name="hash" value="{$csrfToken}" />
+                    <input type="submit" class="profile_link" value="{_friends_leave_in_flw}" />
+                </form>
+            {/if}
        {elseif $subStatus === 2}
-            <form action="/setSub/user" method="post" class="profile_link_form">
+            <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
                <input type="hidden" name="act" value="rem" />
                <input type="hidden" name="id"  value="{$x->getId()}" />
                <input type="hidden" name="hash" value="{$csrfToken}" />
@ -153,7 +175,7 @@
            </form>
        {elseif $subStatus === 3}
            <a href="/im?sel={$x->getId()}" class="profile_link">{_send_message}</a>
-            <form action="/setSub/user" method="post" class="profile_link_form">
+            <form action="/setSub/user" method="post" class="profile_link_form" id="_submitUserSubscriptionAction">
                <input type="hidden" name="act" value="rem" />
                <input type="hidden" name="id"  value="{$x->getId()}" />
                <input type="hidden" name="hash" value="{$csrfToken}" />
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@ -427,6 +427,22 @@ h1 {
    text-transform: lowercase;
 }

+.action_links.disable>a,
+.action_links.disable>form>input,
+.action_links.disable {
+    cursor: not-allowed;
+    color: grey;
+}
+
+.action_links.loading::after {
+	content: "";
+	display: inline-block;
+	background-image: url('/assets/packages/static/openvk/img/loading_mini.gif');
+	width: 30px;
+	height: 7px;
+	margin-left: 5px;
+}
+
 .profile_link.disable>a,
 .profile_link.disable {
    cursor: not-allowed;
@ -2068,20 +2084,17 @@ table td[width="120"] {
    font-weight: bold;
    margin-right: 10px;
    display: inline-block;
+    border-radius: 2px;
 }

 .mb_tab div {
-    padding: 3px 7px;
+    padding: 5px 9px;
 }

 .mb_tab#active {
    background-color: #898989;
 }

-.mb_tab#active div {
-    border: 2px solid #5f5f5f;
-}
-
 .mb_tab#active a {
    color: white;
 }
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@ -167,6 +167,23 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
        return false;
    });

+    u("#_submitUserSubscriptionAction").handle("submit", async function(e) {
+        u(this).nodes[0].parentElement.classList.add('loading');
+        u(this).nodes[0].parentElement.classList.add('disable');
+        console.log(e.target);
+        const data = await fetch(u(this).attr('action'), { method: 'POST', body: new FormData(e.target) });
+        if (data.ok) {
+            u(this).nodes[0].parentElement.classList.remove('loading');
+            u(this).nodes[0].parentElement.classList.remove('disable');
+            if (e.target[0].value == "add") {
+                u(this).nodes[0].parentElement.innerHTML = tr("friends_add_msg");
+            } else if (e.target[0].value == "rej") {
+                u(this).nodes[0].parentElement.innerHTML = tr("friends_rej_msg");
+            } else if (e.target[0].value == "rem") {
+                u(this).nodes[0].parentElement.innerHTML = tr("friends_rem_msg");
+            }
+        }
+    })
 }); //END ONREADY DECLS

 async function repostPost(id, hash) {
--- a/Web/static/js/package-lock.json
+++ b/Web/static/js/package-lock.json
@ -120,22 +120,23 @@
      "integrity": "sha512-6jd9wdoiPdCbwsNi1Xrn/oMdGz22dKPeCoZ/cCGKqjnh+UYkBKb5W3spW+WNqRSxGvVtfUEEg6TXotRK/FPDaw=="
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
      "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
+      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
      "dependencies": {
-        "@babel/types": "^7.22.5",
+        "@babel/types": "^7.23.5",
        "@jridgewell/gen-mapping": "^0.3.2",
        "@jridgewell/trace-mapping": "^0.3.17",
        "jsesc": "^2.5.1"
@ -145,20 +146,20 @@
      }
    },
    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
      "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
      },
      "engines": {
        "node": ">=6.9.0"
@ -187,28 +188,28 @@
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
        "js-tokens": "^4.0.0"
      },
      "engines": {
@ -216,9 +217,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
      "bin": {
        "parser": "bin/babel-parser.js"
      },
@ -238,31 +239,31 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
      "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
+      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
      "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
        "@babel/helper-hoist-variables": "^7.22.5",
        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
+        "@babel/parser": "^7.23.5",
+        "@babel/types": "^7.23.5",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
      },
@ -271,12 +272,12 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
+      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
      "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
        "to-fast-properties": "^2.0.0"
      },
      "engines": {
@ -297,9 +298,9 @@
      }
    },
    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
      "engines": {
        "node": ">=6.0.0"
      }
@ -318,19 +319,14 @@
      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
    },
    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
    "node_modules/@popperjs/core": {
      "version": "2.11.6",
      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
--- a/install/automated/common/openvk.template.yml
+++ b/install/automated/common/openvk.template.yml
@ -63,7 +63,6 @@ openvk:
            caption: "Ad caption"
            link: "https://example.org/product.aspx?id=10&from=ovk"
        bellsAndWhistles:
-            fartscroll: false
            testLabel: false
        defaultMobileTheme: ""

--- a/install/automated/docker/openvk.example.yml
+++ b/install/automated/docker/openvk.example.yml
@ -101,7 +101,6 @@ openvk:
            caption: "Ad caption"
            link: "https://example.org/product.aspx?id=10&from=ovk"
        bellsAndWhistles:
-            fartscroll: false
            testLabel: false
        defaultMobileTheme: ""
        defaultFeaturePhoneTheme: ""
--- a/install/automated/kubernetes/manifests/001-configmap.yaml
+++ b/install/automated/kubernetes/manifests/001-configmap.yaml
@ -97,7 +97,6 @@ data:
              caption: "Ad caption"
              link: "https://example.org/product.aspx?id=10&from=ovk"
          bellsAndWhistles:
-              fartscroll: false
              testLabel: false
          defaultMobileTheme: ""
      
--- a/install/sqls/00046-deny-request.sql
+++ b/install/sqls/00046-deny-request.sql
@ -0,0 +1 @@
+ALTER TABLE `subscriptions` ADD `flags` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `target`
--- a/locales/by.strings
+++ b/locales/by.strings
@ -131,6 +131,7 @@
 "friends_delete" = "Выдаліць з сяброў";
 "friends_reject" = "Адмяніць заяўку";
 "friends_accept" = "Прыняць заяўку";
+"friends_leave_in_flw" = "Пакінуть у падпісчыках";
 "send_message" = "Адправіць паведамленне";
 "incoming_req" = "Падпісанты";
 "outcoming_req" = "Заяўкі";
--- a/locales/en.strings
+++ b/locales/en.strings
@ -259,6 +259,10 @@
 "friends_delete" = "Remove from friends";
 "friends_reject" = "Reject request";
 "friends_accept" = "Accept request";
+"friends_leave_in_flw" = "Leave in followers";
+"friends_add_msg" = "Now you're friends.";
+"friends_rej_msg" = "You left this user as subscriber.";
+"friends_rem_msg" = "You deleted this user from your friend list.";
 "send_message" = "Send a message";
 "incoming_req" = "Pending";
 "outcoming_req" = "Outgoing";
--- a/locales/ru.strings
+++ b/locales/ru.strings
@ -239,6 +239,10 @@
 "friends_delete" = "Удалить из друзей";
 "friends_reject" = "Отменить заявку";
 "friends_accept" = "Принять заявку";
+"friends_leave_in_flw" = "Оставить в подписчиках";
+"friends_add_msg" = "Теперь вы друзья.";
+"friends_rej_msg" = "Вы оставили пользователя в подписчиках.";
+"friends_rem_msg" = "Вы удалили пользователя из списка своих друзей.";
 "send_message" = "Отправить сообщение";
 "incoming_req" = "Входящие";
 "outcoming_req" = "Исходящие";
--- a/locales/uk.strings
+++ b/locales/uk.strings
@ -213,6 +213,7 @@
 "friends_delete" = "Видалити з друзів";
 "friends_reject" = "Скасувати заявку";
 "friends_accept" = "Прийняти заявку";
+"friends_leave_in_flw" = "Залишити у підписниках";
 "send_message" = "Відправити повідомлення";
 "incoming_req" = "Підписники";
 "outcoming_req" = "Вихідні";
--- a/openvk-example.yml
+++ b/openvk-example.yml
@ -101,7 +101,6 @@ openvk:
            caption: "Ad caption"
            link: "https://example.org/product.aspx?id=10&from=ovk"
        bellsAndWhistles:
-            fartscroll: false
            testLabel: false
        defaultMobileTheme: ""
        defaultFeaturePhoneTheme: ""
Author	SHA1	Message	Date
dependabot[bot]	ee3a587805	Merge `498df20f2e` into `bbef3a8518`	2024-09-23 06:16:28 +03:00
veselcraft	bbef3a8518	feat(friends): delete leftovers	2024-09-18 22:07:17 +03:00
veselcraft	c5644a51d6	feat(friends): add ajax	2024-09-18 01:02:56 +03:00
veselcraft	4c78617a9c	feat(friends)!: reject request	2024-09-16 02:11:28 +03:00
Alexander Minkin	89157a832b	fix: remove fartscroll	2024-09-07 18:29:44 +03:00
dependabot[bot]	498df20f2e	Bump @babel/traverse from 7.22.8 to 7.23.5 in /Web/static/js Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.8 to 7.23.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-30 14:40:25 +00:00
				`@ -0,0 +1 @@`
				ALTER TABLE `subscriptions` ADD `flags` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `target`