From 2af8447a0f562d704b37e50f2b235f0579164e1a Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:16:55 +0300 Subject: [PATCH 1/6] feat(rss): new fields --- Web/Models/Entities/Post.php | 54 ++++++++++++++++++++++++++++++------ bootstrap.php | 5 ++++ locales/en.strings | 7 +++++ locales/ru.strings | 6 ++++ 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/Web/Models/Entities/Post.php b/Web/Models/Entities/Post.php index dacced18..0b210fb0 100644 --- a/Web/Models/Entities/Post.php +++ b/Web/Models/Entities/Post.php @@ -383,34 +383,70 @@ class Post extends Postable { $domain = ovk_scheme(true).$_SERVER["HTTP_HOST"]; $description = $this->getText(false); + $title = str_replace("\n", "", ovk_proc_strtr($description, 79)); $description_html = $description; $url = $domain."/wall".$this->getPrettyId(); + if($this->isUpdateAvatarMessage()) + $title = tr('upd_in_general'); + if($this->isDeactivationMessage()) + $title = tr('post_deact_in_general'); + $author = $this->getOwner(); - $author_name = htmlspecialchars($author->getCanonicalName(), ENT_DISALLOWED | ENT_XHTML); + $target_wall = $this->getWallOwner(); + $author_name = escape_html($author->getCanonicalName()); if($this->isExplicit()) - $description_html .= "
".tr('contains_nsfw').".
"; + $title = 'NSFW: ' . $title; foreach($this->getChildren() as $child) { if($child instanceof Photo) { $child_page = $domain.$child->getPageURL(); - $child_url = $child->getURLBySizeId('large'); - $description_html .= "
"; + $child_url = $child->getURL(); + $description_html .= "

"; } elseif($child instanceof Video) { $child_page = $domain.'/video'.$child->getPrettyId(); - $description_html .= "
Video"; + + if($child->getType() != 1) { + $description_html .= "". + "
". + "
". + "".escape_html($child->getName())."
"; + } else { + $description_html .= "". + "
". + "getVideoDriver()->getURL()."\">".escape_html($child->getName())."
"; + } } elseif($child instanceof Audio) { - $description_html .= "
Audio"; + if(!$child->isWithdrawn()) { + $description_html .= "
" + ."".escape_html($child->getName()).":" + ."
" + ."" + ."
"; + } + } elseif($child instanceof Poll) { + $description_html .= "
".tr('poll').": ".escape_html($child->getTitle()); + } elseif($child instanceof Note) { + $description_html .= "
".tr('note').": ".escape_html($child->getName()); } } $description_html .= "
".tr('author').": " . $author_name . ""; - if($this->hasSource()) { - $description_html .= "
".tr('source').": ".htmlspecialchars($this->getSource(), ENT_DISALLOWED | ENT_XHTML); + + if($target_wall->getRealId() != $author->getRealId()) + $description_html .= "
".tr('on_wall').": " . escape_html($target_wall->getCanonicalName()) . ""; + + if($this->isSigned()) { + $signer = $this->getOwner(false); + $description_html .= "
".tr('sign_short').": " . escape_html($signer->getCanonicalName()) . ""; } + if($this->hasSource()) + $description_html .= "
".tr('source').": ".escape_html($this->getSource()); + $item = new \Bhaktaraz\RSSGenerator\Item(); - $item->title(str_replace("\n", "", ovk_proc_strtr($description, 79))) + $item->title($title) ->url($url) ->guid($url) ->creator($author_name) diff --git a/bootstrap.php b/bootstrap.php index f4d8958e..e964af81 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -366,6 +366,11 @@ function check_copyright_link(string $link = ''): bool return true; } +function escape_html(string $unsafe): string +{ + return htmlspecialchars($unsafe, ENT_DISALLOWED | ENT_XHTML); +} + return (function() { _ovk_check_environment(); require __DIR__ . "/vendor/autoload.php"; diff --git a/locales/en.strings b/locales/en.strings index 527323da..0056c076 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -2236,3 +2236,10 @@ "roll_back" = "rollback"; "roll_backed" = "rollbacked"; + +/* RSS */ + +"post_deact_in_general" = "Page deletion"; +"upd_in_general" = "Avatar update"; +"on_wall" = "On wall"; +"sign_short" = "Sign"; diff --git a/locales/ru.strings b/locales/ru.strings index 4385b6cd..cd1c4ddf 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -2127,3 +2127,9 @@ "roll_back" = "откатить"; "roll_backed" = "откачено"; +/* RSS */ + +"post_deact_in_general" = "Удаление страницы"; +"upd_in_general" = "Обновление фотографии страницы"; +"on_wall" = "На стене"; +"sign_short" = "Подпись"; From 74e998add4314a5d18c0b3e437e4c313cf955539 Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:20:21 +0300 Subject: [PATCH 2/6] fix(wall): attempt to fix invisible post betwee... ...n page 1 and 2 with pinned post on wall --- Web/Models/Repositories/Posts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php index da1f9c8d..f5fef282 100644 --- a/Web/Models/Repositories/Posts.php +++ b/Web/Models/Repositories/Posts.php @@ -53,9 +53,9 @@ class Posts $offset--; } } - } /*else if(!is_null($offset)) { + } else if(!is_null($offset) && $pinPost) { $offset--; - }*/ + } $sel = $this->posts->where([ "wall" => $user, From 4dd90888595e55d4c2377fd9bde721d7c0753be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jillian=20=C3=96sterreich?= Date: Sun, 24 Nov 2024 11:39:05 +0700 Subject: [PATCH 3/6] fix(theme-midnight): "Show more" and "Feed settings" --- themepacks/midnight/res/xmas.css | 4 +-- themepacks/midnight/stylesheet.css | 40 ++++++++++++++++-------------- themepacks/midnight/theme.yml | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/themepacks/midnight/res/xmas.css b/themepacks/midnight/res/xmas.css index 5033703b..e63e8365 100644 --- a/themepacks/midnight/res/xmas.css +++ b/themepacks/midnight/res/xmas.css @@ -1,7 +1,7 @@ .page_header { - background-image: url('/themepack/midnight/0.0.3.1/resource/xheader.png') !important; + background-image: url('/themepack/midnight/0.0.3.2/resource/xheader.png') !important; } .page_custom_header { - background-image: url('/themepack/midnight/0.0.3.1/resource/xheader_custom.png') !important; + background-image: url('/themepack/midnight/0.0.3.2/resource/xheader_custom.png') !important; } diff --git a/themepacks/midnight/stylesheet.css b/themepacks/midnight/stylesheet.css index 1c3b3079..7d4a1623 100644 --- a/themepacks/midnight/stylesheet.css +++ b/themepacks/midnight/stylesheet.css @@ -135,7 +135,8 @@ th, .ovk-photo-view, .page_wrap_content_main .def_row_content, .topGrayBlock, -.bigPlayer { +.bigPlayer, +input[type="number"] { border-color: #2c2640 !important; } @@ -187,10 +188,8 @@ hr { .ovk-diag-action, .minilink .counter, .topGrayBlock, -.showMore, -.showMoreAudiosPlaylist, -#showMorePhotos, -#showMoreVideos { +#show_more, +.information { background-color: #2c2640 !important; } @@ -232,7 +231,8 @@ a, .paginator a:hover, .post-share-button:hover, .post-like-button:hover, -#search_box_button:active { +#search_box_button:active, +.mb_tab:hover { background-color: #272138 !important; } @@ -288,7 +288,8 @@ td.e, tr.e, .playlistListView:hover, .playlistListView .playlistCover, -.photosInsert > div { +.photosInsert > div, +.attachment_selector #attachment_insert #attachment_insert_count { background-color: #231e33 !important; } @@ -317,11 +318,11 @@ tr.v, } .content_title_expanded { - background-image: url("/themepack/midnight/0.0.3.1/resource/flex_arrow_open.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/flex_arrow_open.png") !important; } .content_title_unexpanded { - background-image: url("/themepack/midnight/0.0.3.1/resource/flex_arrow_shut.gif") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/flex_arrow_shut.gif") !important; } .ovk-video>.preview, @@ -348,17 +349,17 @@ tr.h { .page_yellowheader { color: #c6d2e8; - background-image: url("/themepack/midnight/0.0.3.1/resource/header_purple.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/header_purple.png") !important; background-color: #231f34; border-color: #231f34; } .page_header { - background-image: url("/themepack/midnight/0.0.3.1/resource/header.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/header.png") !important; } .page_custom_header { - background-image: url("/themepack/midnight/0.0.3.1/resource/header_custom.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/header_custom.png") !important; } .page_yellowheader span, @@ -390,17 +391,18 @@ input[type~="phone"], input[type="search"], input[type~="search"], input[type~="date"], +input[type="number"], select, .crp-entry--message.unread { background-color: #181826 !important; } input[type="checkbox"] { - background-image: url("/themepack/midnight/0.0.3.1/resource/checkbox.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/checkbox.png") !important; } input[type="radio"] { - background-image: url("/themepack/midnight/0.0.3.1/resource/radio.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/radio.png") !important; } .header_navigation .link, .header_navigation .header_divider_stick { @@ -408,20 +410,20 @@ input[type="radio"] { } .heart { - background-image: url("/themepack/midnight/0.0.3.1/resource/like.gif") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/like.gif") !important; } .pinned-mark, .post-author .pin { - background-image: url("/themepack/midnight/0.0.3.1/resource/pin.png") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/pin.png") !important; } .repost-icon { - background-image: url("/themepack/midnight/0.0.3.1/resource/published.gif") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/published.gif") !important; } .post-author .delete { - background-image: url("/themepack/midnight/0.0.3.1/resource/input_clear.gif") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/input_clear.gif") !important; } .user-alert { @@ -454,7 +456,7 @@ input[type="radio"] { } #backdropEditor { - background-image: url("/themepack/midnight/0.0.3.1/resource/backdrop-editor.gif") !important; + background-image: url("/themepack/midnight/0.0.3.2/resource/backdrop-editor.gif") !important; border-color: #473e66 !important; } diff --git a/themepacks/midnight/theme.yml b/themepacks/midnight/theme.yml index 1f5b81d1..bb08a02d 100644 --- a/themepacks/midnight/theme.yml +++ b/themepacks/midnight/theme.yml @@ -1,5 +1,5 @@ id: midnight -version: "0.0.3.1" +version: "0.0.3.2" openvk_version: 0 enabled: 1 metadata: From 2d0c329a2a2864c9b0c116a82a4e4582e46a6091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jillian=20=C3=96sterreich?= Date: Sun, 24 Nov 2024 12:05:49 +0700 Subject: [PATCH 4/6] fix(theme-midnight): "Liked by" tippy box --- themepacks/midnight/res/xmas.css | 4 ++-- themepacks/midnight/stylesheet.css | 36 ++++++++++++++++++------------ themepacks/midnight/theme.yml | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/themepacks/midnight/res/xmas.css b/themepacks/midnight/res/xmas.css index e63e8365..7ead875c 100644 --- a/themepacks/midnight/res/xmas.css +++ b/themepacks/midnight/res/xmas.css @@ -1,7 +1,7 @@ .page_header { - background-image: url('/themepack/midnight/0.0.3.2/resource/xheader.png') !important; + background-image: url('/themepack/midnight/0.0.3.3/resource/xheader.png') !important; } .page_custom_header { - background-image: url('/themepack/midnight/0.0.3.2/resource/xheader_custom.png') !important; + background-image: url('/themepack/midnight/0.0.3.3/resource/xheader_custom.png') !important; } diff --git a/themepacks/midnight/stylesheet.css b/themepacks/midnight/stylesheet.css index 7d4a1623..6c9861fc 100644 --- a/themepacks/midnight/stylesheet.css +++ b/themepacks/midnight/stylesheet.css @@ -136,10 +136,17 @@ th, .page_wrap_content_main .def_row_content, .topGrayBlock, .bigPlayer, -input[type="number"] { +input[type="number"], +.like_tooltip_wrapper .like_tooltip_body, +.like_tooltip_wrapper .like_tooltip_head { border-color: #2c2640 !important; } +.like_tooltip_wrapper .like_tooltip_head { + background: linear-gradient(180deg, #383052, #231e33) !important; + box-shadow: unset !important; +} + .post-upload, .post-has-poll, .post-has-note { @@ -308,7 +315,8 @@ tr.v, .expand_button, #userContent blockquote, .tippy-box[data-theme~="vk"], -.searchOptions { +.searchOptions, +.like_tooltip_wrapper .like_tooltip_body { background-color: #1e1a2b !important; } @@ -318,11 +326,11 @@ tr.v, } .content_title_expanded { - background-image: url("/themepack/midnight/0.0.3.2/resource/flex_arrow_open.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/flex_arrow_open.png") !important; } .content_title_unexpanded { - background-image: url("/themepack/midnight/0.0.3.2/resource/flex_arrow_shut.gif") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/flex_arrow_shut.gif") !important; } .ovk-video>.preview, @@ -349,17 +357,17 @@ tr.h { .page_yellowheader { color: #c6d2e8; - background-image: url("/themepack/midnight/0.0.3.2/resource/header_purple.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/header_purple.png") !important; background-color: #231f34; border-color: #231f34; } .page_header { - background-image: url("/themepack/midnight/0.0.3.2/resource/header.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/header.png") !important; } .page_custom_header { - background-image: url("/themepack/midnight/0.0.3.2/resource/header_custom.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/header_custom.png") !important; } .page_yellowheader span, @@ -398,11 +406,11 @@ select, } input[type="checkbox"] { - background-image: url("/themepack/midnight/0.0.3.2/resource/checkbox.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/checkbox.png") !important; } input[type="radio"] { - background-image: url("/themepack/midnight/0.0.3.2/resource/radio.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/radio.png") !important; } .header_navigation .link, .header_navigation .header_divider_stick { @@ -410,20 +418,20 @@ input[type="radio"] { } .heart { - background-image: url("/themepack/midnight/0.0.3.2/resource/like.gif") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/like.gif") !important; } .pinned-mark, .post-author .pin { - background-image: url("/themepack/midnight/0.0.3.2/resource/pin.png") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/pin.png") !important; } .repost-icon { - background-image: url("/themepack/midnight/0.0.3.2/resource/published.gif") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/published.gif") !important; } .post-author .delete { - background-image: url("/themepack/midnight/0.0.3.2/resource/input_clear.gif") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/input_clear.gif") !important; } .user-alert { @@ -456,7 +464,7 @@ input[type="radio"] { } #backdropEditor { - background-image: url("/themepack/midnight/0.0.3.2/resource/backdrop-editor.gif") !important; + background-image: url("/themepack/midnight/0.0.3.3/resource/backdrop-editor.gif") !important; border-color: #473e66 !important; } diff --git a/themepacks/midnight/theme.yml b/themepacks/midnight/theme.yml index bb08a02d..541012c7 100644 --- a/themepacks/midnight/theme.yml +++ b/themepacks/midnight/theme.yml @@ -1,5 +1,5 @@ id: midnight -version: "0.0.3.2" +version: "0.0.3.3" openvk_version: 0 enabled: 1 metadata: From 6007a815463491a9a6f05aae2a881a4d45d1e666 Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:49:02 +0300 Subject: [PATCH 5/6] fix(likes tooltip): fix width --- Web/static/css/main.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Web/static/css/main.css b/Web/static/css/main.css index c9a5cf7f..bbb92e39 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -3784,12 +3784,16 @@ hr { overflow-x: hidden; } +.like_tooltip_wrapper { + box-shadow: 0px 2px 6px -5px rgba(0, 0, 0, 0.8); +} + .like_tooltip_wrapper .like_tooltip_head { background: linear-gradient(180deg, #595959, #515151); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.18) inset; border: solid 1px #575757; padding: 4px 10px; - width: 200px; + width: 180px; display: flex; justify-content: space-between; align-items: center; From e4a79a8ffb0b4bc14a375d2d2358595e01e2028b Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:29:33 +0300 Subject: [PATCH 6/6] feat(privacy): add ability to hide your like --- Web/Models/Entities/Post.php | 2 +- Web/Models/Entities/Postable.php | 10 ++++++++-- Web/Models/Entities/User.php | 7 +++++++ Web/Presenters/UserPresenter.php | 1 + Web/Presenters/templates/User/Settings.xml | 11 +++++++++++ Web/static/js/al_wall.js | 2 +- locales/en.strings | 1 + locales/ru.strings | 1 + 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/Web/Models/Entities/Post.php b/Web/Models/Entities/Post.php index 0b210fb0..30c6eac3 100644 --- a/Web/Models/Entities/Post.php +++ b/Web/Models/Entities/Post.php @@ -301,7 +301,7 @@ class Post extends Postable { $liked = parent::toggleLike($user); - if($this->getOwner(false)->getId() !== $user->getId() && !($this->getOwner() instanceof Club) && !$this instanceof Comment) + if(!$user->isPrivateLikes() && $this->getOwner(false)->getId() !== $user->getId() && !($this->getOwner() instanceof Club) && !$this instanceof Comment) (new LikeNotification($this->getOwner(false), $this, $user))->emit(); foreach($this->getChildren() as $attachment) diff --git a/Web/Models/Entities/Postable.php b/Web/Models/Entities/Postable.php index 55e1adf7..fc6cb8ca 100644 --- a/Web/Models/Entities/Postable.php +++ b/Web/Models/Entities/Postable.php @@ -97,8 +97,14 @@ abstract class Postable extends Attachable "target" => $this->getRecord()->id, ])->page($page, $perPage); - foreach($sel as $like) - yield (new Users)->get($like->origin); + foreach($sel as $like) { + $user = (new Users)->get($like->origin); + if($user->isPrivateLikes() && OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"]) { + $user = (new Users)->get((int) OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["account"]); + } + + yield $user; + } } function isAnonymous(): bool diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 1e17dd82..a0574f3d 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -498,6 +498,7 @@ class User extends RowModel "wall.write", "messages.write", "audios.read", + "likes.read", ], ])->get($id); } @@ -1062,6 +1063,7 @@ class User extends RowModel "wall.write", "messages.write", "audios.read", + "likes.read", ], ])->set($id, $status)->toInteger()); } @@ -1338,6 +1340,11 @@ class User extends RowModel return $this->getId(); } + function isPrivateLikes(): bool + { + return $this->getPrivacySetting("likes.read") == User::PRIVACY_NO_ONE; + } + function toVkApiStruct(?User $user = NULL, string $fields = ''): object { $res = (object) []; diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index b64823fb..4c6bb0dd 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -503,6 +503,7 @@ final class UserPresenter extends OpenVKPresenter "wall.write", "messages.write", "audios.read", + "likes.read", ]; foreach($settings as $setting) { $input = $this->postParam(str_replace(".", "_", $setting)); diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml index d34993e8..244c52c4 100644 --- a/Web/Presenters/templates/User/Settings.xml +++ b/Web/Presenters/templates/User/Settings.xml @@ -395,6 +395,17 @@ + + + {_privacy_setting_see_likes} + + + + + {_profile_type} diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js index 5a6e40f3..1a93898e 100644 --- a/Web/static/js/al_wall.js +++ b/Web/static/js/al_wall.js @@ -886,7 +886,7 @@ async function __uploadToTextarea(file, textareaNode) { if(filetype == 'photo') { const temp_url = URL.createObjectURL(file) const rand = random_int(0, 1000) - textareaNode.find('.post-horizontal').append(``) + textareaNode.find('.post-horizontal').append(``) const res = await fetch(`/photos/upload`, { method: 'POST', diff --git a/locales/en.strings b/locales/en.strings index 0056c076..5789074f 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -698,6 +698,7 @@ "privacy_setting_write_wall" = "Who can publish posts on my wall"; "privacy_setting_write_messages" = "Who can write messages to me"; "privacy_setting_view_audio" = "Who can see my audios"; +"privacy_setting_see_likes" = "Who can see my likes"; "privacy_value_anybody" = "Anybody"; "privacy_value_anybody_dative" = "Anybody"; "privacy_value_users" = "OpenVK users"; diff --git a/locales/ru.strings b/locales/ru.strings index cd1c4ddf..c06e7cde 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -671,6 +671,7 @@ "privacy_setting_write_wall" = "Кто может писать у меня на стене"; "privacy_setting_write_messages" = "Кто может писать мне сообщения"; "privacy_setting_view_audio" = "Кому видно мои аудиозаписи"; +"privacy_setting_see_likes" = "Кому видны мои лайки"; "privacy_value_anybody" = "Все желающие"; "privacy_value_anybody_dative" = "Всем желающим"; "privacy_value_users" = "Пользователям OpenVK";