pch_xyz/sedi-relay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflict take 2 ?

Browse source
This commit is contained in:
gled 2019-07-25 12:13:56 -07:00
parent 78e3130bc7
commit 0b122b0d32
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
relay/actor.py
View file

@ -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']: