From 0b122b0d329a899a1d05405c7ffd6eaabadd6f4d Mon Sep 17 00:00:00 2001 From: gled Date: Thu, 25 Jul 2019 12:13:56 -0700 Subject: [PATCH] resolve merge conflict take 2 ? --- relay/actor.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/relay/actor.py b/relay/actor.py index f4555a0..025fd37 100644 --- a/relay/actor.py +++ b/relay/actor.py @@ -335,11 +335,6 @@ async def inbox(request): logging.info('Actor not in data or request not validated') raise aiohttp.web.HTTPUnauthorized(body='access denied', content_type='text/plain') - elif instance in AP_CONFIG['blocked_instances']: - INBOUND_STATS['rejected']+=1 - logging.info('Blocked instance') - raise aiohttp.web.HTTPUnauthorized(body='access denied', content_type='text/plain') - elif data['type'] != 'Follow' and 'https://{}/inbox'.format(instance) not in DATABASE['relay-list']: logging.info('Datatype not follow or instance not in relay-list: %r',instance) if data['type'] not in ['Announce','Delete']: