diff options
author | eal <eal@waifu.club> | 2018-01-18 03:42:18 +0200 |
---|---|---|
committer | eal <eal@waifu.club> | 2018-01-18 03:42:18 +0200 |
commit | b259b4e4d1dc27528b99744fffabfb05c676ec3f (patch) | |
tree | 499bf53955d6a21f92ce2010e3e62f79438cbff6 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
parent | fb5aa34092cf8aa04b3b7001e81cf1585ee0041a (diff) | |
download | pleroma-b259b4e4d1dc27528b99744fffabfb05c676ec3f.tar.gz |
Revert "Add remote follow pages."
This reverts commit 47e8c8db05dbe1f9d0ad7790be9ae9ed40f4e909.
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 48 |
1 files changed, 0 insertions, 48 deletions
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 |