Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2025-06-07 21:56:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat(feed, reports): Make Feed Great Again (#1303)

Browse source
This commit is contained in:
Ry0 2025-06-01 16:36:17 +03:00 committed by GitHub
parent 14a07450d3
commit ecdbc2ef1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 95 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Web/Presenters/templates/Wall/Post.xml
View file

@ -56,29 +56,6 @@
>
{_changes_history}
</a>
<a n:if="$canReport ?? false" class="profile_link" style="display:block;width:96%;" href="javascript:reportPost()">{_report}</a>
<a n:if="$canReport ?? false" class="profile_link" style="display:block;width:96%;" href="javascript:reportPost({$post->getId()})">{_report}</a>
</div>
<script n:if="$canReport ?? false">
function reportPost() {
uReportMsgTxt = tr("going_to_report_post");
uReportMsgTxt += "<br/>"+tr("report_question_text");
uReportMsgTxt += "<br/><br/><b>"+tr("report_reason")+"</b>: <input type='text' id='uReportMsgInput' placeholder='" + tr("reason") + "' />"
MessageBox(tr("report_question"), uReportMsgTxt, [tr("confirm_m"), tr("cancel")], [
(function() {
res = document.querySelector("#uReportMsgInput").value;
xhr = new XMLHttpRequest();
xhr.open("GET", "/report/" + {$post->getId()} + "?reason=" + res + "&type=post", true);
xhr.onload = (function() {
if(xhr.responseText.indexOf("reason") === -1)
MessageBox(tr("error"), tr("error_sending_report"), ["OK"], [Function.noop]);
else
MessageBox(tr("action_successfully"), tr("will_be_watched"), ["OK"], [Function.noop]);
});
xhr.send(null);
}),
Function.noop
]);
}
</script>
{/block}

1
Web/Presenters/templates/components/post/microblogpost.xml
View file

@ -58,6 +58,7 @@
<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="!$canBeDeleted" class="report" title="{_report}" href="javascript:reportPost({$post->getId()})"></a>
{if $canBePinned && !($forceNoPinLink ?? false) && $compact == false}
{if $post->isPinned()}

10
Web/Presenters/templates/components/post/oldpost.xml
View file

@ -133,8 +133,16 @@
{if !($forceNoDeleteLink ?? false) && $canBeDeleted}
<a href="/wall{$post->getPrettyId()}/delete">{_delete}</a> &nbsp;|&nbsp;
{/if}
{if $feedIgnoreButton && !$canBeDeleted}
<a id="__ignoreSomeoneFeed" data-val='1' data-id="{$wallOwner->getRealId()}">{_feed_ignore}</a> &nbsp;|&nbsp;
{/if}
{if !$canBeDeleted}
<a href="javascript:reportPost({$post->getId()})">{_report}</a> &nbsp;|&nbsp;
{/if}
{if !($forceNoPinLink ?? false) && $canBePinned}
{if $post->isPinned()}
<a href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}">{_unpin}</a>

14
Web/static/css/microblog.css
View file

@ -86,6 +86,20 @@
background-color: rgb(240, 240, 240);
}
.report {
float: right;
height: 16px;
width: 16px;
overflow: auto;
background: url("/assets/packages/static/openvk/img/report.png") no-repeat 0 0;
opacity: 0.1;
transition-duration: 0.3s;
}
.report:hover {
opacity: 0.4;
}
.post-author .delete {
float: right;
height: 16px;

BIN
Web/static/img/report.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 169 B

70
Web/static/js/al_feed.js
View file

@ -43,6 +43,53 @@ u(document).on("click", "#__ignoreSomeone", async (e) => {
}
})
u(document).on("click", "#__ignoreSomeoneFeed", async (e) => {
e.preventDefault()
const TARGET = u(e.target)
const ENTITY_ID = Number(e.target.dataset.id)
const VAL = Number(e.target.dataset.val)
const ACT = VAL == 1 ? 'ignore' : 'unignore'
const METHOD_NAME = ACT == 'ignore' ? 'addBan' : 'deleteBan'
const PARAM_NAME = ENTITY_ID < 0 ? 'group_ids' : 'user_ids'
const ENTITY_NAME = ENTITY_ID < 0 ? 'club' : 'user'
const URL = `/method/newsfeed.${METHOD_NAME}?auth_mechanism=roaming&${PARAM_NAME}=${Math.abs(ENTITY_ID)}`
TARGET.closest('.post').addClass('lagged')
const REQ = await fetch(URL)
const RES = await REQ.json()
TARGET.closest('.post').removeClass('lagged')
if(RES.error_code) {
switch(RES.error_code) {
case -10:
fastError(';/')
break
case -50:
fastError(tr('ignored_sources_limit'))
break
default:
fastError(res.error_msg)
break
}
return
}
if(RES.response == 1) {
if(ACT == 'unignore') {
TARGET.closest('.scroll_node').find('.post').removeClass('post-hidden');
TARGET.closest('.ignore-message').remove()
} else {
TARGET.closest('.post').addClass('post-hidden');
TARGET.closest('.scroll_node').append(`
<div class="ignore-message" width="100%">
${tr(`feed_${ENTITY_NAME}_ignored`)} <a id="__ignoreSomeoneFeed" data-val='0' data-id='${ENTITY_ID}' href="#">${tr('feed_unignore')}</a>
</div>
`)
}
}
})
u(document).on('click', '#__feed_settings_link', (e) => {
e.preventDefault()
@ -306,3 +353,26 @@ function openJsSettings() {
</tr>
`)
}
function reportPost(postId) {
uReportMsgTxt = tr("going_to_report_post");
uReportMsgTxt += "<br/>"+tr("report_question_text");
uReportMsgTxt += "<br/><br/><b>"+tr("report_reason")+"</b>: <input type='text' id='uReportMsgInput' placeholder='" + tr("reason") + "' />"
MessageBox(tr("report_question"), uReportMsgTxt, [tr("confirm_m"), tr("cancel")], [
(function() {
res = document.querySelector("#uReportMsgInput").value;
xhr = new XMLHttpRequest();
xhr.open("GET", "/report/" + postId + "?reason=" + res + "&type=post", true);
xhr.onload = (function() {
if(xhr.responseText.indexOf("reason") === -1)
MessageBox(tr("error"), tr("error_sending_report"), ["OK"], [Function.noop]);
else
MessageBox(tr("action_successfully"), tr("will_be_watched"), ["OK"], [Function.noop]);
});
xhr.send(null);
}),
Function.noop
]);
}