Merge branch 'zen-master-patch-50595' into 'master'

Do not check instance's actor.type in case of Pleroma/Akkoma

See merge request pleroma/relay!50
This commit is contained in:
Izalia Mae 2023-01-11 03:43:59 +00:00
commit 15b1324df2

View file

@ -11,12 +11,12 @@ cache = LRUCache(1024)
def person_check(actor, software): def person_check(actor, software):
## pleroma and akkoma use Person for the actor type for some reason ## pleroma and akkoma may use Person for the actor type for some reason
if software in {'akkoma', 'pleroma'} and actor.id != f'https://{actor.domain}/relay': if software in {'akkoma', 'pleroma'} and actor.id == f'https://{actor.domain}/relay':
return True return False
## make sure the actor is an application ## make sure the actor is an application
elif actor.type != 'Application': if actor.type != 'Application':
return True return True