Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-26 04:32:51 +01:00
Code Issues Projects Releases Wiki Activity

Fediverse: Better error on unknown profile.

Browse Source
This commit is contained in:
Valentin Lorentz 2020-05-09 19:28:37 +02:00
parent e87a14826e
commit 70fa18d155
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Fediverse/activitypub.py
View File

@ -133,7 +133,7 @@ def webfinger(hostname, uri):
template = _get_webfinger_url(hostname) template = _get_webfinger_url(hostname)
assert template assert template
with convert_exceptions(WebfingerError): with convert_exceptions(ActorNotFound):
content = web.getUrlContent( content = web.getUrlContent(
template.replace("{uri}", uri), template.replace("{uri}", uri),
headers={"Accept": "application/json"}, headers={"Accept": "application/json"},

4
plugins/Fediverse/plugin.py
View File

@ -145,9 +145,9 @@ class Fediverse(callbacks.Plugin):
try: try:
actor = ap.get_actor(localuser, hostname) actor = ap.get_actor(localuser, hostname)
except ap.WebfingerError as e: except ap.ActorNotFound as e:
# Usually a 404 # Usually a 404
irc.error(e.args[0], Raise=True) irc.error("Unknown user %s." % username, Raise=True)
irc.reply( irc.reply(
_("\x02%s\x02 (@%s@%s): %s") _("\x02%s\x02 (@%s@%s): %s")

6
plugins/Fediverse/test.py
View File

@ -86,5 +86,11 @@ class FediverseTestCase(PluginTestCase):
# TODO: add a test with an instance which only allows fetches # TODO: add a test with an instance which only allows fetches
# with valid signatures. # with valid signatures.
def testProfileUnknown(self):
self.assertResponse(
"profile @nonexistinguser@oc.todon.fr",
"Error: Unknown user @nonexistinguser@oc.todon.fr.",
)
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: