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

extract instance weight to it's own function

Browse source
This commit is contained in:
rimu 2023-11-24 22:52:42 +13:00
parent 0fc16d503c
commit 428c65aa00
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/activitypub/routes.py
View file

@ -12,7 +12,7 @@ from app.models import User, Community, CommunityJoinRequest, CommunityMember, C
PostReply, Instance, PostVote, PostReplyVote, File, AllowedInstances, BannedInstances PostReply, Instance, PostVote, PostReplyVote, File, AllowedInstances, BannedInstances
from app.activitypub.util import public_key, users_total, active_half_year, active_month, local_posts, local_comments, \ from app.activitypub.util import public_key, users_total, active_half_year, active_month, local_posts, local_comments, \
post_to_activity, find_actor_or_create, default_context, instance_blocked, find_reply_parent, find_liked_object, \ post_to_activity, find_actor_or_create, default_context, instance_blocked, find_reply_parent, find_liked_object, \
lemmy_site_data lemmy_site_data, instance_weight
from app.utils import gibberish, get_setting, is_image_url, allowlist_html, html_to_markdown, render_template, \ from app.utils import gibberish, get_setting, is_image_url, allowlist_html, html_to_markdown, render_template, \
domain_from_url, markdown_to_html domain_from_url, markdown_to_html
import werkzeug.exceptions import werkzeug.exceptions
@ -295,7 +295,9 @@ def shared_inbox():
ap_id=request_json['object']['id'], ap_id=request_json['object']['id'],
ap_create_id=request_json['id'], ap_create_id=request_json['id'],
ap_announce_id=None, ap_announce_id=None,
type=constants.POST_TYPE_ARTICLE type=constants.POST_TYPE_ARTICLE,
up_votes=1,
score=instance_weight(user.ap_domain)
) )
if 'source' in request_json['object'] and \ if 'source' in request_json['object'] and \
request_json['object']['source'][ request_json['object']['source'][
@ -330,7 +332,12 @@ def shared_inbox():
db.session.add(post) db.session.add(post)
community.post_count += 1 community.post_count += 1
community.last_active = datetime.utcnow() community.last_active = datetime.utcnow()
activity_log.result = 'success'
db.session.commit() db.session.commit()
vote = PostVote(user_id=user.id, author_id=post.user_id,
post_id=post.id,
effect=instance_weight(user.ap_domain))
db.session.add(vote)
else: else:
post_id, parent_comment_id, root_id = find_reply_parent(in_reply_to) post_id, parent_comment_id, root_id = find_reply_parent(in_reply_to)
post_reply = PostReply(user_id=user.id, community_id=community.id, post_reply = PostReply(user_id=user.id, community_id=community.id,
@ -338,6 +345,8 @@ def shared_inbox():
root_id=root_id, root_id=root_id,
nsfw=community.nsfw, nsfw=community.nsfw,
nsfl=community.nsfl, nsfl=community.nsfl,
up_votes=1,
score=instance_weight(user.ap_domain),
ap_id=request_json['object']['id'], ap_id=request_json['object']['id'],
ap_create_id=request_json['id'], ap_create_id=request_json['id'],
ap_announce_id=None) ap_announce_id=None)
@ -357,7 +366,11 @@ def shared_inbox():
post.reply_count += 1 post.reply_count += 1
community.post_reply_count += 1 community.post_reply_count += 1
community.last_active = datetime.utcnow() community.last_active = datetime.utcnow()
activity_log.result = 'success'
db.session.commit() db.session.commit()
vote = PostReplyVote(user_id=user.id, author_id=post_reply.user_id, post_reply_id=post_reply.id,
effect=instance_weight(user.ap_domain))
db.session.add(vote)
else: else:
activity_log.exception_message = 'Unacceptable type (kbin): ' + object_type activity_log.exception_message = 'Unacceptable type (kbin): ' + object_type
@ -457,11 +470,7 @@ def shared_inbox():
liked_ap_id = request_json['object']['object'] liked_ap_id = request_json['object']['object']
user = find_actor_or_create(user_ap_id) user = find_actor_or_create(user_ap_id)
if user: if user:
vote_weight = 1.0 vote_weight = instance_weight(user.ap_domain)
if user.ap_domain:
instance = Instance.query.filter_by(domain=user.ap_domain).fetch()
if instance:
vote_weight = instance.vote_weight
liked = find_liked_object(liked_ap_id) liked = find_liked_object(liked_ap_id)
# insert into voted table # insert into voted table
if liked is not None and isinstance(liked, Post): if liked is not None and isinstance(liked, Post):
@ -594,6 +603,9 @@ def shared_inbox():
existing_vote = PostReplyVote.query.filter_by(user_id=user.id, post_reply_id=comment.id).first() existing_vote = PostReplyVote.query.filter_by(user_id=user.id, post_reply_id=comment.id).first()
if existing_vote: if existing_vote:
comment.author.reputation -= existing_vote.effect comment.author.reputation -= existing_vote.effect
if existing_vote.effect < 0: # Lemmy sends 'like' for upvote and 'dislike' for down votes. Cool! When it undoes an upvote it sends an 'Undo Like'. Fine. When it undoes a downvote it sends an 'Undo Like' - not 'Undo Dislike'?!
comment.down_votes -= 1
else:
comment.up_votes -= 1 comment.up_votes -= 1
comment.score -= existing_vote.effect comment.score -= existing_vote.effect
db.session.delete(existing_vote) db.session.delete(existing_vote)
@ -671,23 +683,18 @@ def shared_inbox():
reply.body = 'deleted' reply.body = 'deleted'
db.session.commit() db.session.commit()
activity_log.result = 'success' activity_log.result = 'success'
elif request_json['type'] == 'Like': elif request_json['type'] == 'Like': # Upvote
activity_log.activity_type = request_json['type'] activity_log.activity_type = request_json['type']
user_ap_id = request_json['actor'] user_ap_id = request_json['actor']
user = find_actor_or_create(user_ap_id) user = find_actor_or_create(user_ap_id)
target_ap_id = request_json['object'] target_ap_id = request_json['object']
post = None post = None
comment = None comment = None
effect = 1.0 effect = instance_weight(user.ap_domain)
if '/comment/' in target_ap_id: if '/comment/' in target_ap_id:
comment = PostReply.query.filter_by(ap_id=target_ap_id).first() comment = PostReply.query.filter_by(ap_id=target_ap_id).first()
if '/post/' in target_ap_id: if '/post/' in target_ap_id:
post = Post.query.filter_by(ap_id=target_ap_id).first() post = Post.query.filter_by(ap_id=target_ap_id).first()
if user.ap_domain:
# alter the effect of upvotes based on their instance
instance = Instance.query.filter_by(domain=user.ap_domain).first()
if instance:
effect = instance.vote_weight
if user and post: if user and post:
existing_vote = PostVote.query.filter_by(user_id=user.id, post_id=post.id).first() existing_vote = PostVote.query.filter_by(user_id=user.id, post_id=post.id).first()
if not existing_vote: if not existing_vote:
@ -742,7 +749,7 @@ def shared_inbox():
pass # they have already upvoted this reply pass # they have already upvoted this reply
activity_log.result = 'success' activity_log.result = 'success'
elif request_json['type'] == 'Dislike': elif request_json['type'] == 'Dislike': # Downvote
if get_setting('allow_dislike', True) is False: if get_setting('allow_dislike', True) is False:
activity_log.exception_message = 'Dislike ignored because of allow_dislike setting' activity_log.exception_message = 'Dislike ignored because of allow_dislike setting'
else: else:

12
app/activitypub/util.py
View file

@ -5,7 +5,7 @@ from typing import Union, Tuple
from flask import current_app from flask import current_app
from sqlalchemy import text from sqlalchemy import text
from app import db, cache from app import db, cache
from app.models import User, Post, Community, BannedInstances, File, PostReply, AllowedInstances from app.models import User, Post, Community, BannedInstances, File, PostReply, AllowedInstances, Instance
import time import time
import base64 import base64
import requests import requests
@ -394,6 +394,16 @@ def find_liked_object(ap_id) -> Union[Post, PostReply, None]:
return None return None
# alter the effect of upvotes based on their instance. Default to 1.0
@cache.memoize(timeout=50)
def instance_weight(domain):
if domain:
instance = Instance.query.filter_by(domain=domain).first()
if instance:
return instance.vote_weight
return 1.0
def lemmy_site_data(): def lemmy_site_data():
data = { data = {
"site_view": { "site_view": {

4
app/models.py
View file

@ -512,8 +512,8 @@ class PostVote(db.Model):
class PostReplyVote(db.Model): class PostReplyVote(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
user_id = db.Column(db.Integer, db.ForeignKey('user.id')) user_id = db.Column(db.Integer, db.ForeignKey('user.id')) # who voted
author_id = db.Column(db.Integer, db.ForeignKey('user.id')) author_id = db.Column(db.Integer, db.ForeignKey('user.id')) # the author of the reply voted on - who's reputation is affected
post_reply_id = db.Column(db.Integer, db.ForeignKey('post_reply.id')) post_reply_id = db.Column(db.Integer, db.ForeignKey('post_reply.id'))
effect = db.Column(db.Float) effect = db.Column(db.Float)
created_at = db.Column(db.DateTime, default=datetime.utcnow) created_at = db.Column(db.DateTime, default=datetime.utcnow)