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

current_user is not available in celery tasks

Browse source
This commit is contained in:
rimu 2024-03-02 09:26:32 +13:00
parent e01aa64c28
commit a95515aa82
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/topic/routes.py
View file

@ -10,7 +10,7 @@ from sqlalchemy import text, desc, or_
from app.activitypub.signature import post_request from app.activitypub.signature import post_request
from app.constants import SUBSCRIPTION_NONMEMBER, POST_TYPE_IMAGE, POST_TYPE_LINK from app.constants import SUBSCRIPTION_NONMEMBER, POST_TYPE_IMAGE, POST_TYPE_LINK
from app.inoculation import inoculation from app.inoculation import inoculation
from app.models import Topic, Community, Post, utcnow, CommunityMember, CommunityJoinRequest from app.models import Topic, Community, Post, utcnow, CommunityMember, CommunityJoinRequest, User
from app.topic import bp from app.topic import bp
from app import db, celery, cache from app import db, celery, cache
from app.topic.forms import ChooseTopicsForm from app.topic.forms import ChooseTopicsForm
@ -187,9 +187,9 @@ def join_topic(topic_id):
db.session.add(join_request) db.session.add(join_request)
db.session.commit() db.session.commit()
if current_app.debug: if current_app.debug:
send_community_follow(community.id, join_request) send_community_follow(community.id, join_request, current_user.id)
else: else:
send_community_follow.delay(community.id, join_request.id) send_community_follow.delay(community.id, join_request.id, current_user.id)
member = CommunityMember(user_id=current_user.id, community_id=community.id) member = CommunityMember(user_id=current_user.id, community_id=community.id)
db.session.add(member) db.session.add(member)
@ -198,15 +198,16 @@ def join_topic(topic_id):
@celery.task @celery.task
def send_community_follow(community_id, join_request_id): def send_community_follow(community_id, join_request_id, user_id):
with current_app.app_context(): with current_app.app_context():
user = User.query.get(user_id)
community = Community.query.get(community_id) community = Community.query.get(community_id)
follow = { follow = {
"actor": f"https://{current_app.config['SERVER_NAME']}/u/{current_user.user_name}", "actor": f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}",
"to": [community.ap_profile_id], "to": [community.ap_profile_id],
"object": community.ap_profile_id, "object": community.ap_profile_id,
"type": "Follow", "type": "Follow",
"id": f"https://{current_app.config['SERVER_NAME']}/activities/follow/{join_request_id}" "id": f"https://{current_app.config['SERVER_NAME']}/activities/follow/{join_request_id}"
} }
success = post_request(community.ap_inbox_url, follow, current_user.private_key, success = post_request(community.ap_inbox_url, follow, user.private_key,
current_user.profile_id() + '#main-key') user.profile_id() + '#main-key')