processing: better error responses

uncia/functions.py

@@ -44,7 +44,7 @@ def fetch_actor(url):
 		return data
 
 
-def fetch(url, sign=False, cache=True):
+def fetch(url, sign=False, headers={}, cache=True):
 	cached_data = fetch_cache.fetch(url)
 
 	if cached_data and cache:
@@ -54,7 +54,8 @@ def fetch(url, sign=False, cache=True):
 		with db.session as s:
 			response = client.request(url,
 				privkey = s.get.config('privkey'),
-				keyid = f'https://{config.host}/actor#main-key'
+				keyid = f'https://{config.host}/actor#main-key',
+				headers = {}
 			)
 
 	else:
@@ -89,7 +90,7 @@ def get_inbox(actor):
 		return actor.inbox
 
 
-def push_message(inbox, message):
+def push_message(inbox, message, headers={}):
 	with db.session as s:
 		try:
 			response = client.request(

uncia/processing.py

@@ -22,12 +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.json('Failed to fetch actor.', status=401)
-			return
 
-		self.new_response = getattr(self, f'cmd_{self.type}')()
+	@property
+	def func(self):
+		return getattr(self, f'cmd_{self.type}')
+
+
+	def error(self, message, status=500):
+		self.new_response = self.response.json({'error': message}, status=status)
 
 
 	def cmd_follow(self):
@@ -54,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)
@@ -127,3 +129,7 @@ class ProcessData:
 
 	def cmd_create(self):
 		return self.cmd_announce()
+
+
+	#def cmd_delete(self):
+		#pass

uncia/views.py

@@ -127,11 +127,18 @@ class UnciaActor(View):
 
 
 	async def post(self, request, response):
-		data = ProcessData(request, response, request.data.json)
+		if not request.ctx.actor:
+			logging.verbose(f'Failed to fetch actor')
+			return response.json({'error': 'Failed to fetch actor'})
 
-		# return error to let mastodon retry instead of having to re-add relay
-		return data.new_response or response.text('UvU', status=202)
-		#return response.text('Merp! uvu')
+		processor = ProcessData(request, response, request.data.json)
+
+		try:
+			data = processor.func()
+		except AttributeError:
+			return processor.error(f'Message type unhandled: {processor.type}', 401)
+
+		return data or response.text('UvU', status=202)
 
 
 class UnciaNodeinfo(View):