michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

use lock_post function

Browse source
This commit is contained in:
Hendrik L 2024-12-02 13:30:27 +01:00
parent 48a0cb64ce
commit e270bc9a0e
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/activitypub/routes.py
View file

@ -1096,8 +1096,7 @@ def process_inbox_request(request_json, store_ap_json):
post = Post.query.filter_by(ap_id=post_id).first() post = Post.query.filter_by(ap_id=post_id).first()
if post: if post:
if post.community.is_moderator(mod) or post.community.is_instance_admin(mod): if post.community.is_moderator(mod) or post.community.is_instance_admin(mod):
post.comments_enabled = False lock_post(user_ap_id, post_id, False, request_json)
db.session.commit()
log_incoming_ap(id, APLOG_LOCK, APLOG_SUCCESS, request_json if store_ap_json else None) log_incoming_ap(id, APLOG_LOCK, APLOG_SUCCESS, request_json if store_ap_json else None)
else: else:
log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: Does not have permission') log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: Does not have permission')
@ -1219,8 +1218,7 @@ def process_inbox_request(request_json, store_ap_json):
post = Post.query.filter_by(ap_id=post_id).first() post = Post.query.filter_by(ap_id=post_id).first()
if post: if post:
if post.community.is_moderator(mod) or post.community.is_instance_admin(mod): if post.community.is_moderator(mod) or post.community.is_instance_admin(mod):
post.comments_enabled = True lock_post(user_ap_id, post_id, True, request_json)
db.session.commit()
log_incoming_ap(id, APLOG_LOCK, APLOG_SUCCESS, request_json if store_ap_json else None) log_incoming_ap(id, APLOG_LOCK, APLOG_SUCCESS, request_json if store_ap_json else None)
else: else:
log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: Does not have permission') log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: Does not have permission')

18
app/activitypub/util.py
View file

@ -1610,21 +1610,31 @@ def unban_local_user(blocker, blocked, community, request_json):
add_to_modlog_activitypub('unban_user', blocker, community_id=community.id, link_text=blocked.display_name(), link=blocked.link(), reason=reason) add_to_modlog_activitypub('unban_user', blocker, community_id=community.id, link_text=blocked.display_name(), link=blocked.link(), reason=reason)
def lock_post(mod_ap_id, post_id, comments_enabled): def lock_post(mod_ap_id, post_id, comments_enabled, request_json):
if current_app.debug: if current_app.debug:
lock_post_task(mod_ap_id, post_id, comments_enabled) lock_post_task(mod_ap_id, post_id, comments_enabled, request_json)
else: else:
lock_post_task.delay(mod_ap_id, post_id, comments_enabled) lock_post_task.delay(mod_ap_id, post_id, comments_enabled, request_json)
@celery.task @celery.task
def lock_post_task(mod_ap_id, post_id, comments_enabled): def lock_post_task(mod_ap_id, post_id, comments_enabled, request_json):
mod = find_actor_or_create(mod_ap_id, create_if_not_found=False) mod = find_actor_or_create(mod_ap_id, create_if_not_found=False)
post = Post.query.filter_by(ap_id=post_id).first() post = Post.query.filter_by(ap_id=post_id).first()
community = post.community
reason = request_json['object']['summary'] if 'summary' in request_json['object'] else ''
if mod and post: if mod and post:
if post.community.is_moderator(mod) or post.community.is_instance_admin(mod): if post.community.is_moderator(mod) or post.community.is_instance_admin(mod):
post.comments_enabled = comments_enabled post.comments_enabled = comments_enabled
db.session.commit() db.session.commit()
if comments_enabled:
add_to_modlog_activitypub('unlock_post', mod, community_id=community.id,
link_text=shorten_string(post.title), link=f'post/{post.id}',
reason=reason)
else:
add_to_modlog_activitypub('lock_post', mod, community_id=community.id,
link_text=shorten_string(post.title), link=f'post/{post.id}',
reason=reason)
def create_post_reply(store_ap_json, community: Community, in_reply_to, request_json: dict, user: User, announce_id=None) -> Union[PostReply, None]: def create_post_reply(store_ap_json, community: Community, in_reply_to, request_json: dict, user: User, announce_id=None) -> Union[PostReply, None]: