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

Streamline ap routes (part 12: undo locks)

Browse source
This commit is contained in:
freamon 2025-01-08 19:49:41 +00:00
parent e1e1b43d63
commit 809a04b869
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
app/activitypub/routes.py
View file

@ -1111,6 +1111,25 @@ def process_inbox_request(request_json, store_ap_json):
log_incoming_ap(id, APLOG_UNDO_VOTE, APLOG_FAILURE, request_json if store_ap_json else None, 'Unfound object ' + target_ap_id) log_incoming_ap(id, APLOG_UNDO_VOTE, APLOG_FAILURE, request_json if store_ap_json else None, 'Unfound object ' + target_ap_id)
return return
if core_activity['object']['type'] == 'Lock': # Undo of post lock
mod = user
post_id = core_activity['object']['object']
post = Post.query.filter_by(ap_id=post_id).first()
reason = core_activity['summary'] if 'summary' in core_activity else ''
if post:
if post.community.is_moderator(mod) or post.community.is_instance_admin(mod):
post.comments_enabled = True
db.session.commit()
add_to_modlog_activitypub('unlock_post', mod, community_id=post.community.id,
link_text=shorten_string(post.title), link=f'post/{post.id}',
reason=reason)
log_incoming_ap(id, APLOG_LOCK, APLOG_SUCCESS, request_json if store_ap_json else None)
else:
log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: Does not have permission')
else:
log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: post not found')
return
if request_json['object']['type'] == 'Block': # remote site is unbanning one of their users if request_json['object']['type'] == 'Block': # remote site is unbanning one of their users
unblocker = user unblocker = user
unblocked_ap_id = request_json['object']['object'].lower() unblocked_ap_id = request_json['object']['object'].lower()
@ -1314,24 +1333,24 @@ def process_inbox_request(request_json, store_ap_json):
# log_incoming_ap(id, APLOG_UNDO_VOTE, APLOG_FAILURE, request_json if store_ap_json else None, 'Unfound object ' + target_ap_id) # log_incoming_ap(id, APLOG_UNDO_VOTE, APLOG_FAILURE, request_json if store_ap_json else None, 'Unfound object ' + target_ap_id)
# return # return
if request_json['object']['object']['type'] == 'Lock': # Announce of undo of post lock #if request_json['object']['object']['type'] == 'Lock': # Announce of undo of post lock
mod = user # mod = user
post_id = request_json['object']['object']['object'] # post_id = request_json['object']['object']['object']
post = Post.query.filter_by(ap_id=post_id).first() # post = Post.query.filter_by(ap_id=post_id).first()
reason = request_json['object']['summary'] if 'summary' in request_json['object'] else '' # reason = request_json['object']['summary'] if 'summary' in request_json['object'] else ''
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 # post.comments_enabled = True
db.session.commit() # db.session.commit()
add_to_modlog_activitypub('unlock_post', mod, community_id=post.community.id, # add_to_modlog_activitypub('unlock_post', mod, community_id=post.community.id,
link_text=shorten_string(post.title), link=f'post/{post.id}', # link_text=shorten_string(post.title), link=f'post/{post.id}',
reason=reason) # reason=reason)
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')
else: # else:
log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: post not found') # log_incoming_ap(id, APLOG_LOCK, APLOG_FAILURE, request_json if store_ap_json else None, 'Lock: post not found')
return # return
if request_json['object']['object']['type'] == 'Block': # Announce of undo of user ban. Mod is unbanning a user from a community, if request_json['object']['object']['type'] == 'Block': # Announce of undo of user ban. Mod is unbanning a user from a community,
blocker = user # or an admin is unbanning a user from all the site's communities as part of a site unban blocker = user # or an admin is unbanning a user from all the site's communities as part of a site unban