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

A couple more for - Don't send subscription activity to communities on dead instances

Browse source
This commit is contained in:
freamon 2024-08-21 13:50:11 +00:00
parent 5a02eb9ba0
commit 20a818de00
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/community/routes.py
View file

@ -499,6 +499,7 @@ def join_then_add(actor):
join_request = CommunityJoinRequest(user_id=current_user.id, community_id=community.id) join_request = CommunityJoinRequest(user_id=current_user.id, community_id=community.id)
db.session.add(join_request) db.session.add(join_request)
db.session.commit() db.session.commit()
if not community.instance.gone_forever:
follow = { follow = {
"actor": current_user.public_url(), "actor": current_user.public_url(),
"to": [community.public_url()], "to": [community.public_url()],
@ -506,7 +507,7 @@ def join_then_add(actor):
"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, post_request(community.ap_inbox_url, follow, current_user.private_key,
current_user.public_url() + '#main-key') current_user.public_url() + '#main-key')
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)

3
app/topic/routes.py
View file

@ -305,6 +305,7 @@ 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) user = User.query.get(user_id)
community = Community.query.get(community_id) community = Community.query.get(community_id)
if not community.instance.gone_forever:
follow = { follow = {
"actor": user.public_url(), "actor": user.public_url(),
"to": [community.public_url()], "to": [community.public_url()],
@ -312,5 +313,5 @@ def send_community_follow(community_id, join_request_id, user_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, user.private_key, post_request(community.ap_inbox_url, follow, user.private_key,
user.public_url() + '#main-key') user.public_url() + '#main-key')