processing: better error responses

This commit is contained in:
Izalia Mae 2021-09-19 17:58:35 -04:00
parent 3cbee693a2
commit abfce89435
2 changed files with 8 additions and 9 deletions

View file

@ -22,19 +22,14 @@ class ProcessData:
self.type = data.type.lower()
self.data = data
if not self.actor:
logging.verbose(f'Failed to fetch actor: {data.actor}')
self.new_response = response.text('Failed to fetch actor.', status=401)
return
@property
def func(self):
return getattr(self, f'cmd_{self.type}')
def error(self, *message):
self.new_response = self.response.json({'error': ' '.join(message)})
def error(self, message, status=500):
self.new_response = self.response.json({'error': message}, status=status)
def cmd_follow(self):
@ -61,7 +56,7 @@ class ProcessData:
if not self.instance:
logging.error(f'Something messed up when inserting "{self.signature.domain}" into the database')
return self.response.json('Internal error', status=500)
return self.error('Internal error', 500)
message = Message('accept', self.data.id, self.instance.actor)
resp = message.send(self.instance.inbox)

View file

@ -127,12 +127,16 @@ class UnciaActor(View):
async def post(self, request, response):
if not request.ctx.actor:
logging.verbose(f'Failed to fetch actor')
return response.json({'error': 'Failed to fetch actor'})
processor = ProcessData(request, response, request.data.json)
try:
data = processor.func()
except AttributeError:
return processor.error('Message type unhandled:', processor.type)
return processor.error(f'Message type unhandled: {processor.type}', 401)
return data or response.text('UvU', status=202)