Merge branch 'test/twitter/util_controller' into 'develop'
tests for TwitterApi/UtilController See merge request pleroma/pleroma!1509
This commit is contained in:
commit
957de9d771
@ -226,6 +226,7 @@ defmodule Pleroma.User do
|
|||||||
|> put_password_hash
|
|> put_password_hash
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec reset_password(User.t(), map) :: {:ok, User.t()} | {:error, Ecto.Changeset.t()}
|
||||||
def reset_password(%User{id: user_id} = user, data) do
|
def reset_password(%User{id: user_id} = user, data) do
|
||||||
multi =
|
multi =
|
||||||
Multi.new()
|
Multi.new()
|
||||||
@ -330,6 +331,7 @@ defmodule Pleroma.User do
|
|||||||
|
|
||||||
def needs_update?(_), do: true
|
def needs_update?(_), do: true
|
||||||
|
|
||||||
|
@spec maybe_direct_follow(User.t(), User.t()) :: {:ok, User.t()} | {:error, String.t()}
|
||||||
def maybe_direct_follow(%User{} = follower, %User{local: true, info: %{locked: true}}) do
|
def maybe_direct_follow(%User{} = follower, %User{local: true, info: %{locked: true}}) do
|
||||||
{:ok, follower}
|
{:ok, follower}
|
||||||
end
|
end
|
||||||
|
@ -18,6 +18,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
alias Pleroma.Web.CommonAPI
|
alias Pleroma.Web.CommonAPI
|
||||||
alias Pleroma.Web.WebFinger
|
alias Pleroma.Web.WebFinger
|
||||||
|
|
||||||
|
plug(Pleroma.Plugs.SetFormatPlug when action in [:config, :version])
|
||||||
|
|
||||||
def help_test(conn, _params) do
|
def help_test(conn, _params) do
|
||||||
json(conn, "ok")
|
json(conn, "ok")
|
||||||
end
|
end
|
||||||
@ -58,27 +60,25 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
%Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"])
|
%Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"])
|
||||||
redirect(conn, to: "/notice/#{activity_id}")
|
redirect(conn, to: "/notice/#{activity_id}")
|
||||||
else
|
else
|
||||||
{err, followee} = User.get_or_fetch(acct)
|
with {:ok, followee} <- User.get_or_fetch(acct) do
|
||||||
avatar = User.avatar_url(followee)
|
|
||||||
name = followee.nickname
|
|
||||||
id = followee.id
|
|
||||||
|
|
||||||
if !!user do
|
|
||||||
conn
|
conn
|
||||||
|> render("follow.html", %{error: err, acct: acct, avatar: avatar, name: name, id: id})
|
|> render(follow_template(user), %{
|
||||||
else
|
|
||||||
conn
|
|
||||||
|> render("follow_login.html", %{
|
|
||||||
error: false,
|
error: false,
|
||||||
acct: acct,
|
acct: acct,
|
||||||
avatar: avatar,
|
avatar: User.avatar_url(followee),
|
||||||
name: name,
|
name: followee.nickname,
|
||||||
id: id
|
id: followee.id
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
{:error, _reason} ->
|
||||||
|
render(conn, follow_template(user), %{error: :error})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp follow_template(%User{} = _user), do: "follow.html"
|
||||||
|
defp follow_template(_), do: "follow_login.html"
|
||||||
|
|
||||||
defp is_status?(acct) do
|
defp is_status?(acct) do
|
||||||
case Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(acct) do
|
case Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(acct) do
|
||||||
{:ok, %{"type" => type}} when type in ["Article", "Note", "Video", "Page", "Question"] ->
|
{:ok, %{"type" => type}} when type in ["Article", "Note", "Video", "Page", "Question"] ->
|
||||||
@ -92,48 +92,53 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
def do_remote_follow(conn, %{
|
def do_remote_follow(conn, %{
|
||||||
"authorization" => %{"name" => username, "password" => password, "id" => id}
|
"authorization" => %{"name" => username, "password" => password, "id" => id}
|
||||||
}) do
|
}) do
|
||||||
followee = User.get_cached_by_id(id)
|
with %User{} = followee <- User.get_cached_by_id(id),
|
||||||
avatar = User.avatar_url(followee)
|
{_, %User{} = user, _} <- {:auth, User.get_cached_by_nickname(username), followee},
|
||||||
name = followee.nickname
|
{_, true, _} <- {
|
||||||
|
:auth,
|
||||||
with %User{} = user <- User.get_cached_by_nickname(username),
|
AuthenticationPlug.checkpw(password, user.password_hash),
|
||||||
true <- AuthenticationPlug.checkpw(password, user.password_hash),
|
followee
|
||||||
%User{} = _followed <- User.get_cached_by_id(id),
|
},
|
||||||
{:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
|
{:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
|
||||||
conn
|
conn
|
||||||
|> render("followed.html", %{error: false})
|
|> render("followed.html", %{error: false})
|
||||||
else
|
else
|
||||||
# Was already following user
|
# Was already following user
|
||||||
{:error, "Could not follow user:" <> _rest} ->
|
{:error, "Could not follow user:" <> _rest} ->
|
||||||
render(conn, "followed.html", %{error: false})
|
render(conn, "followed.html", %{error: "Error following account"})
|
||||||
|
|
||||||
_e ->
|
{:auth, _, followee} ->
|
||||||
conn
|
conn
|
||||||
|> render("follow_login.html", %{
|
|> render("follow_login.html", %{
|
||||||
error: "Wrong username or password",
|
error: "Wrong username or password",
|
||||||
id: id,
|
id: id,
|
||||||
name: name,
|
name: followee.nickname,
|
||||||
avatar: avatar
|
avatar: User.avatar_url(followee)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
e ->
|
||||||
|
Logger.debug("Remote follow failed with error #{inspect(e)}")
|
||||||
|
render(conn, "followed.html", %{error: "Something went wrong."})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}}) do
|
def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}}) do
|
||||||
with %User{} = followee <- User.get_cached_by_id(id),
|
with {:fetch_user, %User{} = followee} <- {:fetch_user, User.get_cached_by_id(id)},
|
||||||
{:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
|
{:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
|
||||||
conn
|
conn
|
||||||
|> render("followed.html", %{error: false})
|
|> render("followed.html", %{error: false})
|
||||||
else
|
else
|
||||||
# Was already following user
|
# Was already following user
|
||||||
{:error, "Could not follow user:" <> _rest} ->
|
{:error, "Could not follow user:" <> _rest} ->
|
||||||
conn
|
render(conn, "followed.html", %{error: "Error following account"})
|
||||||
|> render("followed.html", %{error: false})
|
|
||||||
|
{:fetch_user, error} ->
|
||||||
|
Logger.debug("Remote follow failed with error #{inspect(error)}")
|
||||||
|
render(conn, "followed.html", %{error: "Could not find user"})
|
||||||
|
|
||||||
e ->
|
e ->
|
||||||
Logger.debug("Remote follow failed with error #{inspect(e)}")
|
Logger.debug("Remote follow failed with error #{inspect(e)}")
|
||||||
|
render(conn, "followed.html", %{error: "Something went wrong."})
|
||||||
conn
|
|
||||||
|> render("followed.html", %{error: inspect(e)})
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -148,67 +153,70 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def config(%{assigns: %{format: "xml"}} = conn, _params) do
|
||||||
|
instance = Pleroma.Config.get(:instance)
|
||||||
|
|
||||||
|
response = """
|
||||||
|
<config>
|
||||||
|
<site>
|
||||||
|
<name>#{Keyword.get(instance, :name)}</name>
|
||||||
|
<site>#{Web.base_url()}</site>
|
||||||
|
<textlimit>#{Keyword.get(instance, :limit)}</textlimit>
|
||||||
|
<closed>#{!Keyword.get(instance, :registrations_open)}</closed>
|
||||||
|
</site>
|
||||||
|
</config>
|
||||||
|
"""
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> put_resp_content_type("application/xml")
|
||||||
|
|> send_resp(200, response)
|
||||||
|
end
|
||||||
|
|
||||||
def config(conn, _params) do
|
def config(conn, _params) do
|
||||||
instance = Pleroma.Config.get(:instance)
|
instance = Pleroma.Config.get(:instance)
|
||||||
|
|
||||||
case get_format(conn) do
|
vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
|
||||||
"xml" ->
|
|
||||||
response = """
|
|
||||||
<config>
|
|
||||||
<site>
|
|
||||||
<name>#{Keyword.get(instance, :name)}</name>
|
|
||||||
<site>#{Web.base_url()}</site>
|
|
||||||
<textlimit>#{Keyword.get(instance, :limit)}</textlimit>
|
|
||||||
<closed>#{!Keyword.get(instance, :registrations_open)}</closed>
|
|
||||||
</site>
|
|
||||||
</config>
|
|
||||||
"""
|
|
||||||
|
|
||||||
conn
|
uploadlimit = %{
|
||||||
|> put_resp_content_type("application/xml")
|
uploadlimit: to_string(Keyword.get(instance, :upload_limit)),
|
||||||
|> send_resp(200, response)
|
avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
|
||||||
|
backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
|
||||||
|
bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
|
||||||
|
}
|
||||||
|
|
||||||
_ ->
|
data = %{
|
||||||
vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
|
name: Keyword.get(instance, :name),
|
||||||
|
description: Keyword.get(instance, :description),
|
||||||
|
server: Web.base_url(),
|
||||||
|
textlimit: to_string(Keyword.get(instance, :limit)),
|
||||||
|
uploadlimit: uploadlimit,
|
||||||
|
closed: bool_to_val(Keyword.get(instance, :registrations_open), "0", "1"),
|
||||||
|
private: bool_to_val(Keyword.get(instance, :public, true), "0", "1"),
|
||||||
|
vapidPublicKey: vapid_public_key,
|
||||||
|
accountActivationRequired:
|
||||||
|
bool_to_val(Keyword.get(instance, :account_activation_required, false)),
|
||||||
|
invitesEnabled: bool_to_val(Keyword.get(instance, :invites_enabled, false)),
|
||||||
|
safeDMMentionsEnabled: bool_to_val(Pleroma.Config.get([:instance, :safe_dm_mentions]))
|
||||||
|
}
|
||||||
|
|
||||||
uploadlimit = %{
|
managed_config = Keyword.get(instance, :managed_config)
|
||||||
uploadlimit: to_string(Keyword.get(instance, :upload_limit)),
|
|
||||||
avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
|
|
||||||
backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
|
|
||||||
bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
|
|
||||||
}
|
|
||||||
|
|
||||||
data = %{
|
|
||||||
name: Keyword.get(instance, :name),
|
|
||||||
description: Keyword.get(instance, :description),
|
|
||||||
server: Web.base_url(),
|
|
||||||
textlimit: to_string(Keyword.get(instance, :limit)),
|
|
||||||
uploadlimit: uploadlimit,
|
|
||||||
closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
|
|
||||||
private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
|
|
||||||
vapidPublicKey: vapid_public_key,
|
|
||||||
accountActivationRequired:
|
|
||||||
if(Keyword.get(instance, :account_activation_required, false), do: "1", else: "0"),
|
|
||||||
invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"),
|
|
||||||
safeDMMentionsEnabled:
|
|
||||||
if(Pleroma.Config.get([:instance, :safe_dm_mentions]), do: "1", else: "0")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
data =
|
||||||
|
if managed_config do
|
||||||
pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
|
pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
|
||||||
|
Map.put(data, "pleromafe", pleroma_fe)
|
||||||
|
else
|
||||||
|
data
|
||||||
|
end
|
||||||
|
|
||||||
managed_config = Keyword.get(instance, :managed_config)
|
json(conn, %{site: data})
|
||||||
|
|
||||||
data =
|
|
||||||
if managed_config do
|
|
||||||
data |> Map.put("pleromafe", pleroma_fe)
|
|
||||||
else
|
|
||||||
data
|
|
||||||
end
|
|
||||||
|
|
||||||
json(conn, %{site: data})
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp bool_to_val(true), do: "1"
|
||||||
|
defp bool_to_val(_), do: "0"
|
||||||
|
defp bool_to_val(true, val, _), do: val
|
||||||
|
defp bool_to_val(_, _, val), do: val
|
||||||
|
|
||||||
def frontend_configurations(conn, _params) do
|
def frontend_configurations(conn, _params) do
|
||||||
config =
|
config =
|
||||||
Pleroma.Config.get(:frontend_configurations, %{})
|
Pleroma.Config.get(:frontend_configurations, %{})
|
||||||
@ -217,20 +225,16 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
json(conn, config)
|
json(conn, config)
|
||||||
end
|
end
|
||||||
|
|
||||||
def version(conn, _params) do
|
def version(%{assigns: %{format: "xml"}} = conn, _params) do
|
||||||
version = Pleroma.Application.named_version()
|
version = Pleroma.Application.named_version()
|
||||||
|
|
||||||
case get_format(conn) do
|
conn
|
||||||
"xml" ->
|
|> put_resp_content_type("application/xml")
|
||||||
response = "<version>#{version}</version>"
|
|> send_resp(200, "<version>#{version}</version>")
|
||||||
|
end
|
||||||
|
|
||||||
conn
|
def version(conn, _params) do
|
||||||
|> put_resp_content_type("application/xml")
|
json(conn, Pleroma.Application.named_version())
|
||||||
|> send_resp(200, response)
|
|
||||||
|
|
||||||
_ ->
|
|
||||||
json(conn, version)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def emoji(conn, _params) do
|
def emoji(conn, _params) do
|
||||||
|
@ -51,6 +51,10 @@ defmodule HttpRequestMock do
|
|||||||
}}
|
}}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get("https://mastodon.social/users/not_found", _, _, _) do
|
||||||
|
{:ok, %Tesla.Env{status: 404}}
|
||||||
|
end
|
||||||
|
|
||||||
def get("https://mastodon.sdf.org/users/rinpatch", _, _, _) do
|
def get("https://mastodon.sdf.org/users/rinpatch", _, _, _) do
|
||||||
{:ok,
|
{:ok,
|
||||||
%Tesla.Env{
|
%Tesla.Env{
|
||||||
|
@ -14,6 +14,17 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|
|
||||||
setup do
|
setup do
|
||||||
Tesla.Mock.mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
|
Tesla.Mock.mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
|
||||||
|
|
||||||
|
instance_config = Pleroma.Config.get([:instance])
|
||||||
|
pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
|
||||||
|
deny_follow_blocked = Pleroma.Config.get([:user, :deny_follow_blocked])
|
||||||
|
|
||||||
|
on_exit(fn ->
|
||||||
|
Pleroma.Config.put([:instance], instance_config)
|
||||||
|
Pleroma.Config.put([:frontend_configurations, :pleroma_fe], pleroma_fe)
|
||||||
|
Pleroma.Config.put([:user, :deny_follow_blocked], deny_follow_blocked)
|
||||||
|
end)
|
||||||
|
|
||||||
:ok
|
:ok
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -31,6 +42,35 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
assert response == "job started"
|
assert response == "job started"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it imports follow lists from file", %{conn: conn} do
|
||||||
|
user1 = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
with_mocks([
|
||||||
|
{File, [],
|
||||||
|
read!: fn "follow_list.txt" ->
|
||||||
|
"Account address,Show boosts\n#{user2.ap_id},true"
|
||||||
|
end},
|
||||||
|
{PleromaJobQueue, [:passthrough], []}
|
||||||
|
]) do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user1)
|
||||||
|
|> post("/api/pleroma/follow_import", %{"list" => %Plug.Upload{path: "follow_list.txt"}})
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert called(
|
||||||
|
PleromaJobQueue.enqueue(
|
||||||
|
:background,
|
||||||
|
User,
|
||||||
|
[:follow_import, user1, [user2.ap_id]]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response == "job started"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
test "it imports new-style mastodon follow lists", %{conn: conn} do
|
test "it imports new-style mastodon follow lists", %{conn: conn} do
|
||||||
user1 = insert(:user)
|
user1 = insert(:user)
|
||||||
user2 = insert(:user)
|
user2 = insert(:user)
|
||||||
@ -79,6 +119,33 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|
|
||||||
assert response == "job started"
|
assert response == "job started"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it imports blocks users from file", %{conn: conn} do
|
||||||
|
user1 = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
user3 = insert(:user)
|
||||||
|
|
||||||
|
with_mocks([
|
||||||
|
{File, [], read!: fn "blocks_list.txt" -> "#{user2.ap_id} #{user3.ap_id}" end},
|
||||||
|
{PleromaJobQueue, [:passthrough], []}
|
||||||
|
]) do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user1)
|
||||||
|
|> post("/api/pleroma/blocks_import", %{"list" => %Plug.Upload{path: "blocks_list.txt"}})
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert called(
|
||||||
|
PleromaJobQueue.enqueue(
|
||||||
|
:background,
|
||||||
|
User,
|
||||||
|
[:blocks_import, user1, [user2.ap_id, user3.ap_id]]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response == "job started"
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST /api/pleroma/notifications/read" do
|
describe "POST /api/pleroma/notifications/read" do
|
||||||
@ -98,6 +165,18 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
assert Repo.get(Notification, notification1.id).seen
|
assert Repo.get(Notification, notification1.id).seen
|
||||||
refute Repo.get(Notification, notification2.id).seen
|
refute Repo.get(Notification, notification2.id).seen
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it returns error when notification not found", %{conn: conn} do
|
||||||
|
user1 = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user1)
|
||||||
|
|> post("/api/pleroma/notifications/read", %{"id" => "22222222222222"})
|
||||||
|
|> json_response(403)
|
||||||
|
|
||||||
|
assert response == %{"error" => "Cannot get notification"}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "PUT /api/pleroma/notification_settings" do
|
describe "PUT /api/pleroma/notification_settings" do
|
||||||
@ -123,7 +202,63 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /api/statusnet/config.json" do
|
describe "GET /api/statusnet/config" do
|
||||||
|
test "it returns config in xml format", %{conn: conn} do
|
||||||
|
instance = Pleroma.Config.get(:instance)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("accept", "application/xml")
|
||||||
|
|> get("/api/statusnet/config")
|
||||||
|
|> response(:ok)
|
||||||
|
|
||||||
|
assert response ==
|
||||||
|
"<config>\n<site>\n<name>#{Keyword.get(instance, :name)}</name>\n<site>#{
|
||||||
|
Pleroma.Web.base_url()
|
||||||
|
}</site>\n<textlimit>#{Keyword.get(instance, :limit)}</textlimit>\n<closed>#{
|
||||||
|
!Keyword.get(instance, :registrations_open)
|
||||||
|
}</closed>\n</site>\n</config>\n"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it returns config in json format", %{conn: conn} do
|
||||||
|
instance = Pleroma.Config.get(:instance)
|
||||||
|
Pleroma.Config.put([:instance, :managed_config], true)
|
||||||
|
Pleroma.Config.put([:instance, :registrations_open], false)
|
||||||
|
Pleroma.Config.put([:instance, :invites_enabled], true)
|
||||||
|
Pleroma.Config.put([:instance, :public], false)
|
||||||
|
Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("accept", "application/json")
|
||||||
|
|> get("/api/statusnet/config")
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
expected_data = %{
|
||||||
|
"site" => %{
|
||||||
|
"accountActivationRequired" => "0",
|
||||||
|
"closed" => "1",
|
||||||
|
"description" => Keyword.get(instance, :description),
|
||||||
|
"invitesEnabled" => "1",
|
||||||
|
"name" => Keyword.get(instance, :name),
|
||||||
|
"pleromafe" => %{"theme" => "asuka-hospital"},
|
||||||
|
"private" => "1",
|
||||||
|
"safeDMMentionsEnabled" => "0",
|
||||||
|
"server" => Pleroma.Web.base_url(),
|
||||||
|
"textlimit" => to_string(Keyword.get(instance, :limit)),
|
||||||
|
"uploadlimit" => %{
|
||||||
|
"avatarlimit" => to_string(Keyword.get(instance, :avatar_upload_limit)),
|
||||||
|
"backgroundlimit" => to_string(Keyword.get(instance, :background_upload_limit)),
|
||||||
|
"bannerlimit" => to_string(Keyword.get(instance, :banner_upload_limit)),
|
||||||
|
"uploadlimit" => to_string(Keyword.get(instance, :upload_limit))
|
||||||
|
},
|
||||||
|
"vapidPublicKey" => Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert response == expected_data
|
||||||
|
end
|
||||||
|
|
||||||
test "returns the state of safe_dm_mentions flag", %{conn: conn} do
|
test "returns the state of safe_dm_mentions flag", %{conn: conn} do
|
||||||
option = Pleroma.Config.get([:instance, :safe_dm_mentions])
|
option = Pleroma.Config.get([:instance, :safe_dm_mentions])
|
||||||
Pleroma.Config.put([:instance, :safe_dm_mentions], true)
|
Pleroma.Config.put([:instance, :safe_dm_mentions], true)
|
||||||
@ -210,7 +345,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /ostatus_subscribe?acct=...." do
|
describe "GET /ostatus_subscribe - remote_follow/2" do
|
||||||
test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do
|
test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do
|
||||||
conn =
|
conn =
|
||||||
get(
|
get(
|
||||||
@ -230,6 +365,172 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|
|
||||||
assert html_response(response, 200) =~ "Log in to follow"
|
assert html_response(response, 200) =~ "Log in to follow"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "show follow page if the `acct` is a account link", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/ostatus_subscribe?acct=https://mastodon.social/users/emelie")
|
||||||
|
|
||||||
|
assert html_response(response, 200) =~ "Remote follow"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "show follow page with error when user cannot fecth by `acct` link", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/ostatus_subscribe?acct=https://mastodon.social/users/not_found")
|
||||||
|
|
||||||
|
assert html_response(response, 200) =~ "Error fetching user"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "POST /ostatus_subscribe - do_remote_follow/2 with assigned user " do
|
||||||
|
test "follows user", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Account followed!"
|
||||||
|
assert user2.follower_address in refresh_record(user).following
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when user is deactivated", %{conn: conn} do
|
||||||
|
user = insert(:user, info: %{deactivated: true})
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Error following account"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when user is blocked", %{conn: conn} do
|
||||||
|
Pleroma.Config.put([:user, :deny_follow_blocked], true)
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
{:ok, _user} = Pleroma.User.block(user2, user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Error following account"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when followee not found", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/ostatus_subscribe", %{"user" => %{"id" => "jimm"}})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Error following account"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns success result when user already in followers", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
{:ok, _, _, _} = CommonAPI.follow(user, user2)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, refresh_record(user))
|
||||||
|
|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Account followed!"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "POST /ostatus_subscribe - do_remote_follow/2 without assigned user " do
|
||||||
|
test "follows", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/ostatus_subscribe", %{
|
||||||
|
"authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
|
||||||
|
})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Account followed!"
|
||||||
|
assert user2.follower_address in refresh_record(user).following
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when followee not found", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/ostatus_subscribe", %{
|
||||||
|
"authorization" => %{"name" => user.nickname, "password" => "test", "id" => "jimm"}
|
||||||
|
})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Error following account"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when login invalid", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/ostatus_subscribe", %{
|
||||||
|
"authorization" => %{"name" => "jimm", "password" => "test", "id" => user.id}
|
||||||
|
})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Wrong username or password"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when password invalid", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/ostatus_subscribe", %{
|
||||||
|
"authorization" => %{"name" => user.nickname, "password" => "42", "id" => user2.id}
|
||||||
|
})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Wrong username or password"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when user is blocked", %{conn: conn} do
|
||||||
|
Pleroma.Config.put([:user, :deny_follow_blocked], true)
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user)
|
||||||
|
{:ok, _user} = Pleroma.User.block(user2, user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/ostatus_subscribe", %{
|
||||||
|
"authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
|
||||||
|
})
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert response =~ "Error following account"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /api/pleroma/healthcheck" do
|
describe "GET /api/pleroma/healthcheck" do
|
||||||
@ -311,5 +612,104 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|
|
||||||
assert user.info.deactivated == true
|
assert user.info.deactivated == true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it returns returns when password invalid", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/api/pleroma/disable_account", %{"password" => "test1"})
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert response == %{"error" => "Invalid password."}
|
||||||
|
user = User.get_cached_by_id(user.id)
|
||||||
|
|
||||||
|
refute user.info.deactivated
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "GET /api/statusnet/version" do
|
||||||
|
test "it returns version in xml format", %{conn: conn} do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("accept", "application/xml")
|
||||||
|
|> get("/api/statusnet/version")
|
||||||
|
|> response(:ok)
|
||||||
|
|
||||||
|
assert response == "<version>#{Pleroma.Application.named_version()}</version>"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it returns version in json format", %{conn: conn} do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("accept", "application/json")
|
||||||
|
|> get("/api/statusnet/version")
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert response == "#{Pleroma.Application.named_version()}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "POST /main/ostatus - remote_subscribe/2" do
|
||||||
|
test "renders subscribe form", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/main/ostatus", %{"nickname" => user.nickname, "profile" => ""})
|
||||||
|
|> response(:ok)
|
||||||
|
|
||||||
|
refute response =~ "Could not find user"
|
||||||
|
assert response =~ "Remotely follow #{user.nickname}"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "renders subscribe form with error when user not found", %{conn: conn} do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/main/ostatus", %{"nickname" => "nickname", "profile" => ""})
|
||||||
|
|> response(:ok)
|
||||||
|
|
||||||
|
assert response =~ "Could not find user"
|
||||||
|
refute response =~ "Remotely follow"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it redirect to webfinger url", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
user2 = insert(:user, ap_id: "shp@social.heldscal.la")
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> post("/main/ostatus", %{
|
||||||
|
"user" => %{"nickname" => user.nickname, "profile" => user2.ap_id}
|
||||||
|
})
|
||||||
|
|
||||||
|
assert redirected_to(conn) ==
|
||||||
|
"https://social.heldscal.la/main/ostatussub?profile=#{user.ap_id}"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it renders form with error when use not found", %{conn: conn} do
|
||||||
|
user2 = insert(:user, ap_id: "shp@social.heldscal.la")
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> post("/main/ostatus", %{"user" => %{"nickname" => "jimm", "profile" => user2.ap_id}})
|
||||||
|
|> response(:ok)
|
||||||
|
|
||||||
|
assert response =~ "Something went wrong."
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it returns new captcha", %{conn: conn} do
|
||||||
|
with_mock Pleroma.Captcha,
|
||||||
|
new: fn -> "test_captcha" end do
|
||||||
|
resp =
|
||||||
|
conn
|
||||||
|
|> get("/api/pleroma/captcha")
|
||||||
|
|> response(200)
|
||||||
|
|
||||||
|
assert resp == "\"test_captcha\""
|
||||||
|
assert called(Pleroma.Captcha.new())
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user