michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-24 03:43:42 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

federate report to remote instance #21

Browse source
This commit is contained in:
rimu 2024-04-06 15:24:59 +13:00
parent 11f0a9e183
commit a5212762f9
2 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/post/routes.py
View file

@ -18,7 +18,7 @@ from app.post.util import post_replies, get_comment_branch, post_reply_count
from app.constants import SUBSCRIPTION_MEMBER, POST_TYPE_LINK, POST_TYPE_IMAGE from app.constants import SUBSCRIPTION_MEMBER, POST_TYPE_LINK, POST_TYPE_IMAGE
from app.models import Post, PostReply, \ from app.models import Post, PostReply, \
PostReplyVote, PostVote, Notification, utcnow, UserBlock, DomainBlock, InstanceBlock, Report, Site, Community, \ PostReplyVote, PostVote, Notification, utcnow, UserBlock, DomainBlock, InstanceBlock, Report, Site, Community, \
Topic, User Topic, User, Instance
from app.post import bp from app.post import bp
from app.utils import get_setting, render_template, allowlist_html, markdown_to_html, validation_required, \ from app.utils import get_setting, render_template, allowlist_html, markdown_to_html, validation_required, \
shorten_string, markdown_to_text, gibberish, ap_datetime, return_304, \ shorten_string, markdown_to_text, gibberish, ap_datetime, return_304, \
@ -916,9 +916,29 @@ def post_report(post_id: int):
admin.unread_notifications += 1 admin.unread_notifications += 1
db.session.commit() db.session.commit()
# todo: federate report to originating instance # federate report to community instance
if not post.community.is_local() and form.report_remote.data: if not post.community.is_local() and form.report_remote.data:
... summary = form.reasons_to_string(form.reasons.data)
if form.description.data:
summary += ' - ' + form.description.data
report_json = {
"actor": current_user.profile_id(),
"audience": post.community.profile_id(),
"content": None,
"id": f"https://{current_app.config['SERVER_NAME']}/activities/flag/{gibberish(15)}",
"object": post.ap_id,
"summary": summary,
"to": [
post.community.profile_id()
],
"type": "Flag"
}
instance = Instance.query.get(post.community.instance_id)
if post.community.ap_inbox_url and not current_user.has_blocked_instance(instance.id) and not instance_banned(instance.domain):
success = post_request(post.community.ap_inbox_url, report_json, current_user.private_key,
current_user.ap_profile_id + '#main-key')
if not success:
flash('Failed to send report to remote server', 'error')
flash(_('Post has been reported, thank you!')) flash(_('Post has been reported, thank you!'))
return redirect(post.community.local_url()) return redirect(post.community.local_url())
@ -1030,9 +1050,30 @@ def post_reply_report(post_id: int, comment_id: int):
admin.unread_notifications += 1 admin.unread_notifications += 1
db.session.commit() db.session.commit()
# todo: federate report to originating instance # federate report to originating instance
if not post.community.is_local() and form.report_remote.data: if not post.community.is_local() and form.report_remote.data:
... summary = form.reasons_to_string(form.reasons.data)
if form.description.data:
summary += ' - ' + form.description.data
report_json = {
"actor": current_user.profile_id(),
"audience": post.community.profile_id(),
"content": None,
"id": f"https://{current_app.config['SERVER_NAME']}/activities/flag/{gibberish(15)}",
"object": post_reply.ap_id,
"summary": summary,
"to": [
post.community.profile_id()
],
"type": "Flag"
}
instance = Instance.query.get(post.community.instance_id)
if post.community.ap_inbox_url and not current_user.has_blocked_instance(
instance.id) and not instance_banned(instance.domain):
success = post_request(post.community.ap_inbox_url, report_json, current_user.private_key,
current_user.ap_profile_id + '#main-key')
if not success:
flash('Failed to send report to remote server', 'error')
flash(_('Comment has been reported, thank you!')) flash(_('Comment has been reported, thank you!'))
return redirect(post.community.local_url()) return redirect(post.community.local_url())

4
app/templates/base.html
View file

@ -136,8 +136,8 @@
<li class="nav-item dropdown{% if active_parent == 'communities' %} active{% endif %}"> <li class="nav-item dropdown{% if active_parent == 'communities' %} active{% endif %}">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/topics" aria-haspopup="true" aria-expanded="false">{{ _('Topics') }}</a> <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/topics" aria-haspopup="true" aria-expanded="false">{{ _('Topics') }}</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="dropdown-item{% if active_child == 'list_communities' %} active{% endif %}" href="/topics">{{ _('Browse by topic') }}</a></li> <li><a class="dropdown-item{% if active_child == 'list_topics' %} active{% endif %}" href="/topics">{{ _('Browse by topic') }}</a></li>
<li><a class="dropdown-item{% if active_child == 'list_topics' %} active{% endif %}" href="/communities">{{ _('All communities') }}</a></li> <li><a class="dropdown-item{% if active_child == 'list_communities' %} active{% endif %}" href="/communities">{{ _('All communities') }}</a></li>
</ul> </ul>
</li> </li>
<li class="nav-item"><a class="nav-link" href="/auth/login">{{ _('Log in') }}</a></li> <li class="nav-item"><a class="nav-link" href="/auth/login">{{ _('Log in') }}</a></li>