pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-09-18 22:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework person_check and rename it to actor_type_check

Browse source
This commit is contained in:
Izalia Mae 2024-06-18 21:52:52 -04:00
parent f49bc0ae90
commit 5407027af8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
relay/processors.py
View file

@ -10,14 +10,12 @@ if typing.TYPE_CHECKING:
from .views.activitypub import ActorView from .views.activitypub import ActorView
def person_check(actor: Message, software: str | None) -> bool: def actor_type_check(actor: Message, software: str | None) -> bool:
# pleroma and akkoma may use Person for the actor type for some reason if actor.type == 'Application':
# akkoma changed this in 3.6.0 return True
if software in {'akkoma', 'pleroma'} and actor.id == f'https://{actor.domain}/relay':
return False
# make sure the actor is an application # akkoma (< 3.6.0) and pleroma use Person for the actor type
if actor.type != 'Application': if software in {'akkoma', 'pleroma'} and actor.id == f'https://{actor.domain}/relay':
return True return True
return False return False
@ -88,7 +86,7 @@ async def handle_follow(view: ActorView, conn: Connection) -> None:
return return
# reject if the actor is not an instance actor # reject if the actor is not an instance actor
if person_check(view.actor, software): if actor_type_check(view.actor, software):
logging.verbose('Non-application actor tried to follow: %s', view.actor.id) logging.verbose('Non-application actor tried to follow: %s', view.actor.id)
view.app.push_message( view.app.push_message(