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

Add Undo of Post Vote to federation

Browse source
This commit is contained in:
freamon 2024-04-16 18:40:48 +01:00
parent a8f7ebf442
commit 79239b7273
2 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/activitypub/routes.py
View file

@ -708,7 +708,7 @@ def process_inbox_request(request_json, activitypublog_id, ip_address):
else: else:
activity_log.exception_message = 'PostReply not found' activity_log.exception_message = 'PostReply not found'
elif request_json['object']['type'] == 'Undo': elif request_json['object']['type'] == 'Undo':
if request_json['object']['object']['type'] == 'Like': if request_json['object']['object']['type'] == 'Like' or request_json['object']['object']['type'] == 'Dislike':
activity_log.activity_type = request_json['object']['object']['type'] activity_log.activity_type = request_json['object']['object']['type']
user_ap_id = request_json['object']['actor'] user_ap_id = request_json['object']['actor']
user = find_actor_or_create(user_ap_id) user = find_actor_or_create(user_ap_id)

46
app/post/routes.py
View file

@ -279,6 +279,7 @@ def show_post(post_id: int):
def post_vote(post_id: int, vote_direction): def post_vote(post_id: int, vote_direction):
post = Post.query.get_or_404(post_id) post = Post.query.get_or_404(post_id)
existing_vote = PostVote.query.filter_by(user_id=current_user.id, post_id=post.id).first() existing_vote = PostVote.query.filter_by(user_id=current_user.id, post_id=post.id).first()
undo = None
if existing_vote: if existing_vote:
if not post.community.low_quality: if not post.community.low_quality:
post.author.reputation -= existing_vote.effect post.author.reputation -= existing_vote.effect
@ -287,6 +288,7 @@ def post_vote(post_id: int, vote_direction):
db.session.delete(existing_vote) db.session.delete(existing_vote)
post.up_votes -= 1 post.up_votes -= 1
post.score -= 1 post.score -= 1
undo = 'Like'
else: # new vote is down while previous vote was up, so reverse their previous vote else: # new vote is down while previous vote was up, so reverse their previous vote
existing_vote.effect = -1 existing_vote.effect = -1
post.up_votes -= 1 post.up_votes -= 1
@ -297,6 +299,7 @@ def post_vote(post_id: int, vote_direction):
db.session.delete(existing_vote) db.session.delete(existing_vote)
post.down_votes -= 1 post.down_votes -= 1
post.score += 1 post.score += 1
undo = 'Dislike'
else: # new vote is up while previous vote was down, so reverse their previous vote else: # new vote is up while previous vote was down, so reverse their previous vote
existing_vote.effect = 1 existing_vote.effect = 1
post.up_votes += 1 post.up_votes += 1
@ -332,7 +335,22 @@ def post_vote(post_id: int, vote_direction):
post.author.reputation += effect post.author.reputation += effect
db.session.add(vote) db.session.add(vote)
if not post.community.local_only: if not post.community.local_only:
if undo:
action_json = {
'actor': current_user.profile_id(),
'type': 'Undo',
'id': f"https://{current_app.config['SERVER_NAME']}/activities/undo/{gibberish(15)}",
'audience': post.community.profile_id(),
'object': {
'actor': current_user.profile_id(),
'object': post.profile_id(),
'type': undo,
'id': f"https://{current_app.config['SERVER_NAME']}/activities/{undo.lower()}/{gibberish(15)}",
'audience': post.community.profile_id()
}
}
else:
action_type = 'Like' if vote_direction == 'upvote' else 'Dislike' action_type = 'Like' if vote_direction == 'upvote' else 'Dislike'
action_json = { action_json = {
'actor': current_user.profile_id(), 'actor': current_user.profile_id(),
@ -341,8 +359,8 @@ def post_vote(post_id: int, vote_direction):
'id': f"https://{current_app.config['SERVER_NAME']}/activities/{action_type.lower()}/{gibberish(15)}", 'id': f"https://{current_app.config['SERVER_NAME']}/activities/{action_type.lower()}/{gibberish(15)}",
'audience': post.community.profile_id() 'audience': post.community.profile_id()
} }
if post.community.is_local(): if post.community.is_local():
announce = { announce = {
"id": f"https://{current_app.config['SERVER_NAME']}/activities/announce/{gibberish(15)}", "id": f"https://{current_app.config['SERVER_NAME']}/activities/announce/{gibberish(15)}",
"type": 'Announce', "type": 'Announce',
"to": [ "to": [
@ -354,15 +372,15 @@ def post_vote(post_id: int, vote_direction):
], ],
'@context': default_context(), '@context': default_context(),
'object': action_json 'object': action_json
} }
for instance in post.community.following_instances(): for instance in post.community.following_instances():
if instance.inbox and not current_user.has_blocked_instance(instance.id) and not instance_banned(instance.domain): if instance.inbox and not current_user.has_blocked_instance(instance.id) and not instance_banned(instance.domain):
send_to_remote_instance(instance.id, post.community.id, announce) send_to_remote_instance(instance.id, post.community.id, announce)
else: else:
success = post_request(post.community.ap_inbox_url, action_json, current_user.private_key, success = post_request(post.community.ap_inbox_url, action_json, current_user.private_key,
current_user.ap_profile_id + '#main-key') current_user.ap_profile_id + '#main-key')
if not success: if not success:
flash('Failed to send vote', 'warning') flash('Failed to send vote', 'warning')
current_user.last_seen = utcnow() current_user.last_seen = utcnow()
current_user.ip_address = ip_address() current_user.ip_address = ip_address()
@ -375,9 +393,9 @@ def post_vote(post_id: int, vote_direction):
recently_upvoted = [] recently_upvoted = []
recently_downvoted = [] recently_downvoted = []
if vote_direction == 'upvote': if vote_direction == 'upvote' and undo is None:
recently_upvoted = [post_id] recently_upvoted = [post_id]
elif vote_direction == 'downvote': elif vote_direction == 'downvote' and undo is None:
recently_downvoted = [post_id] recently_downvoted = [post_id]
cache.delete_memoized(recently_upvoted_posts, current_user.id) cache.delete_memoized(recently_upvoted_posts, current_user.id)
cache.delete_memoized(recently_downvoted_posts, current_user.id) cache.delete_memoized(recently_downvoted_posts, current_user.id)