No OneTemporary
Actions

Size

26 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
	index d4bc8f63d..eedad7675 100644
	--- a/lib/pleroma/application.ex
	+++ b/lib/pleroma/application.ex
	@@ -1,83 +1,82 @@
	defmodule Pleroma.Application do
	use Application

	# See http://elixir-lang.org/docs/stable/elixir/Application.html
	# for more information on OTP Applications
	def start(_type, _args) do
	import Supervisor.Spec
	import Cachex.Spec

	# Define workers and child supervisors to be supervised
	children =
	[
	- worker(Pleroma.Config, [Application.get_all_env(:pleroma)]),
	# Start the Ecto repository
	supervisor(Pleroma.Repo, []),
	worker(Pleroma.Emoji, []),
	# Start the endpoint when the application starts
	supervisor(Pleroma.Web.Endpoint, []),
	# Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
	# worker(Pleroma.Worker, [arg1, arg2, arg3]),
	worker(
	Cachex,
	[
	:user_cache,
	[
	default_ttl: 25000,
	ttl_interval: 1000,
	limit: 2500
	]
	],
	id: :cachex_user
	),
	worker(
	Cachex,
	[
	:object_cache,
	[
	default_ttl: 25000,
	ttl_interval: 1000,
	limit: 2500
	]
	],
	id: :cachex_object
	),
	worker(
	Cachex,
	[
	:idempotency_cache,
	[
	expiration:
	expiration(
	default: :timer.seconds(6 * 60 * 60),
	interval: :timer.seconds(60)
	),
	limit: 2500
	]
	],
	id: :cachex_idem
	),
	worker(Pleroma.Web.Federator, []),
	worker(Pleroma.Stats, []),
	worker(Pleroma.Gopher.Server, [])
	] ++
	if Mix.env() == :test,
	do: [],
	else:
	[worker(Pleroma.Web.Streamer, [])] ++
	if(
	!chat_enabled(),
	do: [],
	else: [worker(Pleroma.Web.ChatChannel.ChatChannelState, [])]
	)

	# See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
	# for other strategies and supported options
	opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
	Supervisor.start_link(children, opts)
	end

	defp chat_enabled do
	Application.get_env(:pleroma, :chat, []) \|> Keyword.get(:enabled)
	end
	end
	diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
	index 510d8d498..fc5338591 100644
	--- a/lib/pleroma/config.ex
	+++ b/lib/pleroma/config.ex
	@@ -1,15 +1,26 @@
	defmodule Pleroma.Config do
	- use Agent
	+ def get([key]), do: get(key)

	- def start_link(initial) do
	- Agent.start_link(fn -> initial end, name: __MODULE__)
	+ def get([parent_key \| keys]) do
	+ Application.get_env(:pleroma, parent_key)
	+ \|> get_in(keys)
	end

	- def get(path) do
	- Agent.get(__MODULE__, Kernel, :get_in, [path])
	+ def get(key) do
	+ Application.get_env(:pleroma, key)
	end

	- def put(path, value) do
	- Agent.update(__MODULE__, Kernel, :put_in, [path, value])
	+ def put([key], value), do: put(key, value)
	+
	+ def put([parent_key \| keys], value) do
	+ parent =
	+ Application.get_env(:pleroma, parent_key)
	+ \|> put_in(keys, value)
	+
	+ Application.put_env(:pleroma, parent_key, parent)
	+ end
	+
	+ def put(key, value) do
	+ Application.put_env(:pleroma, key, value)
	end
	end
	diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
	index 531e98237..47937beef 100644
	--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
	+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
	@@ -1,166 +1,165 @@
	defmodule Pleroma.Web.ActivityPub.ActivityPubController do
	use Pleroma.Web, :controller
	alias Pleroma.{User, Object}
	alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Relay
	alias Pleroma.Web.ActivityPub.Utils
	alias Pleroma.Web.Federator
	- alias Pleroma.Config

	require Logger

	action_fallback(:errors)

	plug(:relay_active? when action in [:relay])

	def relay_active?(conn, _) do
	- if Config.get([:instance, :allow_relay]) do
	+ if Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay) do
	conn
	else
	conn
	\|> put_status(404)
	\|> json(%{error: "not found"})
	\|> halt
	end
	end

	def user(conn, %{"nickname" => nickname}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("user.json", %{user: user}))
	else
	nil -> {:error, :not_found}
	end
	end

	def object(conn, %{"uuid" => uuid}) do
	with ap_id <- o_status_url(conn, :object, uuid),
	%Object{} = object <- Object.get_cached_by_ap_id(ap_id),
	{_, true} <- {:public?, ActivityPub.is_public?(object)} do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(ObjectView.render("object.json", %{object: object}))
	else
	{:public?, false} ->
	{:error, :not_found}
	end
	end

	def following(conn, %{"nickname" => nickname, "page" => page}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	{page, _} = Integer.parse(page)

	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("following.json", %{user: user, page: page}))
	end
	end

	def following(conn, %{"nickname" => nickname}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("following.json", %{user: user}))
	end
	end

	def followers(conn, %{"nickname" => nickname, "page" => page}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	{page, _} = Integer.parse(page)

	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("followers.json", %{user: user, page: page}))
	end
	end

	def followers(conn, %{"nickname" => nickname}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("followers.json", %{user: user}))
	end
	end

	def outbox(conn, %{"nickname" => nickname, "max_id" => max_id}) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("outbox.json", %{user: user, max_id: max_id}))
	end
	end

	def outbox(conn, %{"nickname" => nickname}) do
	outbox(conn, %{"nickname" => nickname, "max_id" => nil})
	end

	def inbox(%{assigns: %{valid_signature: true}} = conn, %{"nickname" => nickname} = params) do
	with %User{} = user <- User.get_cached_by_nickname(nickname),
	true <- Utils.recipient_in_message(user.ap_id, params),
	params <- Utils.maybe_splice_recipient(user.ap_id, params) do
	Federator.enqueue(:incoming_ap_doc, params)
	json(conn, "ok")
	end
	end

	def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
	Federator.enqueue(:incoming_ap_doc, params)
	json(conn, "ok")
	end

	# only accept relayed Creates
	def inbox(conn, %{"type" => "Create"} = params) do
	Logger.info(
	"Signature missing or not from author, relayed Create message, fetching object from source"
	)

	ActivityPub.fetch_object_from_id(params["object"]["id"])

	json(conn, "ok")
	end

	def inbox(conn, params) do
	headers = Enum.into(conn.req_headers, %{})

	if String.contains?(headers["signature"], params["actor"]) do
	Logger.info(
	"Signature validation error for: #{params["actor"]}, make sure you are forwarding the HTTP Host header!"
	)

	Logger.info(inspect(conn.req_headers))
	end

	json(conn, "error")
	end

	def relay(conn, params) do
	with %User{} = user <- Relay.get_actor(),
	{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> json(UserView.render("user.json", %{user: user}))
	else
	nil -> {:error, :not_found}
	end
	end

	def errors(conn, {:error, :not_found}) do
	conn
	\|> put_status(404)
	\|> json("Not found")
	end

	def errors(conn, _e) do
	conn
	\|> put_status(500)
	\|> json("error")
	end
	end
	diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
	index 9ea2507a1..01c2c89c3 100644
	--- a/lib/pleroma/web/federator/federator.ex
	+++ b/lib/pleroma/web/federator/federator.ex
	@@ -1,219 +1,218 @@
	defmodule Pleroma.Web.Federator do
	use GenServer
	alias Pleroma.User
	alias Pleroma.Activity
	alias Pleroma.Web.{WebFinger, Websub}
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Relay
	alias Pleroma.Web.ActivityPub.Transmogrifier
	alias Pleroma.Web.ActivityPub.Utils
	- alias Pleroma.Config
	require Logger

	@websub Application.get_env(:pleroma, :websub)
	@ostatus Application.get_env(:pleroma, :ostatus)
	@httpoison Application.get_env(:pleroma, :httpoison)
	@instance Application.get_env(:pleroma, :instance)
	@federating Keyword.get(@instance, :federating)
	@max_jobs 20

	def init(args) do
	{:ok, args}
	end

	def start_link do
	spawn(fn ->
	# 1 minute
	Process.sleep(1000 * 60 * 1)
	enqueue(:refresh_subscriptions, nil)
	end)

	GenServer.start_link(
	__MODULE__,
	%{
	in: {:sets.new(), []},
	out: {:sets.new(), []}
	},
	name: __MODULE__
	)
	end

	def handle(:refresh_subscriptions, _) do
	Logger.debug("Federator running refresh subscriptions")
	Websub.refresh_subscriptions()

	spawn(fn ->
	# 6 hours
	Process.sleep(1000 * 60 * 60 * 6)
	enqueue(:refresh_subscriptions, nil)
	end)
	end

	def handle(:request_subscription, websub) do
	Logger.debug("Refreshing #{websub.topic}")

	with {:ok, websub} <- Websub.request_subscription(websub) do
	Logger.debug("Successfully refreshed #{websub.topic}")
	else
	_e -> Logger.debug("Couldn't refresh #{websub.topic}")
	end
	end

	def handle(:publish, activity) do
	Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)

	with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
	{:ok, actor} = WebFinger.ensure_keys_present(actor)

	if ActivityPub.is_public?(activity) do
	Logger.info(fn -> "Sending #{activity.data["id"]} out via WebSub" end)
	Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)

	Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
	Pleroma.Web.Salmon.publish(actor, activity)

	- if Config.get([:instance, :allow_relay]) do
	+ if Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay) do
	Logger.info(fn -> "Relaying #{activity.data["id"]} out" end)
	Relay.publish(activity)
	end
	end

	Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
	Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
	end
	end

	def handle(:verify_websub, websub) do
	Logger.debug(fn ->
	"Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})"
	end)

	@websub.verify(websub)
	end

	def handle(:incoming_doc, doc) do
	Logger.info("Got document, trying to parse")
	@ostatus.handle_incoming(doc)
	end

	def handle(:incoming_ap_doc, params) do
	Logger.info("Handling incoming AP activity")

	params = Utils.normalize_params(params)

	with {:ok, _user} <- ap_enabled_actor(params["actor"]),
	nil <- Activity.normalize(params["id"]),
	{:ok, _activity} <- Transmogrifier.handle_incoming(params) do
	else
	%Activity{} ->
	Logger.info("Already had #{params["id"]}")

	_e ->
	# Just drop those for now
	Logger.info("Unhandled activity")
	Logger.info(Poison.encode!(params, pretty: 2))
	end
	end

	def handle(:publish_single_ap, params) do
	ActivityPub.publish_one(params)
	end

	def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do
	signature = @websub.sign(secret \|\| "", xml)
	Logger.debug(fn -> "Pushing #{topic} to #{callback}" end)

	with {:ok, %{status_code: code}} <-
	@httpoison.post(
	callback,
	xml,
	[
	{"Content-Type", "application/atom+xml"},
	{"X-Hub-Signature", "sha1=#{signature}"}
	],
	timeout: 10000,
	recv_timeout: 20000,
	hackney: [pool: :default]
	) do
	Logger.debug(fn -> "Pushed to #{callback}, code #{code}" end)
	else
	e ->
	Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
	end
	end

	def handle(type, _) do
	Logger.debug(fn -> "Unknown task: #{type}" end)
	{:error, "Don't know what to do with this"}
	end

	def enqueue(type, payload, priority \\ 1) do
	if @federating do
	if Mix.env() == :test do
	handle(type, payload)
	else
	GenServer.cast(__MODULE__, {:enqueue, type, payload, priority})
	end
	end
	end

	def maybe_start_job(running_jobs, queue) do
	if :sets.size(running_jobs) < @max_jobs && queue != [] do
	{{type, payload}, queue} = queue_pop(queue)
	{:ok, pid} = Task.start(fn -> handle(type, payload) end)
	mref = Process.monitor(pid)
	{:sets.add_element(mref, running_jobs), queue}
	else
	{running_jobs, queue}
	end
	end

	def handle_cast({:enqueue, type, payload, _priority}, state)
	when type in [:incoming_doc, :incoming_ap_doc] do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
	{i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def handle_cast({:enqueue, type, payload, _priority}, state) do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	o_queue = enqueue_sorted(o_queue, {type, payload}, 1)
	{o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue)
	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def handle_cast(m, state) do
	IO.inspect("Unknown: #{inspect(m)}, #{inspect(state)}")
	{:noreply, state}
	end

	def handle_info({:DOWN, ref, :process, _pid, _reason}, state) do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	i_running_jobs = :sets.del_element(ref, i_running_jobs)
	o_running_jobs = :sets.del_element(ref, o_running_jobs)
	{i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
	{o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue)

	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def enqueue_sorted(queue, element, priority) do
	[%{item: element, priority: priority} \| queue]
	\|> Enum.sort_by(fn %{priority: priority} -> priority end)
	end

	def queue_pop([%{item: element} \| queue]) do
	{element, queue}
	end

	def ap_enabled_actor(id) do
	user = User.get_by_ap_id(id)

	if User.ap_enabled?(user) do
	{:ok, user}
	else
	ActivityPub.make_user_from_ap_id(id)
	end
	end
	end
	diff --git a/test/config_test.exs b/test/config_test.exs
	index 6d0f0a2d4..32d5cc90c 100644
	--- a/test/config_test.exs
	+++ b/test/config_test.exs
	@@ -1,10 +1,39 @@
	defmodule Pleroma.ConfigTest do
	- use Pleroma.DataCase
	- alias Pleroma.Config
	+ use ExUnit.Case

	- test "get returns the item at the path if there is one" do
	- Config.put([:instance, :name], "Plemora")
	- assert Config.get([:instance, :name]) == "Plemora"
	- assert Config.get([:unknown]) == nil
	+ test "get/1 with an atom" do
	+ assert Pleroma.Config.get(:instance) == Application.get_env(:pleroma, :instance)
	+ assert Pleroma.Config.get(:azertyuiop) == nil
	+ end
	+
	+ test "get/1 with a list of keys" do
	+ assert Pleroma.Config.get([:instance, :public]) ==
	+ Keyword.get(Application.get_env(:pleroma, :instance), :public)
	+
	+ assert Pleroma.Config.get([Pleroma.Web.Endpoint, :render_errors, :view]) ==
	+ get_in(
	+ Application.get_env(
	+ :pleroma,
	+ Pleroma.Web.Endpoint
	+ ),
	+ [:render_errors, :view]
	+ )
	+
	+ assert Pleroma.Config.get([:azerty, :uiop]) == nil
	+ end
	+
	+ test "put/2 with a key" do
	+ Pleroma.Config.put(:config_test, true)
	+
	+ assert Pleroma.Config.get(:config_test) == true
	+ end
	+
	+ test "put/2 with a list of keys" do
	+ Pleroma.Config.put([:instance, :config_test], true)
	+ Pleroma.Config.put([:instance, :config_nested_test], [])
	+ Pleroma.Config.put([:instance, :config_nested_test, :x], true)
	+
	+ assert Pleroma.Config.get([:instance, :config_test]) == true
	+ assert Pleroma.Config.get([:instance, :config_nested_test, :x]) == true
	end
	end
	diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
	index 5b46bbe76..1c24b348c 100644
	--- a/test/web/activity_pub/activity_pub_controller_test.exs
	+++ b/test/web/activity_pub/activity_pub_controller_test.exs
	@@ -1,217 +1,216 @@
	defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
	use Pleroma.Web.ConnCase
	import Pleroma.Factory
	alias Pleroma.Web.ActivityPub.{UserView, ObjectView}
	alias Pleroma.{Repo, User}
	alias Pleroma.Activity
	- alias Pleroma.Config

	describe "/relay" do
	test "with the relay active, it returns the relay user", %{conn: conn} do
	- Config.put([:instance, :allow_relay], true)
	-
	res =
	conn
	\|> get(activity_pub_path(conn, :relay))
	\|> json_response(200)

	assert res["id"] =~ "/relay"
	end

	test "with the relay disabled, it returns 404", %{conn: conn} do
	- Config.put([:instance, :allow_relay], false)
	+ Pleroma.Config.put([:instance, :allow_relay], false)

	res =
	conn
	\|> get(activity_pub_path(conn, :relay))
	\|> json_response(404)
	+
	+ Pleroma.Config.put([:instance, :allow_relay], true)
	end
	end

	describe "/users/:nickname" do
	test "it returns a json representation of the user", %{conn: conn} do
	user = insert(:user)

	conn =
	conn
	\|> put_req_header("accept", "application/activity+json")
	\|> get("/users/#{user.nickname}")

	user = Repo.get(User, user.id)

	assert json_response(conn, 200) == UserView.render("user.json", %{user: user})
	end
	end

	describe "/object/:uuid" do
	test "it returns a json representation of the object", %{conn: conn} do
	note = insert(:note)
	uuid = String.split(note.data["id"], "/") \|> List.last()

	conn =
	conn
	\|> put_req_header("accept", "application/activity+json")
	\|> get("/objects/#{uuid}")

	assert json_response(conn, 200) == ObjectView.render("object.json", %{object: note})
	end

	test "it returns 404 for non-public messages", %{conn: conn} do
	note = insert(:direct_note)
	uuid = String.split(note.data["id"], "/") \|> List.last()

	conn =
	conn
	\|> put_req_header("accept", "application/activity+json")
	\|> get("/objects/#{uuid}")

	assert json_response(conn, 404)
	end
	end

	describe "/inbox" do
	test "it inserts an incoming activity into the database", %{conn: conn} do
	data = File.read!("test/fixtures/mastodon-post-activity.json") \|> Poison.decode!()

	conn =
	conn
	\|> assign(:valid_signature, true)
	\|> put_req_header("content-type", "application/activity+json")
	\|> post("/inbox", data)

	assert "ok" == json_response(conn, 200)
	:timer.sleep(500)
	assert Activity.get_by_ap_id(data["id"])
	end
	end

	describe "/users/:nickname/inbox" do
	test "it inserts an incoming activity into the database", %{conn: conn} do
	user = insert(:user)

	data =
	File.read!("test/fixtures/mastodon-post-activity.json")
	\|> Poison.decode!()
	\|> Map.put("bcc", [user.ap_id])

	conn =
	conn
	\|> assign(:valid_signature, true)
	\|> put_req_header("content-type", "application/activity+json")
	\|> post("/users/#{user.nickname}/inbox", data)

	assert "ok" == json_response(conn, 200)
	:timer.sleep(500)
	assert Activity.get_by_ap_id(data["id"])
	end
	end

	describe "/users/:nickname/outbox" do
	test "it returns a note activity in a collection", %{conn: conn} do
	note_activity = insert(:note_activity)
	user = User.get_cached_by_ap_id(note_activity.data["actor"])

	conn =
	conn
	\|> put_req_header("accept", "application/activity+json")
	\|> get("/users/#{user.nickname}/outbox")

	assert response(conn, 200) =~ note_activity.data["object"]["content"]
	end

	test "it returns an announce activity in a collection", %{conn: conn} do
	announce_activity = insert(:announce_activity)
	user = User.get_cached_by_ap_id(announce_activity.data["actor"])

	conn =
	conn
	\|> put_req_header("accept", "application/activity+json")
	\|> get("/users/#{user.nickname}/outbox")

	assert response(conn, 200) =~ announce_activity.data["object"]
	end
	end

	describe "/users/:nickname/followers" do
	test "it returns the followers in a collection", %{conn: conn} do
	user = insert(:user)
	user_two = insert(:user)
	User.follow(user, user_two)

	result =
	conn
	\|> get("/users/#{user_two.nickname}/followers")
	\|> json_response(200)

	assert result["first"]["orderedItems"] == [user.ap_id]
	end

	test "it works for more than 10 users", %{conn: conn} do
	user = insert(:user)

	Enum.each(1..15, fn _ ->
	other_user = insert(:user)
	User.follow(other_user, user)
	end)

	result =
	conn
	\|> get("/users/#{user.nickname}/followers")
	\|> json_response(200)

	assert length(result["first"]["orderedItems"]) == 10
	assert result["first"]["totalItems"] == 15
	assert result["totalItems"] == 15

	result =
	conn
	\|> get("/users/#{user.nickname}/followers?page=2")
	\|> json_response(200)

	assert length(result["orderedItems"]) == 5
	assert result["totalItems"] == 15
	end
	end

	describe "/users/:nickname/following" do
	test "it returns the following in a collection", %{conn: conn} do
	user = insert(:user)
	user_two = insert(:user)
	User.follow(user, user_two)

	result =
	conn
	\|> get("/users/#{user.nickname}/following")
	\|> json_response(200)

	assert result["first"]["orderedItems"] == [user_two.ap_id]
	end

	test "it works for more than 10 users", %{conn: conn} do
	user = insert(:user)

	Enum.each(1..15, fn _ ->
	user = Repo.get(User, user.id)
	other_user = insert(:user)
	User.follow(user, other_user)
	end)

	result =
	conn
	\|> get("/users/#{user.nickname}/following")
	\|> json_response(200)

	assert length(result["first"]["orderedItems"]) == 10
	assert result["first"]["totalItems"] == 15
	assert result["totalItems"] == 15

	result =
	conn
	\|> get("/users/#{user.nickname}/following?page=2")
	\|> json_response(200)

	assert length(result["orderedItems"]) == 5
	assert result["totalItems"] == 15
	end
	end
	end
	diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
	index 966702935..c709d1181 100644
	--- a/test/web/federator_test.exs
	+++ b/test/web/federator_test.exs
	@@ -1,65 +1,64 @@
	defmodule Pleroma.Web.FederatorTest do
	alias Pleroma.Web.Federator
	alias Pleroma.Web.CommonAPI
	- alias Pleroma.Config
	use Pleroma.DataCase
	import Pleroma.Factory
	import Mock

	test "enqueues an element according to priority" do
	queue = [%{item: 1, priority: 2}]

	new_queue = Federator.enqueue_sorted(queue, 2, 1)
	assert new_queue == [%{item: 2, priority: 1}, %{item: 1, priority: 2}]

	new_queue = Federator.enqueue_sorted(queue, 2, 3)
	assert new_queue == [%{item: 1, priority: 2}, %{item: 2, priority: 3}]
	end

	test "pop first item" do
	queue = [%{item: 2, priority: 1}, %{item: 1, priority: 2}]

	assert {2, [%{item: 1, priority: 2}]} = Federator.queue_pop(queue)
	end

	describe "Publish an activity" do
	setup do
	user = insert(:user)
	{:ok, activity} = CommonAPI.post(user, %{"status" => "HI"})

	relay_mock = {
	Pleroma.Web.ActivityPub.Relay,
	[],
	[publish: fn _activity -> send(self(), :relay_publish) end]
	}

	%{activity: activity, relay_mock: relay_mock}
	end

	test "with relays active, it publishes to the relay", %{
	activity: activity,
	relay_mock: relay_mock
	} do
	- Config.put([:instance, :allow_relay], true)
	-
	with_mocks([relay_mock]) do
	Federator.handle(:publish, activity)
	end

	assert_received :relay_publish
	end

	test "with relays deactivated, it does not publish to the relay", %{
	activity: activity,
	relay_mock: relay_mock
	} do
	- Config.put([:instance, :allow_relay], false)
	+ Pleroma.Config.put([:instance, :allow_relay], false)

	with_mocks([relay_mock]) do
	Federator.handle(:publish, activity)
	end

	refute_received :relay_publish
	+
	+ Pleroma.Config.put([:instance, :allow_relay], true)
	end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Wed, May 14, 7:13 AM (1 d, 10 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166672
Default Alt Text: (26 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions