diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 63dbd6245..09104fc86 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -28,13 +28,6 @@ defmodule Pleroma.Web.Router do
plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
end
- pipeline :pleroma_html do
- plug :accepts, ["html"]
- plug :fetch_session
- plug Pleroma.Plugs.OAuthPlug
- plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
- end
-
pipeline :well_known do
plug :accepts, ["xml", "xrd+xml"]
end
@@ -58,12 +51,6 @@ defmodule Pleroma.Web.Router do
get "/emoji", UtilController, :emoji
end
- scope "/", Pleroma.Web.TwitterAPI do
- pipe_through :pleroma_html
- get "/ostatus_subscribe", UtilController, :remote_follow
- post "/ostatus_subscribe", UtilController, :do_remote_follow
- end
-
scope "/api/pleroma", Pleroma.Web.TwitterAPI do
pipe_through :authenticated_api
post "/follow_import", UtilController, :follow_import
diff --git a/lib/pleroma/web/templates/twitter_api/util/follow.html.eex b/lib/pleroma/web/templates/twitter_api/util/follow.html.eex
deleted file mode 100644
index 06359fa6c..000000000
--- a/lib/pleroma/web/templates/twitter_api/util/follow.html.eex
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= if @error == :error do %>
-
Error fetching user
-<% else %>
- Remote follow
-
- <%= @name %>
- <%= form_for @conn, util_path(@conn, :do_remote_follow), [as: "user"], fn f -> %>
- <%= hidden_input f, :id, value: @id %>
- <%= submit "Authorize" %>
- <% end %>
-<% end %>
diff --git a/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex b/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex
deleted file mode 100644
index 4e3a2be67..000000000
--- a/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= if @error do %>
- <%= @error %>
-<% end %>
-Log in to follow
-<%= @name %>
-
-<%= form_for @conn, util_path(@conn, :do_remote_follow), [as: "authorization"], fn f -> %>
-<%= text_input f, :name, placeholder: "Username" %>
-
-<%= password_input f, :password, placeholder: "Password" %>
-
-<%= hidden_input f, :id, value: @id %>
-<%= submit "Authorize" %>
-<% end %>
diff --git a/lib/pleroma/web/templates/twitter_api/util/followed.html.eex b/lib/pleroma/web/templates/twitter_api/util/followed.html.eex
deleted file mode 100644
index da473d502..000000000
--- a/lib/pleroma/web/templates/twitter_api/util/followed.html.eex
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= if @error do %>
-Error following account
-<% else %>
-Account followed!
-<% end %>
-
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index a1d56e3ab..9d5654995 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -2,8 +2,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
use Pleroma.Web, :controller
require Logger
alias Pleroma.Web
- alias Pleroma.Web.OStatus
- alias Comeonin.Pbkdf2
alias Pleroma.Formatter
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.{Repo, PasswordResetToken, User}
@@ -32,52 +30,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
json(conn, "ok")
end
- def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
- {err, followee} = OStatus.find_or_make_user(acct)
- avatar = User.avatar_url(followee)
- name = followee.nickname
- id = followee.id
-
- if !!user do
- conn
- |> render("follow.html", %{error: err, acct: acct, avatar: avatar, name: name, id: id})
- else
- conn
- |> render("follow_login.html", %{error: false, acct: acct, avatar: avatar, name: name, id: id})
- end
- end
-
- def do_remote_follow(conn, %{"authorization" => %{"name" => username, "password" => password, "id" => id}}) do
- followee = Repo.get(User, id)
- avatar = User.avatar_url(followee)
- name = followee.nickname
- with %User{} = user <- User.get_cached_by_nickname(username),
- true <- Pbkdf2.checkpw(password, user.password_hash),
- %User{} = followed <- Repo.get(User, id),
- {:ok, follower} <- User.follow(user, followee),
- {:ok, _activity} <- ActivityPub.follow(follower, followee) do
- conn
- |> render("followed.html", %{error: false})
- else
- _e ->
- conn
- |> render("follow_login.html", %{error: "Wrong username or password", id: id, name: name, avatar: avatar})
- end
- end
- def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}}) do
- with %User{} = followee <- Repo.get(User, id),
- {:ok, follower} <- User.follow(user, followee),
- {:ok, _activity} <- ActivityPub.follow(follower, followee) do
- conn
- |> render("followed.html", %{error: false})
- else
- e ->
- Logger.debug("Remote follow failed with error #{inspect e}")
- conn
- |> render("followed.html", %{error: inspect(e)})
- end
- end
-
@instance Application.get_env(:pleroma, :instance)
def config(conn, _params) do
case get_format(conn) do