From 8ccbeb54d7f1a2c238c6ecd6b24cd61ede3f3a19 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Thu, 14 Nov 2019 10:53:34 +0000
Subject: Show more fediverse errors to the end user

---
 modules/fediverse/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'modules/fediverse/__init__.py')

diff --git a/modules/fediverse/__init__.py b/modules/fediverse/__init__.py
index e002a2ef..362caf57 100644
--- a/modules/fediverse/__init__.py
+++ b/modules/fediverse/__init__.py
@@ -112,14 +112,15 @@ class Module(ModuleManager.BaseModule):
 
 
     def _get_from_outbox(self, username, instance):
-        actor_url = ap_utils.find_actor(username, instance)
+        try:
+            actor_url = ap_utils.find_actor(username, instance)
+        except ap_utils.FindActorException as e:
+            raise utils.EventError(str(e))
 
-        if not actor_url:
-            raise utils.EventError("Failed to find user")
 
         actor = ap_actor.Actor(actor_url)
         if not actor.load():
-            raise utils.EventError("Failed to find user")
+            raise utils.EventError("Failed to load user")
 
         items = actor.outbox.load()
         nonreply = [actor.followers]
-- 
cgit v1.3.1-10-gc9f91