From feaf0d5e52ec8d2887b2d14e3bcd3bfc49446cf4 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 29 Nov 2021 07:11:57 +1100
Subject: [PATCH] handle username errors in remote follow form

---
 bookwyrm/templates/ostatus/error.html | 5 +++++
 bookwyrm/views/follow.py              | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html
index b6e858e2..cb1aec40 100644
--- a/bookwyrm/templates/ostatus/error.html
+++ b/bookwyrm/templates/ostatus/error.html
@@ -33,6 +33,11 @@
         <p>{% blocktrans %}Something went wrong trying to follow <strong>{{ account }}</strong>{% endblocktrans %}</p>
         <p>{% trans 'Check you have the correct username before trying again.' %}</p>
     </div>
+    {% elif error == 'remote_subscribe' %}
+    <div class="notification is-warning has-text-centered">
+        <p>{% blocktrans %}Something went wrong trying to follow from <strong>{{ account }}</strong>{% endblocktrans %}</p>
+        <p>{% trans 'Check you have the correct username before trying again.' %}</p>
+    </div>
     {% elif error == 'is_blocked' %}
     <div class="notification is-danger has-text-centered">
         <p>{% blocktrans %}You have blocked <strong>{{ account }}</strong>{% endblocktrans %}</p>
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index 58d97985..fcab5d6a 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -148,5 +148,8 @@ def remote_follow(request):
     """direct user to follow from remote account using ostatus subscribe protocol"""
     remote_user = request.POST.get("remote_user")
     template = subscribe_remote_webfinger(remote_user)
+    if template is None:
+        data = {"account": remote_user, "user": None, "error": "remote_subscribe"}
+        return TemplateResponse(request, "ostatus/subscribe.html", data)
     url = template.replace("{uri}", request.POST.get("user"))
     return redirect(url)