Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-12-23 00:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Lanmikeman:895e26823b548dabb8034f7b712aa3704814155e
Branches Tags
Lanmikeman:master
Lanmikeman:sort-by-subs
Lanmikeman:revert-1125-patch-7
Lanmikeman:sbtlocalization
Lanmikeman:lrc-format
Lanmikeman:fix-amd64-builds
Lanmikeman:ignored-sources
Lanmikeman:reject-request
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/node-fetch-and-react-and-react-dom--removed
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/babel/traverse-7.23.5
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/ua-parser-js-0.7.37
Lanmikeman:better-videos
Lanmikeman:posts-edit
Lanmikeman:likes-reposts-counters
Lanmikeman:ajax-navigation
Lanmikeman:logs-del-content
Lanmikeman:logs
Lanmikeman:service-account-notifies
Lanmikeman:banned-links-fixed
Lanmikeman:geotag
Lanmikeman:tickets-from-support-agents
Lanmikeman:notes-images-proxy
Lanmikeman:geodb
Lanmikeman:cfg-editor
Lanmikeman:translation
Lanmikeman:support-templates
Lanmikeman:faq-in-helpdesk
Lanmikeman:anon-comments
Lanmikeman:tretdm-patch-1
Lanmikeman:links
Lanmikeman:tanathon30
Lanmikeman:other-gender-options
Lanmikeman:polls
Lanmikeman:post-closure
Lanmikeman:REL_PP-4
Lanmikeman:seo
Lanmikeman:celestora-patch-2
Lanmikeman:celestora-patch-1
Lanmikeman:similartovk
Lanmikeman:fediverse
Lanmikeman:REL_PP-3
Lanmikeman:wikipages
Lanmikeman:group-contacts-archived
Lanmikeman:REL_PP-1
Lanmikeman:REL_PP-0
Lanmikeman:public_preview_4
Lanmikeman:public_preview_3
Lanmikeman:public_preview_2
Lanmikeman:public_preview_1
...
compare: Lanmikeman:62c8732868449d58b56f174f45f504c42dac34e6
Branches Tags
Lanmikeman:sort-by-subs
Lanmikeman:master
Lanmikeman:revert-1125-patch-7
Lanmikeman:sbtlocalization
Lanmikeman:lrc-format
Lanmikeman:fix-amd64-builds
Lanmikeman:ignored-sources
Lanmikeman:reject-request
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/node-fetch-and-react-and-react-dom--removed
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/babel/traverse-7.23.5
Lanmikeman:dependabot/npm_and_yarn/Web/static/js/ua-parser-js-0.7.37
Lanmikeman:better-videos
Lanmikeman:posts-edit
Lanmikeman:likes-reposts-counters
Lanmikeman:ajax-navigation
Lanmikeman:logs-del-content
Lanmikeman:logs
Lanmikeman:service-account-notifies
Lanmikeman:banned-links-fixed
Lanmikeman:geotag
Lanmikeman:tickets-from-support-agents
Lanmikeman:notes-images-proxy
Lanmikeman:geodb
Lanmikeman:cfg-editor
Lanmikeman:translation
Lanmikeman:support-templates
Lanmikeman:faq-in-helpdesk
Lanmikeman:anon-comments
Lanmikeman:tretdm-patch-1
Lanmikeman:links
Lanmikeman:tanathon30
Lanmikeman:other-gender-options
Lanmikeman:polls
Lanmikeman:post-closure
Lanmikeman:REL_PP-4
Lanmikeman:seo
Lanmikeman:celestora-patch-2
Lanmikeman:celestora-patch-1
Lanmikeman:similartovk
Lanmikeman:fediverse
Lanmikeman:REL_PP-3
Lanmikeman:wikipages
Lanmikeman:group-contacts-archived
Lanmikeman:REL_PP-1
Lanmikeman:REL_PP-0
Lanmikeman:public_preview_4
Lanmikeman:public_preview_3
Lanmikeman:public_preview_2
Lanmikeman:public_preview_1

3 commits
895e26823b ... 62c8732868

Author SHA1 Message Date
Artemka
62c8732868
Merge f575b71bb0 into 2aedc3e861 2024-12-05 19:54:25 +03:00
veselcraft
2aedc3e861
fix(video): instead of scailing it down to 4:3 with black bars scale it by 480px 2024-12-04 16:26:03 +03:00
Artemka
f575b71bb0 Некоторые измения в шаблонах писем (Не тестировал) 2024-07-23 19:12:46 +00:00
7 changed files with 75 additions and 84 deletions
Show stats Expand all files Collapse all files

BIN
Email/assets/res/pictures/lock.jpeg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.7 KiB

11
Email/change-email.eml.latte
View file

@ -53,9 +53,6 @@
<table class="row"> <table class="row">
<tr> <tr>
<td> <td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer"> <table class="spacer">
<tr> <tr>
@ -94,7 +91,7 @@
<tr> <tr>
<td> <td>
<center> <center>
<a href="http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a> <a href="https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
</center> </center>
</td> </td>
</tr> </tr>
@ -118,8 +115,8 @@
<table class="callout"> <table class="callout">
<tr> <tr>
<th class="callout-inner primary"> <th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}" style="color: #000; text-decoration: none;"> <a href="https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key} https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}
</a> </a>
</th> </th>
</tr> </tr>
@ -130,7 +127,7 @@
</p> </p>
<ul> <ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li> <li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li> <li>Использовать, если прошло более двух дней с её генерации</li>
</ul> </ul>

2
Email/hello.eml.latte
View file

@ -12,7 +12,7 @@
<tr> <tr>
<td class="float-center" align="center" valign="top"> <td class="float-center" align="center" valign="top">
<center> <center>
Добро пожаловать в OpenVK! Приятного времяприпровождения, надеюсь вам понравится.<br><br>Если появились вопросы, касаемые нашего сайта, пишите <a href="https://ovk.to/support?act=new">сюда</a> Добро пожаловать в OpenVK! Приятного времяприпровождения, надеюсь вам понравится.<br><br>Если появились вопросы, касаемые нашего сайта, пишите <a href="https://{$_SERVER['HTTP_HOST']}/support?act=new">сюда</a>
</center> </center>
</td> </td>
</tr> </tr>

11
Email/password-reset.eml.latte
View file

@ -53,9 +53,6 @@
<table class="row"> <table class="row">
<tr> <tr>
<td> <td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer"> <table class="spacer">
<tr> <tr>
@ -94,7 +91,7 @@
<tr> <tr>
<td> <td>
<center> <center>
<a href="http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={rawurlencode($key)}" align="center" class="float-center">Сбросить пароль!</a> <a href="https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={rawurlencode($key)}" align="center" class="float-center">Сбросить пароль!</a>
</center> </center>
</td> </td>
</tr> </tr>
@ -118,8 +115,8 @@
<table class="callout"> <table class="callout">
<tr> <tr>
<th class="callout-inner primary"> <th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}" style="color: #000; text-decoration: none;"> <a href="https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key} https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}
</a> </a>
</th> </th>
</tr> </tr>
@ -130,7 +127,7 @@
</p> </p>
<ul> <ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li> <li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li> <li>Использовать, если прошло более двух дней с её генерации</li>
</ul> </ul>

11
Email/verify-email.eml.latte
View file

@ -53,9 +53,6 @@
<table class="row"> <table class="row">
<tr> <tr>
<td> <td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer"> <table class="spacer">
<tr> <tr>
@ -94,7 +91,7 @@
<tr> <tr>
<td> <td>
<center> <center>
<a href="http://{$_SERVER['HTTP_HOST']}/regFinish?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a> <a href="https://{$_SERVER['HTTP_HOST']}/regFinish?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
</center> </center>
</td> </td>
</tr> </tr>
@ -118,8 +115,8 @@
<table class="callout"> <table class="callout">
<tr> <tr>
<th class="callout-inner primary"> <th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}" style="color: #000; text-decoration: none;"> <a href="https://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/regFinish?key={$key} https://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}
</a> </a>
</th> </th>
</tr> </tr>
@ -130,7 +127,7 @@
</p> </p>
<ul> <ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li> <li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li> <li>Использовать, если прошло более двух дней с её генерации</li>
</ul> </ul>

2
Web/Models/shell/processVideo.ps1
View file

@ -13,7 +13,7 @@ Move-Item $file $temp
# video stub logic was implicitly deprecated, so we start processing at once # video stub logic was implicitly deprecated, so we start processing at once
ffmpeg -i $temp -ss 00:00:01.000 -vframes 1 "$dir$hashT/$hash.gif" ffmpeg -i $temp -ss 00:00:01.000 -vframes 1 "$dir$hashT/$hash.gif"
ffmpeg -i $temp -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=640:480:force_original_aspect_ratio=decrease,pad=640:480:(ow-iw)/2:(oh-ih)/2,setsar=1" -y $temp2 ffmpeg -i $temp -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=480:-1,setsar=1" -y $temp2
Move-Item $temp2 "$dir$hashT/$hash.mp4" Move-Item $temp2 "$dir$hashT/$hash.mp4"
Remove-Item $temp Remove-Item $temp

2
Web/Models/shell/processVideo.sh
View file

@ -3,7 +3,7 @@ tmpfile="$RANDOM-$(date +%s%N)"
cp $2 "/tmp/vid_$tmpfile.bin" cp $2 "/tmp/vid_$tmpfile.bin"
nice ffmpeg -i "/tmp/vid_$tmpfile.bin" -ss 00:00:01.000 -vframes 1 $3${4:0:2}/$4.gif nice ffmpeg -i "/tmp/vid_$tmpfile.bin" -ss 00:00:01.000 -vframes 1 $3${4:0:2}/$4.gif
nice -n 20 ffmpeg -i "/tmp/vid_$tmpfile.bin" -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=640:480:force_original_aspect_ratio=decrease,pad=640:480:(ow-iw)/2:(oh-ih)/2,setsar=1" -y "/tmp/ffmOi$tmpfile.mp4" nice -n 20 ffmpeg -i "/tmp/vid_$tmpfile.bin" -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=480:-1,setsar=1" -y "/tmp/ffmOi$tmpfile.mp4"
rm -rf $3${4:0:2}/$4.mp4 rm -rf $3${4:0:2}/$4.mp4
mv "/tmp/ffmOi$tmpfile.mp4" $3${4:0:2}/$4.mp4 mv "/tmp/ffmOi$tmpfile.mp4" $3${4:0:2}/$4.mp4