aboutsummaryrefslogtreecommitdiff
path: root/modules/fediverse/__init__.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-11-14 10:53:34 +0000
committerGravatar jesopo2019-11-14 10:53:34 +0000
commit8ccbeb54d7f1a2c238c6ecd6b24cd61ede3f3a19 (patch)
tree48630e3c751daed7aea63ac6af29f25f21b4d1bc /modules/fediverse/__init__.py
parentchange formatted JOIN to have userhost in parens (diff)
signature
Show more fediverse errors to the end user
Diffstat (limited to 'modules/fediverse/__init__.py')
-rw-r--r--modules/fediverse/__init__.py9
1 files changed, 5 insertions, 4 deletions
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]