Merge branch 'master' into post_source

VKAPI/Handlers/Video.php

@@ -74,7 +74,7 @@ final class Video extends VKAPIRequestHandler
         $return_items = [];
         $profiles = [];
         $groups = [];
-        foreach($items as $item) {
+        foreach($items as $item)
             $return_item = $item->getApiStructure($this->getUser());
             $return_item = $return_item->video;
             $return_items[] = $return_item;
@@ -85,7 +85,6 @@ final class Video extends VKAPIRequestHandler
                 else
                     $groups[] = abs($return_item['owner_id']);
             }
-        }
 
         if($extended) {
             $profiles = array_unique($profiles);

VKAPI/Handlers/Wall.php

@@ -102,14 +102,7 @@ final class Wall extends VKAPIRequestHandler
                 } else if ($attachment instanceof \openvk\Web\Models\Entities\Video) {
                     $attachments[] = $attachment->getApiStructure($this->getUser());
                 } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
-                    if(VKAPI_DECL_VER === '4.100') {
                     $attachments[] = $attachment->toVkApiStruct();
-                    } else {
-                        $attachments[] = [
-                            'type' => 'note',
-                            'note' => $attachment->toVkApiStruct()
-                        ];
-                    }
                 } else if ($attachment instanceof \openvk\Web\Models\Entities\Audio) {
                     $attachments[] = [
                         "type" => "audio",
@@ -183,6 +176,12 @@ final class Wall extends VKAPIRequestHandler
                     "count"    => $post->getCommentsCount(),
                     "can_post" => 1
                 ],
+                "copyright" => !is_null($post->getSource(false))  ? (object)[
+                    "id"   => 0,
+                    "link" => $post->getSource(false),
+                    "name" => "none",
+                    "type" => "link"
+                ] : NULL,
                 "likes" => (object)[
                     "count"       => $post->getLikesCount(),
                     "user_likes"  => (int) $post->hasLikeFrom($this->getUser()),
@@ -195,9 +194,6 @@ final class Wall extends VKAPIRequestHandler
                 ]
             ];
 
-            if($post->hasSource())
-                $post_temp_obj->copyright = $post->getVkApiCopyright();
-
             if($signerId) 
                 $post_temp_obj->signer_id = $signerId;
 
@@ -301,14 +297,7 @@ final class Wall extends VKAPIRequestHandler
                     } else if ($attachment instanceof \openvk\Web\Models\Entities\Video) {
                         $attachments[] = $attachment->getApiStructure($this->getUser());
                     } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
-                        if(VKAPI_DECL_VER === '4.100') {
                         $attachments[] = $attachment->toVkApiStruct();
-                        } else {
-                            $attachments[] = [
-                                'type' => 'note',
-                                'note' => $attachment->toVkApiStruct()
-                            ];
-                        }
                     } else if ($attachment instanceof \openvk\Web\Models\Entities\Audio) {
                         $attachments[] = [
                             "type" => "audio",
@@ -378,6 +367,12 @@ final class Wall extends VKAPIRequestHandler
                         "count"    => $post->getCommentsCount(),
                         "can_post" => 1
                     ],
+                    "copyright" => !is_null($post->getSource(false))  ? (object)[
+                        "id"   => 0,
+                        "link" => $post->getSource(false),
+                        "name" => "none",
+                        "type" => "link"
+                    ] : NULL,
                     "likes" => (object)[
                         "count"       => $post->getLikesCount(),
                         "user_likes"  => (int) $post->hasLikeFrom($user),
@@ -390,9 +385,6 @@ final class Wall extends VKAPIRequestHandler
                     ]
                 ];
 
-                if($post->hasSource())
-                    $post_temp_obj->copyright = $post->getVkApiCopyright();
-
                 if($signerId) 
                     $post_temp_obj->signer_id = $signerId;
 
@@ -473,7 +465,7 @@ final class Wall extends VKAPIRequestHandler
             ];
     }
 
-    function post(string $owner_id, string $message = "", int $from_group = 0, int $signed = 0, string $attachments = "", int $post_id = 0): object
+    function post(string $owner_id, string $message = "", int $from_group = 0, int $signed = 0, string $attachments = "", int $post_id = 0, string $copyright = NULL): object
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -563,10 +555,8 @@ final class Wall extends VKAPIRequestHandler
             $post->setFlags($flags);
             $post->setApi_Source_Name($this->getPlatform());
 
-            if(!is_null($copyright) && !empty($copyright)) {
-                try {
+            if(!is_null($copyright) && !empty($copyright) && $copyright != "" && preg_match("/^(http:\/\/|https:\/\/)*[а-яА-ЯёЁa-z0-9\-_]+(\.[а-яА-ЯёЁa-z0-9\-_]+)+(\/\S*)*$/iu", $copyright) && iconv_strlen($copyright) < 50) {
                 $post->setSource($copyright);
-                } catch(\Throwable) {}
             }
           
             if($owner_id < 0 && !$wallOwner->canBeModifiedBy($this->getUser()) && $wallOwner->getWallType() == 2)
@@ -584,11 +574,11 @@ final class Wall extends VKAPIRequestHandler
             # Пример: photo1_1
 
             if(sizeof($attachmentsArr) > 10)
-                $this->fail(50, "Too many attachments");
+                $this->fail(50, "Error: too many attachments");
 
             preg_match_all("/poll/m", $attachments, $matches, PREG_SET_ORDER, 0);
             if(sizeof($matches) > 1)
-                $this->fail(85, "Too many polls");
+                $this->fail(85, "Error: too many polls");
             
             foreach($attachmentsArr as $attac) {
                 $attachmentType = NULL;
@@ -1019,7 +1009,7 @@ final class Wall extends VKAPIRequestHandler
         }
     }
     
-    function edit(int $owner_id, int $post_id, string $message = "", string $attachments = "", string $copyright = NULL) {
+    function edit(int $owner_id, int $post_id, string $message = "", string $attachments = "") {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
@@ -1028,6 +1018,9 @@ final class Wall extends VKAPIRequestHandler
         if(!$post || $post->isDeleted())
             $this->fail(102, "Invalid post");
 
+        if(empty($message) && empty($attachments))
+            $this->fail(100, "Required parameter 'message' missing.");
+
         if(!$post->canBeEditedBy($this->getUser()))
             $this->fail(7, "Access to editing denied");
 
@@ -1035,12 +1028,6 @@ final class Wall extends VKAPIRequestHandler
             $post->setContent($message);
         
         $post->setEdited(time());
-        if(!is_null($copyright) && !empty($copyright)) {
-            try {
-                $post->setSource($copyright);
-            } catch(\Throwable) {}
-        }
-
         $post->save(true);
 
         # todo добавить такое в веб версию
@@ -1111,61 +1098,52 @@ final class Wall extends VKAPIRequestHandler
         return 1;
     }
 
-    function checkCopyrightLink(string $link): int
-    {
-        $this->requireUser();
+    function checkCopyrightLink(string $link) {
+        $res = (int)(!is_null($link) && !empty($link) && preg_match("/^(http:\/\/|https:\/\/)*[а-яА-ЯёЁa-z0-9\-_]+(\.[а-яА-ЯёЁa-z0-9\-_]+)+(\/\S*)*$/iu", $link) && iconv_strlen($link) < 50);
         
-        try {
-            $result = check_copyright_link($link); 
-        } catch(\InvalidArgumentException $e) {
-            $this->fail(3102, "Specified link is incorrect (can't find source)");
-        } catch(\LengthException $e) {
-            $this->fail(3103, "Specified link is incorrect (too long)");
-        } catch(\LogicException $e) {
-            $this->fail(3104, "Link is suspicious");
-        } catch(\Throwable $e) {
+        if($res == 0) {
             $this->fail(3102, "Specified link is incorrect");
         }
 
-        return 1;
+        return $res;
     }
 
-    function pin(int $owner_id, int $post_id) 
-    {
+    function pin(int $owner_id, int $post_id) {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
         $post = (new PostsRepo)->getPostById($owner_id, $post_id);
         if(!$post || $post->isDeleted())
-            $this->fail(100, "One of the parameters specified was missing or invalid: post_id is undefined");
+            $this->fail(361, "Invalid post");
 
         if(!$post->canBePinnedBy($this->getUser()))
-            return 0;
-        
-        if($post->isPinned())
-            return 1;
+            $this->fail(14, "Access to pinning post denied");
         
+        if(!$post->isPinned()) {
             $post->pin();
             return 1;
+        } else {
+            $this->fail(50, "Post is already pinned");
+        }
     }
 
-    function unpin(int $owner_id, int $post_id) 
-    {
+    function unpin(int $owner_id, int $post_id) {
         $this->requireUser();
         $this->willExecuteWriteAction();
         
         $post = (new PostsRepo)->getPostById($owner_id, $post_id);
         if(!$post || $post->isDeleted())
-            $this->fail(100, "One of the parameters specified was missing or invalid: post_id is undefined");
+            $this->fail(361, "Invalid post");
 
         if(!$post->canBePinnedBy($this->getUser()))
-            return 0;
-        
-        if(!$post->isPinned())
-            return 1;
+            $this->fail(14, "Access to unpinning post denied");
         
+        if($post->isPinned()) {
             $post->unpin();
             return 1;
+        } else {
+            $this->fail(50, "Post is not pinned");
+        }
     }
 
     private function getApiPhoto($attachment) {

Web/Models/Entities/Post.php

@@ -79,38 +79,29 @@ class Post extends Postable
         return (bool) $this->getRecord()->pinned;
     }
 
-    function hasSource(): bool
-    {
-        return $this->getRecord()->source != NULL;
-    }
-
     function getSource(bool $format = false)
     {
-        $orig_source = $this->getRecord()->source;
-        if(!str_contains($orig_source, "https://") && !str_contains($orig_source, "http://"))
-            $orig_source = "https://" . $orig_source;
+        if(!$format) {
+            return $this->getRecord()->source;
+        }
 
-        if(!$format)
-            return $orig_source;
-        
-        return $this->formatLinks($orig_source);
+        return $this->formatLinks($this->getRecord()->source);
     }
 
     function setSource(string $source)
     {
-        $result = check_copyright_link($source);
+        $src = $source;
 
-        $this->stateChanges("source", $source);
-    }
+        if(iconv_strlen($source) > 50) 
+            throw new \LengthException("Link is too long.");
         
-    function getVkApiCopyright(): object
-    {
-        return (object)[
-            'id'   => 0,
-            'link' => $this->getSource(false),
-            'name' => $this->getSource(false),
-            'type' => 'link',
-        ];
+        if(!preg_match("/^(http:\/\/|https:\/\/)*[а-яА-ЯёЁa-z0-9\-_]+(\.[а-яА-ЯёЁa-z0-9\-_]+)+(\/\S*)*$/iu", $source))
+            throw new \LogicException("Invalid link");
+
+        if(!str_contains($source, "https://") && !str_contains($source, "http://"))
+            $src = "https://" . $source;
+
+        $this->stateChanges("source", $src);
     }
     
     function isAd(): bool

Web/Models/Entities/Traits/TRichText.php

@@ -38,20 +38,9 @@ trait TRichText
                 $href = str_replace("#", "#", $matches[1]);
                 $href = rawurlencode(str_replace(";", "&#59;", $href));
                 $link = str_replace("#", "#", $matches[3]);
-                # this string breaks ampersands
                 $link = str_replace(";", "&#59;", $link);
                 $rel  = $this->isAd() ? "sponsored" : "ugc";
                 
-                $server_domain = str_replace(':' . $_SERVER['SERVER_PORT'], '', $_SERVER['HTTP_HOST']);
-                if(str_contains($link, $server_domain)) {
-                    $replaced_link = str_replace(':' . $_SERVER['SERVER_PORT'], '', $link);
-                    $replaced_link = str_replace($server_domain, '', $replaced_link);
-                    
-                    return "<a href='$replaced_link' rel='$rel'>$link</a>" . htmlentities($matches[4]);
-                }
-
-                $link = htmlentities(urldecode($link));
-                
                 return "<a href='/away.php?to=$href' rel='$rel' target='_blank'>$link</a>" . htmlentities($matches[4]);
             }),
             $text

Web/Presenters/SearchPresenter.php

@@ -124,6 +124,6 @@ final class SearchPresenter extends OpenVKPresenter
             'pageCount' => ceil($count / $this->template->perPage),
         ];
         $this->template->extendedPaginatorConf = clone $this->template->paginatorConf;
-        $this->template->extendedPaginatorConf->space = 11;
+        $this->template->extendedPaginatorConf->space = 12;
     }
 }

Web/Presenters/WallPresenter.php

@@ -367,10 +367,8 @@ final class WallPresenter extends OpenVKPresenter
             $post->setFlags($flags);
             $post->setNsfw($this->postParam("nsfw") === "on");
 
-            if(!empty($this->postParam("source")) && $this->postParam("source") != 'none') {
-                try {
+            if($this->postParam("set_source") === "on" && !is_null($this->postParam("source")) && !empty($this->postParam("source")) && preg_match("/^(http:\/\/|https:\/\/)*[а-яА-ЯёЁa-z0-9\-_]+(\.[а-яА-ЯёЁa-z0-9\-_]+)+(\/\S*)*$/iu", $this->postParam("source")) && iconv_strlen($this->postParam("set_source")) < 50) {
                 $post->setSource($this->postParam("source"));
-                } catch(\Throwable) {}
             }
 
             if($wall < 0 && !$wallOwner->canBeModifiedBy($this->user->identity) && $wallOwner->getWallType() == 2)

Web/Presenters/templates/Audio/tabs.xml

@@ -17,7 +17,7 @@
                 
                 <a n:if="!$isMy" n:attr="id => $mode === 'list' ? 'used' : 'ki'" href="/audios{$ownerId}">{if $ownerId > 0}{_music_user}{else}{_music_club}{/if}</a>
                 <a href="/player/upload?gid={abs($ownerId)}" n:if="isset($thisUser) && isset($club) && $club->canUploadAudio($thisUser)">{_upload_audio}</a>
-                <a n:attr="id => $mode === 'playlists' && $ownerId != $thisUser->getId() ? 'used' : 'ki'" class='noOverflow' href="/playlists{$ownerId}"  n:if="isset($thisUser) && isset($ownerId) && !$isMy">{if $ownerId > 0}{_playlists_user}{else}{_playlists_club}{/if}</a>
+                <a n:attr="id => $mode === 'playlists' && $ownerId != $thisUser->getId() ? 'used' : 'ki'" href="/playlists{$ownerId}"  n:if="isset($thisUser) && isset($ownerId) && !$isMy">{if $ownerId > 0}{_playlists_user}{else}{_playlists_club}{/if}</a>
                 <a href="/audios/newPlaylist{if $isMyClub}?gid={abs($ownerId)}{/if}" n:if="isset($thisUser) && $isMyClub">{_new_playlist}</a>
             {/if}
         </div>

Web/Presenters/templates/Search/Index.xml

@@ -32,13 +32,13 @@
                     <div n:class='page_wrap_content_main, $section == "audios" && $count > 0 ? audios_padding'>
                         {if $count > 0}
                             {if $section === 'users'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='search_content def_row_content' n:foreach="$data as $dat">
                                     <table>
                                         <tbody>
                                             <tr>
                                                 <td valign="top">
                                                     <a href="{$dat->getURL()}">
-                                                        <img src="{$dat->getAvatarUrl('tiny')}" width="75" alt="{_photo}" loading='lazy' />
+                                                        <img src="{$dat->getAvatarUrl('miniscule')}" width="75" alt="{_photo}" loading='lazy' />
                                                     </a>
                                                 </td>
                                                 <td valign="top" style="width: 100%">
@@ -128,13 +128,13 @@
                                     highlightText({$query}, '.page_wrap_content_main', ['text'])
                                 </script>
                             {elseif $section === 'groups'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='search_content def_row_content' n:foreach="$data as $dat">
                                     <table>
                                         <tbody>
                                             <tr>
                                                 <td valign="top">
                                                     <a href="{$dat->getURL()}">
-                                                        <img src="{$dat->getAvatarUrl('tiny')}" width="75" alt="{_photo}" loading='lazy' />
+                                                        <img src="{$dat->getAvatarUrl('miniscule')}" width="75" alt="{_photo}" loading='lazy' />
                                                     </a>
                                                 </td>
                                                 <td valign="top" style="width: 100%">
@@ -183,7 +183,7 @@
                                     highlightText({$query}, '.page_wrap_content_main', ['text', "td[data-highlight='_clubDesc']"])
                                 </script>
                             {elseif $section === 'apps'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='search_content def_row_content' n:foreach="$data as $dat">
                                     <table>
                                         <tbody>
                                             <tr>

Web/Presenters/templates/Wall/Wall.xml

@@ -28,7 +28,7 @@
             </div>
 
             <div n:if="$canPost && $type == 'all'" class="content_subtitle">
-                {include "../components/textArea.xml", route => "/wall$owner/makePost", hasSource => true}
+                {include "../components/textArea.xml", route => "/wall$owner/makePost"}
             </div>
             
             <div class="content">

Web/Presenters/templates/components/comment.xml

@@ -1,11 +1,9 @@
 {var $author = $comment->getOwner()}
 {var $Club  = openvk\Web\Models\Entities\Club::class}
-{var $likesCount = $comment->getLikesCount()}
-{var $target = $comment->getTarget()}
-{var $postId = $target instanceof \openvk\Web\Models\Entities\Post ? $target->getId() : NULL}
+{var $postId = $comment->getTarget() instanceof \openvk\Web\Models\Entities\Post ? $comment->getTarget()->getId() : NULL}
 
 <a name="cid={$comment->getId()}"></a>
-<table border="0" style="font-size: 11px;" class="post comment" id="_comment{$comment->getId()}" data-comment-id="{$comment->getId()}" data-owner-id="{$author->getId()}" data-from-group="{$author instanceof $Club}" n:attr="data-post-id => $postId">
+<table border="0" style="font-size: 11px;" class="post comment" id="_comment{$comment->getId()}" data-comment-id="{$comment->getId()}" data-owner-id="{$author->getId()}" data-from-group="{$comment->getOwner() instanceof $Club}" n:attr="data-post-id => $postId">
     <tbody>
         <tr>
             <td width="30" valign="top">
@@ -42,8 +40,8 @@
                             <span n:if="$comment->getEditTime()" class="edited editedMark">({_edited_short})</span>
                         </a>
                         {if !$timeOnly}
+                            &nbsp;|
                             {if $comment->canBeDeletedBy($thisUser)}
-                                |
                                 <a href="/comment{$comment->getId()}/delete">{_delete}</a>
                             {/if}
                             {if $comment->canBeEditedBy($thisUser)}
@@ -62,7 +60,7 @@
                             <div style="float: right; font-size: .7rem;">
                                 <a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
                                     <div class="heart" style="{if $comment->hasLikeFrom($thisUser)}opacity: 1;{else}opacity: 0.4;{/if}"></div>
-                                    <span class="likeCnt">{if $likesCount > 0}{$likesCount}{/if}</span>
+                                    <span class="likeCnt">{if $comment->getLikesCount() > 0}{$comment->getLikesCount()}{/if}</span>
                                 </a>
                             </div>
                         {/if}

Web/Presenters/templates/components/post/microblogpost.xml

@@ -3,11 +3,6 @@
 {var $commentsCount = $post->getCommentsCount()}
 {var $platform = $post->getPlatform()}
 {var $platformDetails = $post->getPlatformDetails()}
-{var $likesCount = $post->getLikesCount()}
-{var $repostsCount = $post->getRepostCount()}
-{var $canBePinned = $post->canBePinnedBy($thisUser ?? NULL)}
-{var $canBeDeleted = $post->canBeDeletedBy($thisUser)}
-{var $wallOwner = $post->getWallOwner()}
 {if $post->isDeactivationMessage() && $post->getText()}
     {var $deac = "post_deact"}
 {else}
@@ -35,6 +30,7 @@
                     {$post->isUpdateAvatarMessage() && !$post->isPostedOnBehalfOfGroup() ? ($author->isFemale() ? tr("upd_f") : ($author->isNeutral() ? tr("upd_n") : tr("upd_m")))}
                     {$post->isUpdateAvatarMessage() && $post->isPostedOnBehalfOfGroup() ? tr("upd_g") : ""}
                     {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
+                        {var $wallOwner = $post->getWallOwner()}
                         <a href="{$wallOwner->getURL()}" class="mention" data-mention-ref="{$post->getTargetWall()}">
                             <b>
                                 {if isset($thisUser) && $thisUser->getId() === $post->getTargetWall()}
@@ -57,9 +53,9 @@
 
                     <span n:if="$post->isPinned()" class="nobold">{_pinned}</span>
 
-                    <a n:if="$canBeDeleted && !($forceNoDeleteLink ?? false) && $compact == false" class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
+                    <a n:if="$post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && $compact == false" class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
                     
-                    {if $canBePinned && !($forceNoPinLink ?? false) && $compact == false}
+                    {if $post->canBePinnedBy($thisUser) && !($forceNoPinLink ?? false) && $compact == false}
                         {if $post->isPinned()}
                             <a class="pin" href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}"></a>
                         {else}
@@ -71,7 +67,7 @@
                         <a class="edit" id="editPost" 
                                         data-id="{$post->getId()}" 
                                         data-nsfw="{(int)$post->isExplicit()}"
-                                        {if $post->getTargetWall() < 0 && $wallOwner->canBeModifiedBy($thisUser)}data-fromgroup="{(int)$post->isPostedOnBehalfOfGroup()}"{/if}></a>
+                                        {if $post->getTargetWall() < 0 && $post->getWallOwner()->canBeModifiedBy($thisUser)}data-fromgroup="{(int)$post->isPostedOnBehalfOfGroup()}"{/if}></a>
                     {/if}
                 </div>
                 <div class="post-content" id="{$post->getPrettyId()}">
@@ -99,7 +95,7 @@
                         <br/>
                         &nbsp;! {_post_is_ad}
                     </div>
-                    <div n:if="$post->hasSource()" class="sourceDiv">
+                    <div n:if="!is_null($post->getSource())" class="sourceDiv">
                         <span>{_source}: {$post->getSource(true)|noescape}</span>
                     </div>
                     <div n:if="$post->isSigned()" class="post-signature">
@@ -128,14 +124,14 @@
                         <div class="like_wrap">
                             <a n:if="!($forceNoShareLink ?? false)" id="reposts{$post->getPrettyId()}" class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
                                 <div class="repost-icon" style="opacity: 0.4;"></div>
-                                <span class="likeCnt" id="repostsCount{$post->getPrettyId()}">{if $repostsCount > 0}{$repostsCount}{/if}</span>
+                                <span class="likeCnt" id="repostsCount{$post->getPrettyId()}">{if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}</span>
                             </a>
 
                             {if !($forceNoLike ?? false)}
                                 {var $liked = $post->hasLikeFrom($thisUser)}
-                                <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$likesCount}">
+                                <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$post->getLikesCount()}">
                                     <div class="heart" id="{if $liked}liked{/if}"></div>
-                                    <span class="likeCnt">{if $likesCount > 0}{$likesCount}{/if}</span>
+                                    <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
                                 </a>
                             {/if}
                         </div>
@@ -152,7 +148,7 @@
                         {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
                     </div>
                 </div>
-                <div n:if="$suggestion && $canBePinned" class="suggestionControls">
+                <div n:if="$suggestion && $post->canBePinnedBy($thisUser ?? NULL)" class="suggestionControls">
                     <input type="button" class="button" id="publish_post" data-id="{$post->getId()}" value="{_publish_suggested}">
                     <input type="button" class="button" id="decline_post" data-id="{$post->getId()}" value="{_decline_suggested}">
                 </div>

Web/Presenters/templates/components/post/oldpost.xml

@@ -1,12 +1,6 @@
 {var $author = $post->getOwner()}
 {var $platform = $post->getPlatform()}
 {var $platformDetails = $post->getPlatformDetails()}
-{var $wallOwner = $post->getWallOwner()}
-{var $likesCount = $post->getLikesCount()}
-{var $repostsCount = $post->getRepostCount()}
-{var $commentsCount = $post->getCommentsCount()}
-{var $canBePinned = $post->canBePinnedBy($thisUser ?? NULL)}
-{var $canBeDeleted = $post->canBeDeletedBy($thisUser)}
 {if $post->isDeactivationMessage() && $post->getText()}
     {var $deac = "post_deact"}
 {else}
@@ -46,6 +40,7 @@
                         {/if}
                     {/if}
                     {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
+                        {var $wallOwner = $post->getWallOwner()}
                         <a href="{$wallOwner->getURL()}" class="mention" data-mention-ref="{$post->getTargetWall()}">
                             <b>
                                 {if isset($thisUser) && $thisUser->getId() === $post->getTargetWall()}
@@ -90,7 +85,7 @@
                             </div>
                         </div>
                     </div>
-                    <div n:if="$suggestion && $canBePinned" class="suggestionControls" style="margin-bottom: 7px;">
+                    <div n:if="$suggestion && $post->canBePinnedBy($thisUser ?? NULL)" class="suggestionControls" style="margin-bottom: 7px;">
                         <input type="button" class="button" id="publish_post" data-id="{$post->getId()}" value="{_publish_suggested}">
                         <input type="button" class="button" id="decline_post" data-id="{$post->getId()}" value="{_decline_suggested}">
                     </div>
@@ -98,7 +93,7 @@
                         <br/>
                         &nbsp;! {_post_is_ad}
                     </div>
-                    <div n:if="$post->hasSource()" class="sourceDiv">
+                    <div n:if="!is_null($post->getSource())" class="sourceDiv" style="margin-top:0px;">
                         <span>{_source}: {$post->getSource(true)|noescape}</span>
                     </div>
                     <div n:if="$post->isSigned()" class="post-signature">
@@ -121,14 +116,14 @@
                         <a id="editPost" 
                            data-id="{$post->getId()}"
                            data-nsfw="{(int)$post->isExplicit()}"
-                           {if $post->getTargetWall() < 0 && $wallOwner->canBeModifiedBy($thisUser)}data-fromgroup="{(int)$post->isPostedOnBehalfOfGroup()}"{/if}>{_edit}</a> &nbsp;|&nbsp;
+                           {if $post->getTargetWall() < 0 && $post->getWallOwner()->canBeModifiedBy($thisUser)}data-fromgroup="{(int)$post->isPostedOnBehalfOfGroup()}"{/if}>{_edit}</a> &nbsp;|&nbsp;
                     {/if}
 
-                    {if !($forceNoDeleteLink ?? false) && $canBeDeleted}
+                    {if !($forceNoDeleteLink ?? false) && $post->canBeDeletedBy($thisUser)}
                         <a href="/wall{$post->getPrettyId()}/delete">{_delete}</a> &nbsp;|&nbsp;
                     {/if}
                     
-                    {if !($forceNoPinLink ?? false) && $canBePinned}
+                    {if !($forceNoPinLink ?? false) && $post->canBePinnedBy($thisUser)}
                         {if $post->isPinned()}
                             <a href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}">{_unpin}</a>
                         {else}
@@ -139,8 +134,8 @@
                     
                     <a n:if="!($forceNoCommentsLink ?? false)" href="/wall{$post->getPrettyId()}#comments">
                         {_comments}
-                        {if $commentsCount > 0}
-                            (<b>{$commentsCount}</b>)
+                        {if $post->getCommentsCount() > 0}
+                            (<b>{$post->getCommentsCount()}</b>)
                         {/if}
                     </a>
 
@@ -150,22 +145,22 @@
                     
                     <a n:if="!($forceNoShareLink ?? false)" id="reposts{$post->getPrettyId()}" class="post-share-button" {ifset $thisUser} href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')"{/ifset}>
                         {_share}
-                        {if $repostsCount > 0}
-                            (<b id="repostsCount{$post->getPrettyId()}">{$repostsCount}</b>)
+                        {if $post->getRepostCount() > 0}
+                            (<b id="repostsCount{$post->getPrettyId()}">{$post->getRepostCount()}</b>)
                         {/if}
                     </a>
 
                     <div n:if="!($forceNoLike ?? false)" class="like_wrap">
                         {ifset $thisUser}
                             {var $liked = $post->hasLikeFrom($thisUser)}
-                            <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$likesCount}">
+                            <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$post->getLikesCount()}">
                                 <div class="heart" id="{if $liked}liked{/if}"></div>
-                                <span class="likeCnt">{if $likesCount > 0}{$likesCount}{/if}</span>
+                                <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
                             </a>
                         {else}
-                            <a n:if="$likesCount > 0" class="post-like-button">
+                            <a n:if="$post->getLikesCount() > 0" class="post-like-button">
                                 <div class="heart"></div>
-                                <span class="likeCnt">{$likesCount}</span>
+                                <span class="likeCnt">{$post->getLikesCount()}</span>
                             </a>
                         {/ifset}
                     </div>

Web/Presenters/templates/components/textArea.xml

@@ -18,14 +18,23 @@
             <div class="post-has-poll">
                 {_poll}
             </div>
-            <div class="post-has-note"></div>
+            <div class="post-has-note">
                 
+            </div>
             <div class="post-has-videos"></div>
             <div class="post-has-audios"></div>
-            <div class="post-source"></div>
 
             <div n:if="$postOpts ?? true" class="post-opts">
                 {var $anonEnabled = OPENVK_ROOT_CONF['openvk']['preferences']['wall']['anonymousPosting']['enable']}
+                {if $hasSource}
+                    <label style="user-select:none;">
+                        <input type="checkbox" name="set_source"/> <span style="color: #777777;">{_set_source}</span>
+                    </label>
+
+                    <div id="sourceSet" style="display:none;">
+                        <input type="text" name="source" placeholder="https://youtu.be/dQw4w9WgXcQ/"/>
+                    </div>
+                {/if}
 
                 {if !is_null($thisUser) && !is_null($club ?? NULL) && $owner < 0}
                     {if $club->canBeModifiedBy($thisUser)}
@@ -67,7 +76,6 @@
             <input type="hidden" name="audios" value="" />
             <input type="hidden" name="poll" value="none" />
             <input type="hidden" id="note" name="note" value="none" />
-            <input type="hidden" id="source" name="source" value="none" />
             <input type="hidden" name="type" value="1" />
             <input type="hidden" name="hash" value="{$csrfToken}" />
             <br/>
@@ -93,6 +101,10 @@
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/mimetypes/audio-ac3.png" />
                         {_audio}
                     </a>
+                    <a n:if="$notes ?? false" href="javascript:attachNote({$textAreaId})">
+                        <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/mimetypes/application-x-srt.png" />
+                        {_note}
+                    </a>
                     <a n:if="$graffiti ?? false" href="javascript:initGraffiti({$textAreaId});">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/actions/draw-brush.png" />
                         {_graffiti}
@@ -101,10 +113,6 @@
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/actions/office-chart-bar-stacked.png" />
                         {_poll}
                     </a>
-                    <a n:if="$hasSource ?? false" id='__sourceAttacher'>
-                        <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/actions/insert-link.png" />
-                        {_source}
-                    </a>
                 </div>
             </div>
         </div>

Web/Presenters/templates/components/video.xml

@@ -3,12 +3,12 @@
 <tbody>
     <tr>
         <td valign="top">
-            <a href="/video{$video->getPrettyId()}" data-id="{$video->getId()}">
             <div class="video-preview">
+                <a href="/video{$video->getPrettyId()}" {$videoModal ? "id='videoOpen'" : ''} data-id="{$video->getId()}">
                     <img src="{$video->getThumbnailURL()}"
                     style="max-width: 170px; max-height: 127px; margin: auto;" >
-                </div>
                 </a>
+            </div>
         </td>
         <td valign="top" style="width: 100%">
             {ifset infotable}

Web/Util/Makima/Makima.php

@@ -70,7 +70,7 @@ class Makima
                     $result->colSizes = [1];
                     $result->rowSizes = [1, 1];
                     $result->width    = ceil($maxWidth);
-                    $result->height   = $computedHeight * 2;
+                    $result->height   = $computedHeight;
                     $result->tiles    = [new ThumbTile(1, 1, $maxWidth, $computedHeight), new ThumbTile(1, 1, $maxWidth, $computedHeight)];
                 } else if(
                     $orients == [Makima::ORIENT_WIDE, Makima::ORIENT_WIDE]

Web/static/css/audios.css

@@ -9,7 +9,7 @@
 }
 
 .musicIcon {
-    background-image: url('/assets/packages/static/openvk/img/audios_controls.png?v=2');
+    background-image: url('/assets/packages/static/openvk/img/audios_controls.png');
     background-repeat: no-repeat;
     cursor: pointer;
 }
@@ -185,7 +185,6 @@
     width: 81%;
     height: 13px;
     display: inline-block;
-    line-height: 14px;
 }
 
 .bigPlayer .paddingLayer .trackInfo .timer span {
@@ -346,7 +345,6 @@
 .audioEntry .status .mediaInfo {
     cursor: pointer;
     display: flex;
-    line-height: 14px;
     width: 100%;
 }
 
@@ -551,7 +549,6 @@
 
 .playlistListView .playlistInfo .playlistName {
     font-weight: 600;
-    line-height: 12px;
 }
 
 .playlistListView .playlistInfo .playlistMeta, .playlistListView .playlistInfo .playlistMeta span {

Web/static/css/avatar-edit.css

@@ -44,7 +44,7 @@
 ._add_image::before {
     margin-top: 2px;
     content: ' ';
-    background: url('/assets/packages/static/openvk/img/upload.png?v=2');
+    background: url('/assets/packages/static/openvk/img/upload.png');
     width: 10px;
     height: 10px;
     display: inline-block;
@@ -65,7 +65,7 @@
 
 .avatarDelete::before {
     content: ' ';
-    background: url('/assets/packages/static/openvk/img/upload.png?v=2');
+    background: url('/assets/packages/static/openvk/img/upload.png');
     background-position: -10px 2px;
     background-repeat: no-repeat;
     width: 12px;

Web/static/css/main.css

@@ -1454,24 +1454,6 @@ body.scrolled .toTop:hover {
     color: #3c3c3c;
 }
 
-.post-source #remove_source_button {
-    display: inline-block;
-    background-repeat: no-repeat;
-    background: url('/assets/packages/static/openvk/img/arrows.png?v=2');
-
-    margin-bottom: -2px;
-    background-position: -18px 0px;
-    height: 11px;
-    width: 11px;
-    opacity: 0.6;
-    transition-duration: 0.3s;
-    cursor: pointer;
-}
-
-.post-source #remove_source_button:hover {
-    opacity: 0.8;
-}
-
 .post-upload::before, .post-has-poll::before, .post-has-note::before {
     content: " ";
     width: 8px;
@@ -3037,24 +3019,14 @@ body.article .floating_sidebar, body.article .page_content {
     font-size: 12px;
 }
 
-.post .sourceDiv {
+.sourceDiv {
     margin-top: 3px;
     margin-left: 4px;
 }
 
-.post .sourceDiv span {
-    color: grey;
-    font-size: 10px;
-}
-
-.post .sourceDiv a:hover {
-    text-decoration: underline;
-}
-
-#source_flex_kunteynir {
-    display: flex;
-    flex-direction: column;
-    gap: 22px;
+.sourceDiv span {
+    color:grey;
+    font-size: 11px;
 }
 
 .sugglist {

Web/static/js/al_navigation.js

@@ -66,16 +66,16 @@ u(`#search_box input[type='search']`).on('input', async (e) => {
 
     switch(section) {
         case 'users':
-            results = await fetch(`/method/users.search?auth_mechanism=roaming&q=${encodeURIComponent(query)}&count=10&sort=4&fields=photo_50,status,nickname`)
+            results = await fetch(`/method/users.search?auth_mechanism=roaming&q=${query}&count=10&sort=4&fields=photo_50,status,nickname`)
             break
         case 'groups':
-            results = await fetch(`/method/groups.search?auth_mechanism=roaming&q=${encodeURIComponent(query)}&count=10&sort=4&fields=photo_50,description`)
+            results = await fetch(`/method/groups.search?auth_mechanism=roaming&q=${query}&count=10&sort=4&fields=photo_50,description`)
             break
         case 'videos':
-            results = await fetch(`/method/video.search?auth_mechanism=roaming&q=${encodeURIComponent(query)}&count=10&sort=4&extended=1`)
+            results = await fetch(`/method/video.search?auth_mechanism=roaming&q=${query}&count=10&sort=4&extended=1`)
             break
         case 'audios_playlists':
-            results = await fetch(`/method/audio.searchAlbums?auth_mechanism=roaming&query=${encodeURIComponent(query)}&limit=10`)
+            results = await fetch(`/method/audio.searchAlbums?auth_mechanism=roaming&query=${query}&limit=10`)
             break
     }
 

Web/static/js/al_wall.js

@@ -525,6 +525,21 @@ async function showArticle(note_id) {
     u("body").addClass("article");
 }
 
+if(document.querySelector("input[name='set_source']") != null) {
+    document.querySelector("input[name='set_source']").checked = false
+}
+
+$(document).on("change", "input[name='set_source']", (e) => {
+    if(e.currentTarget.checked) {
+        document.getElementById("sourceSet").style.display = "block"
+        e.currentTarget.parentNode.querySelector("span").innerHTML = tr("source") + ":"
+    } else {
+        document.getElementById("sourceSet").style.display = "none"
+        e.currentTarget.parentNode.querySelector("span").innerHTML = tr("set_source")
+      
+    }
+})
+
 // Оконный плеер
 
 $(document).on("click", "#videoOpen", async (e) => {
@@ -1145,7 +1160,7 @@ $(document).on("click", "#editPost", (e) => {
                     }
 
                     post.querySelector(".post-avatar").setAttribute("src", result.author.avatar)
-                    post.querySelector(".post-author-name").innerHTML = result.author.name.escapeHtml()
+                    post.querySelector(".post-author-name").innerHTML = result.author.name
                     post.querySelector(".really_text").setAttribute("data-text", result.new_text)
                 } else {
                     MessageBox(tr("error"), result.error, [tr("ok")], [Function.noop])
@@ -1626,7 +1641,7 @@ $(document).on("click", ".avatarDelete", (e) => {
                     
                     u("body").removeClass("dimmed");
                     document.querySelector("html").style.overflowY = "scroll"
-                    u(".ovk-diag-cont").remove()
+                    u(".ovk-diag-cont").remove();
 
                     document.querySelector("#bigAvatar").src = response.url
                     document.querySelector("#bigAvatar").parentNode.href = response.new_photo ? ("/photo" + response.new_photo) : "javascript:void(0)"
@@ -1643,77 +1658,3 @@ $(document).on("click", ".avatarDelete", (e) => {
         }),
     ]);
 })
-
-u(document).on('click', '#__sourceAttacher', (e) => {
-    MessageBox(tr('add_source'), `
-        <div id='source_flex_kunteynir'>
-            <span>${tr('set_source_tip')}</span>
-            <!-- давай, копируй ссылку и переходи по ней -->
-            <input type='text' maxlength='400' placeholder='https://www.youtube.com/watch?v=lkWuk_nzzVA'>
-        </div>
-    `, [tr('cancel')], [
-        () => {Function.noop}
-    ])
-
-    __removeDialog = () => {
-        u("body").removeClass("dimmed");
-        document.querySelector("html").style.overflowY = "scroll"
-        u(".ovk-diag-cont").remove()
-    }
-
-    u('.ovk-diag-action').append(`
-        <button class='button' id='__setsrcbutton'>${tr('set_source')}</button>
-    `)
-
-    u('.ovk-diag-action #__setsrcbutton').on('click', async (ev) => {
-        // Consts
-        const _u_target        = u(e.target)
-        const nearest_textarea = _u_target.closest('#write')
-        const source_output    = nearest_textarea.find(`input[name='source']`)
-        const source_input     = u(`#source_flex_kunteynir input[type='text']`)
-        const source_value     = source_input.nodes[0].value ?? ''
-        if(source_value.length < 1) {
-            return
-        }
-
-        ev.target.classList.add('lagged')
-
-        // Checking link
-        const __checkCopyrightLinkRes = await fetch(`/method/wall.checkCopyrightLink?auth_mechanism=roaming&link=${encodeURIComponent(source_value)}`)
-        const checkCopyrightLink = await __checkCopyrightLinkRes.json()
-        
-        // todo переписать блять мессенджбоксы чтоб они классами были
-        if(checkCopyrightLink.error_code) {
-            __removeDialog()
-            switch(checkCopyrightLink.error_code) {
-                default:
-                case 3102:
-                    fastError(tr('error_adding_source_regex'))
-                    return
-                case 3103:
-                    fastError(tr('error_adding_source_long'))
-                    return
-                case 3104:
-                    fastError(tr('error_adding_source_sus'))
-                    return
-            }
-        }
-
-        // Making indicator
-        __removeDialog()
-        source_output.attr('value', source_value)
-        nearest_textarea.find('.post-source').html(`
-            <span>${tr('source')}: <a target='_blank' href='${source_value.escapeHtml()}'>${ovk_proc_strtr(source_value.escapeHtml(), 50)}</a></span>
-            <div id='remove_source_button'></div>
-        `)
-
-        nearest_textarea.find('.post-source #remove_source_button').on('click', () => {
-            nearest_textarea.find('.post-source').html('')
-            source_output.attr('value', 'none')
-        })
-    })
-
-    u('.ovk-diag-body').attr('style', `padding:8px;`)
-    u('.ovk-diag-cont').attr('style', 'width: 325px;')
-    u('#source_flex_kunteynir input').nodes[0].focus()
-})

bootstrap.php

@@ -286,31 +286,6 @@ function ovk_scheme(bool $with_slashes = false): string
     return $scheme;
 }
 
-function check_copyright_link(string $link = ''): bool
-{
-    if(!str_contains($link, "https://") && !str_contains($link, "http://"))
-        $link = "https://" . $link;
-    
-    # Existability
-    if(is_null($link) || empty($link))
-        throw new \InvalidArgumentException("Empty link");
-
-    # Length
-    if(iconv_strlen($link) < 2 || iconv_strlen($link) > 400)
-        throw new \LengthException("Link is too long");
-
-    # Match URL regex
-    # stolen from http://urlregex.com/
-    if (!preg_match("%^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@|\d{1,3}(?:\.\d{1,3}){3}|(?:(?:[a-z\d\x{00a1}-\x{ffff}]+-?)*[a-z\d\x{00a1}-\x{ffff}]+|xn--[a-z\d-]+)(?:\.(?:[a-z\d\x{00a1}-\x{ffff}]+-?)*[a-z\d\x{00a1}-\x{ffff}]+)*(?:\.(?:xn--[a-z\d-]+|[a-z\x{00a1}-\x{ffff}]{2,6})))(?::\d+)?(?:[^\s]*)?$%iu", $link))
-        throw new \InvalidArgumentException("Invalid link format");
-
-    $banEntries = (new openvk\Web\Models\Repositories\BannedLinks)->check($link);
-    if(sizeof($banEntries) > 0)
-        throw new \LogicException("Suspicious link");
-
-    return true;
-}
-
 return (function() {
     _ovk_check_environment();
     require __DIR__ . "/vendor/autoload.php";

locales/en.strings

@@ -223,12 +223,8 @@
 "attachment" = "Attachment";
 "post_as_group" = "Post as group";
 "comment_as_group" = "Comment as group";
-
-"add_source" = "Add source";
-"set_source" = "Apply source";
+"set_source" = "Set source";
 "source" = "Source";
-"set_source_tip" = "If you are using content from other authors, it is important to provide a source to the original. You can do this below.";
-
 "add_signature" = "Add signature";
 /* ^ can be translated as "author's signature". ^ */
 "contains_nsfw" = "Contains NSFW content";
@@ -840,7 +836,6 @@
 
 /* Audios */
 
-"my" = "My";
 "audios" = "Audios";
 "audio" = "Audio";
 "playlist" = "Playlist";
@@ -1560,10 +1555,6 @@
 "ffmpeg_not_installed" = "Failed to proccess the file. It looks like ffmpeg is not installed on this server.";
 "too_many_or_to_lack" = "Too few or too many sources.";
 
-"error_adding_source_regex" = "Error adding source: incorrect link.";
-"error_adding_source_long" = "Error adding source: link is too long.";
-"error_adding_source_sus" = "Error adding source: suspicious link.";
-
 /* Admin actions */
 
 "login_as" = "Login as $1";
@@ -2004,7 +1995,6 @@
 
 /* Search */
 
-"s_params" = "Search params";
 "s_people" = "Users";
 "s_groups" = "Clubs";
 "s_apps" = "Applications";

locales/ru.strings

@@ -207,12 +207,8 @@
 "attachment" = "Вложение";
 "post_as_group" = "От имени сообщества";
 "comment_as_group" = "От имени сообщества";
-
-"add_source" = "Добавление источника";
 "set_source" = "Указать источник";
 "source" = "Источник";
-"set_source_tip" = "Если вы используете материалы других авторов, важно указывать ссылку на оригинал. Это вы можете сделать ниже.";
-
 "add_signature" = "Подпись автора";
 "contains_nsfw" = "Содержит NSFW-контент";
 "nsfw_warning" = "Данный пост может содержать 18+ контент";
@@ -797,7 +793,6 @@
 
 /* Audios */
 
-"my" = "Моё";
 "audios" = "Аудиозаписи";
 "audio" = "Аудиозапись";
 "playlist" = "Плейлист";
@@ -877,7 +872,7 @@
 "remove_from_playlist" = "Удалить из плейлиста";
 "delete_playlist" = "Удалить плейлист";
 "playlist_cover" = "Обложка плейлиста";
-"playlists_user" = "Плейлисты пользователя";
+"playlists_user" = "Плейлисты польз.";
 "playlists_club" = "Плейлисты группы";
 "change_cover" = "Сменить обложку";
 "playlist_cover" = "Обложка плейлиста";
@@ -1462,10 +1457,6 @@
 "ffmpeg_not_installed" = "Не удалось обработать файл. Похоже, на сервере не установлен ffmpeg.";
 "too_many_or_to_lack" = "Слишком мало либо слишком много источников.";
 
-"error_adding_source_regex" = "Ошибка добавления источника: некорректная ссылка.";
-"error_adding_source_long" = "Ошибка добавления источника: слишком длинная ссылка.";
-"error_adding_source_sus" = "Ошибка добавления источника: подозрительная ссылка.";
-
 /* Admin actions */
 
 "login_as" = "Войти как $1";
@@ -1894,7 +1885,6 @@
 
 /* Search */
 
-"s_params" = "Параметры поиска";
 "s_people" = "Пользователи";
 "s_groups" = "Группы";
 "s_apps" = "Приложения";