diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index 1d03a1c2..3b42608c 100644 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -7,7 +7,7 @@ use Chandler\Security\Authenticator; use Latte\Engine as TemplatingEngine; use openvk\Web\Models\Entities\IP; use openvk\Web\Themes\Themepacks; -use openvk\Web\Models\Repositories\{IPs, Users, APITokens, Tickets, Reports, CurrentUser}; +use openvk\Web\Models\Repositories\{IPs, Users, APITokens, Tickets, Reports, CurrentUser, Posts}; use WhichBrowser; abstract class OpenVKPresenter extends SimplePresenter @@ -207,6 +207,16 @@ abstract class OpenVKPresenter extends SimplePresenter $userValidated = 0; $cacheTime = OPENVK_ROOT_CONF["openvk"]["preferences"]["nginxCacheTime"] ?? 0; + if(OPENVK_ROOT_CONF['openvk']['preferences']['news']['show']) { + $post = (new Posts)->getPostsFromUsersWall(-OPENVK_ROOT_CONF['openvk']['preferences']['news']['groupId'], 1, 1); + $post = iterator_to_array($post)[0]; + $text = wordwrap($post->getText(false), 150, '\n', false); + $text = explode('\n', $text)[0]; + + $this->template->newsText = $text; + $this->template->newsLink = '/wall' . $post->getPrettyId(); + } + if(!is_null($user)) { $this->user = (object) []; $this->user->raw = $user; diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index e95579e3..5ec579a8 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -240,12 +240,12 @@ -
+
{_news} -
- {php echo OPENVK_ROOT_CONF['openvk']['preferences']['news']['title'];} -

- {_news_more} » +
+ {$newsText}... +

+ {_news_more}
diff --git a/Web/static/css/main.css b/Web/static/css/main.css index 31b049e9..24fd9625 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -2314,8 +2314,7 @@ li { user-select: none; } -#news b -{ +#news b { color: #8A0000; font-size: 12px; } diff --git a/locales/en.strings b/locales/en.strings index 37bef931..a04cc2f5 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -1059,11 +1059,12 @@ "time_today" = "today"; "time_yesterday" = "yesterday"; +"news" = "News"; +"news_more" = "More »"; "points" = "Votes"; "points_count" = "votes"; "on_your_account" = "on your account"; "top_up_your_account" = "Get more"; -"news_more" = "More"; "you_still_have_x_points" = "You have $1 unused votes."; "vouchers" = "Vouchers"; diff --git a/locales/ru.strings b/locales/ru.strings index 9b351358..47ce8e0b 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -1010,12 +1010,14 @@ "time_minutes_ago" = "$1 минут назад"; "time_today" = "сегодня"; "time_yesterday" = "вчера"; + +"news" = "Новости"; +"news_more" = "Подробнее »"; "points" = "Голоса"; "points_count" = "голосов"; "on_your_account" = "на вашем счету"; "top_up_your_account" = "Пополнить баланс"; "you_still_have_x_points" = "У Вас $1 неиспользованных голосов."; -"news_more" = "Подробнее"; "vouchers" = "Ваучеры"; "have_voucher" = "Есть ваучер"; "voucher_token" = "Код ваучера"; diff --git a/openvk-example.yml b/openvk-example.yml index 5254b3d6..d0880bf4 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -112,6 +112,9 @@ openvk: defaultMobileTheme: "" defaultFeaturePhoneTheme: "" logs: true + news: + show: false + groupId: 1 telemetry: plausible: