commit: 9de614573754c9a1ae9d1b58399fafcc78ee5286
parent: ae9c4983d7873323a48bba45241d6bcce9fa7fb3
Author: lambda <pleromagit@rogerbraun.net>
Date: Sun, 12 Aug 2018 10:55:53 +0000
Merge branch 'fix/remote-follow-errormessage' into 'develop'
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
Diffstat:
1 file changed, 9 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -99,6 +99,10 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
conn
|> render("followed.html", %{error: false})
else
+ # Was already following user
+ {:error, "Could not follow user:" <> _rest} ->
+ render(conn, "followed.html", %{error: false})
+
_e ->
conn
|> render("follow_login.html", %{
@@ -117,6 +121,11 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
conn
|> render("followed.html", %{error: false})
else
+ # Was already following user
+ {:error, "Could not follow user:" <> _rest} ->
+ conn
+ |> render("followed.html", %{error: false})
+
e ->
Logger.debug("Remote follow failed with error #{inspect(e)}")