No OneTemporary
Actions

Size

128 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
	index d681eecc8..2b6a55f98 100644
	--- a/lib/pleroma/application.ex
	+++ b/lib/pleroma/application.ex
	@@ -1,182 +1,183 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Application do
	import Cachex.Spec
	use Application

	@name Mix.Project.config()[:name]
	@version Mix.Project.config()[:version]
	@repository Mix.Project.config()[:source_url]
	@env Mix.env()

	def name, do: @name
	def version, do: @version
	def named_version, do: @name <> " " <> @version
	def repository, do: @repository

	def user_agent do
	info = "#{Pleroma.Web.base_url()} <#{Pleroma.Config.get([:instance, :email], "")}>"
	named_version() <> "; " <> info
	end

	# See http://elixir-lang.org/docs/stable/elixir/Application.html
	# for more information on OTP Applications
	def start(_type, _args) do
	Pleroma.Config.DeprecationWarnings.warn()
	setup_instrumenters()

	# Define workers and child supervisors to be supervised
	children =
	[
	Pleroma.Repo,
	Pleroma.Scheduler,
	Pleroma.Config.TransferTask,
	Pleroma.Emoji,
	Pleroma.Captcha,
	Pleroma.Daemons.ScheduledActivityDaemon,
	- Pleroma.Daemons.ActivityExpirationDaemon
	+ Pleroma.Daemons.ActivityExpirationDaemon,
	+ Pleroma.Plugs.RateLimiter.Supervisor
	] ++
	cachex_children() ++
	hackney_pool_children() ++
	[
	Pleroma.Stats,
	Pleroma.JobQueueMonitor,
	{Oban, Pleroma.Config.get(Oban)}
	] ++
	task_children(@env) ++
	oauth_cleanup_child(oauth_cleanup_enabled?()) ++
	streamer_child(@env) ++
	chat_child(@env, chat_enabled?()) ++
	[
	Pleroma.Web.Endpoint,
	Pleroma.Gopher.Server
	]

	# 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 setup_instrumenters do
	require Prometheus.Registry

	if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do
	:ok =
	:telemetry.attach(
	"prometheus-ecto",
	[:pleroma, :repo, :query],
	&Pleroma.Repo.Instrumenter.handle_event/4,
	%{}
	)

	Pleroma.Repo.Instrumenter.setup()
	end

	Pleroma.Web.Endpoint.MetricsExporter.setup()
	Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
	Pleroma.Web.Endpoint.Instrumenter.setup()
	end

	def enabled_hackney_pools do
	[:media] ++
	if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
	[:federation]
	else
	[]
	end ++
	if Pleroma.Config.get([Pleroma.Upload, :proxy_remote]) do
	[:upload]
	else
	[]
	end
	end

	defp cachex_children do
	[
	build_cachex("used_captcha", ttl_interval: seconds_valid_interval()),
	build_cachex("user", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
	build_cachex("object", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
	build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
	build_cachex("scrubber", limit: 2500),
	build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500),
	build_cachex("web_resp", limit: 2500),
	build_cachex("emoji_packs", expiration: emoji_packs_expiration(), limit: 10),
	build_cachex("failed_proxy_url", limit: 2500)
	]
	end

	defp emoji_packs_expiration,
	do: expiration(default: :timer.seconds(5 * 60), interval: :timer.seconds(60))

	defp idempotency_expiration,
	do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))

	defp seconds_valid_interval,
	do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))

	defp build_cachex(type, opts),
	do: %{
	id: String.to_atom("cachex_" <> type),
	start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
	type: :worker
	}

	defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])

	defp oauth_cleanup_enabled?,
	do: Pleroma.Config.get([:oauth2, :clean_expired_tokens], false)

	defp streamer_child(:test), do: []

	defp streamer_child(_) do
	[Pleroma.Web.Streamer.supervisor()]
	end

	defp oauth_cleanup_child(true),
	do: [Pleroma.Web.OAuth.Token.CleanWorker]

	defp oauth_cleanup_child(_), do: []

	defp chat_child(:test, _), do: []

	defp chat_child(_env, true) do
	[Pleroma.Web.ChatChannel.ChatChannelState]
	end

	defp chat_child(_, _), do: []

	defp hackney_pool_children do
	for pool <- enabled_hackney_pools() do
	options = Pleroma.Config.get([:hackney_pools, pool])
	:hackney_pool.child_spec(pool, options)
	end
	end

	defp task_children(:test) do
	[
	%{
	id: :web_push_init,
	start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
	restart: :temporary
	}
	]
	end

	defp task_children(_) do
	[
	%{
	id: :web_push_init,
	start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
	restart: :temporary
	},
	%{
	id: :internal_fetch_init,
	start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
	restart: :temporary
	}
	]
	end
	end
	diff --git a/lib/pleroma/plugs/rate_limiter.ex b/lib/pleroma/plugs/rate_limiter.ex
	deleted file mode 100644
	index 31388f574..000000000
	--- a/lib/pleroma/plugs/rate_limiter.ex
	+++ /dev/null
	@@ -1,131 +0,0 @@
	-# Pleroma: A lightweight social networking server
	-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	-# SPDX-License-Identifier: AGPL-3.0-only
	-
	-defmodule Pleroma.Plugs.RateLimiter do
	- @moduledoc """
	-
	- ## Configuration
	-
	- A keyword list of rate limiters where a key is a limiter name and value is the limiter configuration. The basic configuration is a tuple where:
	-
	- * The first element: `scale` (Integer). The time scale in milliseconds.
	- * The second element: `limit` (Integer). How many requests to limit in the time scale provided.
	-
	- It is also possible to have different limits for unauthenticated and authenticated users: the keyword value must be a list of two tuples where the first one is a config for unauthenticated users and the second one is for authenticated.
	-
	- To disable a limiter set its value to `nil`.
	-
	- ### Example
	-
	- config :pleroma, :rate_limit,
	- one: {1000, 10},
	- two: [{10_000, 10}, {10_000, 50}],
	- foobar: nil
	-
	- Here we have three limiters:
	-
	- * `one` which is not over 10req/1s
	- * `two` which has two limits: 10req/10s for unauthenticated users and 50req/10s for authenticated users
	- * `foobar` which is disabled
	-
	- ## Usage
	-
	- AllowedSyntax:
	-
	- plug(Pleroma.Plugs.RateLimiter, :limiter_name)
	- plug(Pleroma.Plugs.RateLimiter, {:limiter_name, options})
	-
	- Allowed options:
	-
	- * `bucket_name` overrides bucket name (e.g. to have a separate limit for a set of actions)
	- * `params` appends values of specified request params (e.g. ["id"]) to bucket name
	-
	- Inside a controller:
	-
	- plug(Pleroma.Plugs.RateLimiter, :one when action == :one)
	- plug(Pleroma.Plugs.RateLimiter, :two when action in [:two, :three])
	-
	- plug(
	- Pleroma.Plugs.RateLimiter,
	- {:status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]}
	- when action in ~w(fav_status unfav_status)a
	- )
	-
	- or inside a router pipeline:
	-
	- pipeline :api do
	- ...
	- plug(Pleroma.Plugs.RateLimiter, :one)
	- ...
	- end
	- """
	- import Pleroma.Web.TranslationHelpers
	- import Plug.Conn
	-
	- alias Pleroma.User
	-
	- def init(limiter_name) when is_atom(limiter_name) do
	- init({limiter_name, []})
	- end
	-
	- def init({limiter_name, opts}) do
	- case Pleroma.Config.get([:rate_limit, limiter_name]) do
	- nil -> nil
	- config -> {limiter_name, config, opts}
	- end
	- end
	-
	- # Do not limit if there is no limiter configuration
	- def call(conn, nil), do: conn
	-
	- def call(conn, settings) do
	- case check_rate(conn, settings) do
	- {:ok, _count} ->
	- conn
	-
	- {:error, _count} ->
	- render_throttled_error(conn)
	- end
	- end
	-
	- defp bucket_name(conn, limiter_name, opts) do
	- bucket_name = opts[:bucket_name] \|\| limiter_name
	-
	- if params_names = opts[:params] do
	- params_values = for p <- Enum.sort(params_names), do: conn.params[p]
	- Enum.join([bucket_name] ++ params_values, ":")
	- else
	- bucket_name
	- end
	- end
	-
	- defp check_rate(
	- %{assigns: %{user: %User{id: user_id}}} = conn,
	- {limiter_name, [_, {scale, limit}], opts}
	- ) do
	- bucket_name = bucket_name(conn, limiter_name, opts)
	- ExRated.check_rate("#{bucket_name}:#{user_id}", scale, limit)
	- end
	-
	- defp check_rate(conn, {limiter_name, [{scale, limit} \| _], opts}) do
	- bucket_name = bucket_name(conn, limiter_name, opts)
	- ExRated.check_rate("#{bucket_name}:#{ip(conn)}", scale, limit)
	- end
	-
	- defp check_rate(conn, {limiter_name, {scale, limit}, opts}) do
	- check_rate(conn, {limiter_name, [{scale, limit}, {scale, limit}], opts})
	- end
	-
	- def ip(%{remote_ip: remote_ip}) do
	- remote_ip
	- \|> Tuple.to_list()
	- \|> Enum.join(".")
	- end
	-
	- defp render_throttled_error(conn) do
	- conn
	- \|> render_error(:too_many_requests, "Throttled")
	- \|> halt()
	- end
	-end
	diff --git a/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex b/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex
	new file mode 100644
	index 000000000..10cc90dc8
	--- /dev/null
	+++ b/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex
	@@ -0,0 +1,22 @@
	+defmodule Pleroma.Plugs.RateLimiter.LimiterSupervisor do
	+ use DynamicSupervisor
	+
	+ def start_link(init_arg) do
	+ DynamicSupervisor.start_link(__MODULE__, init_arg, name: __MODULE__)
	+ end
	+
	+ def add_limiter(limiter_name, expiration) do
	+ DynamicSupervisor.start_child(
	+ __MODULE__,
	+ {ConCache,
	+ name: limiter_name,
	+ ttl_check_interval: Kernel.trunc(expiration / 2),
	+ global_ttl: expiration}
	+ )
	+ end
	+
	+ @impl true
	+ def init(_init_arg) do
	+ DynamicSupervisor.init(strategy: :one_for_one)
	+ end
	+end
	diff --git a/lib/pleroma/plugs/rate_limiter/rate_limiter.ex b/lib/pleroma/plugs/rate_limiter/rate_limiter.ex
	new file mode 100644
	index 000000000..da4bed448
	--- /dev/null
	+++ b/lib/pleroma/plugs/rate_limiter/rate_limiter.ex
	@@ -0,0 +1,234 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Plugs.RateLimiter do
	+ @moduledoc """
	+
	+ ## Configuration
	+
	+ A keyword list of rate limiters where a key is a limiter name and value is the limiter configuration. The basic configuration is a tuple where:
	+
	+ * The first element: `scale` (Integer). The time scale in milliseconds.
	+ * The second element: `limit` (Integer). How many requests to limit in the time scale provided.
	+
	+ It is also possible to have different limits for unauthenticated and authenticated users: the keyword value must be a list of two tuples where the first one is a config for unauthenticated users and the second one is for authenticated.
	+
	+ To disable a limiter set its value to `nil`.
	+
	+ ### Example
	+
	+ config :pleroma, :rate_limit,
	+ one: {1000, 10},
	+ two: [{10_000, 10}, {10_000, 50}],
	+ foobar: nil
	+
	+ Here we have three limiters:
	+
	+ * `one` which is not over 10req/1s
	+ * `two` which has two limits: 10req/10s for unauthenticated users and 50req/10s for authenticated users
	+ * `foobar` which is disabled
	+
	+ ## Usage
	+
	+ AllowedSyntax:
	+
	+ plug(RateLimiter, name: :limiter_name)
	+ plug(RateLimiter, options}) # :name is a required option
	+
	+ Allowed options:
	+
	+ * `name` required
	+ * `bucket_name` overrides name (e.g. to have a separate limit for a set of actions)
	+ * `params` appends values of specified request params (e.g. ["id"]) to bucket name
	+
	+ Inside a controller:
	+
	+ plug(RateLimiter, [name: :one] when action == :one)
	+ plug(RateLimiter, [name: :two] when action in [:two, :three])
	+
	+ plug(
	+ RateLimiter,
	+ [name: :status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]]
	+ when action in ~w(fav_status unfav_status)a
	+ )
	+
	+ or inside a router pipeline:
	+
	+ pipeline :api do
	+ ...
	+ plug(RateLimiter, name: :one)
	+ ...
	+ end
	+ """
	+ import Pleroma.Web.TranslationHelpers
	+ import Plug.Conn
	+
	+ alias Pleroma.Plugs.RateLimiter.LimiterSupervisor
	+ alias Pleroma.User
	+
	+ def init(opts) do
	+ limiter_name = Keyword.get(opts, :name)
	+
	+ case Pleroma.Config.get([:rate_limit, limiter_name]) do
	+ nil ->
	+ nil
	+
	+ config ->
	+ name_root = Keyword.get(opts, :bucket_name, limiter_name)
	+
	+ %{
	+ name: name_root,
	+ limits: config,
	+ opts: opts
	+ }
	+ end
	+ end
	+
	+ # Do not limit if there is no limiter configuration
	+ def call(conn, nil), do: conn
	+
	+ def call(conn, settings) do
	+ settings
	+ \|> incorporate_conn_info(conn)
	+ \|> check_rate()
	+ \|> case do
	+ {:ok, _count} ->
	+ conn
	+
	+ {:error, _count} ->
	+ render_throttled_error(conn)
	+ end
	+ end
	+
	+ def inspect_bucket(conn, name_root, settings) do
	+ name_root
	+ \|> user_bucket_name()
	+ \|> Process.whereis()
	+ \|> case do
	+ nil ->
	+ {:err, :not_found}
	+
	+ _ ->
	+ settings =
	+ settings
	+ \|> incorporate_conn_info(conn)
	+
	+ bucket_name = make_bucket_name(settings)
	+ key_name = make_key_name(settings)
	+ limit = get_limits(settings)
	+
	+ count = ConCache.get(bucket_name, key_name) \|\| 0
	+ {count, limit - count}
	+ end
	+ end
	+
	+ defp check_rate(settings) do
	+ bucket_pid = get_or_create_bucket_pid(settings)
	+ key_name = make_key_name(settings)
	+ limit = get_limits(settings)
	+ {:ok, value} = ConCache.fetch_or_store(bucket_pid, key_name, &create_item/0)
	+
	+ if value < limit do
	+ :ok = ConCache.update(bucket_pid, key_name, &update_item(&1))
	+ {:ok, value + 1}
	+ else
	+ {:error, value}
	+ end
	+ end
	+
	+ defp get_or_create_bucket_pid(settings) do
	+ bucket_name = make_bucket_name(settings)
	+ bucket_pid = Process.whereis(bucket_name)
	+
	+ if is_nil(bucket_pid) do
	+ initialize_bucket(settings)
	+ Process.whereis(bucket_name)
	+ else
	+ bucket_pid
	+ end
	+ end
	+
	+ defp create_item(), do: {:ok, 0}
	+
	+ defp update_item(value), do: {:ok, %ConCache.Item{value: value + 1, ttl: :no_update}}
	+
	+ defp incorporate_conn_info(settings, %{assigns: %{user: %User{id: user_id}}, params: params}) do
	+ Map.merge(settings, %{
	+ mode: :user,
	+ conn_params: params,
	+ conn_info: "#{user_id}"
	+ })
	+ end
	+
	+ defp incorporate_conn_info(settings, %{params: params} = conn) do
	+ Map.merge(settings, %{
	+ mode: :anon,
	+ conn_params: params,
	+ conn_info: "#{ip(conn)}"
	+ })
	+ end
	+
	+ defp ip(%{remote_ip: remote_ip}) do
	+ remote_ip
	+ \|> Tuple.to_list()
	+ \|> Enum.join(".")
	+ end
	+
	+ defp render_throttled_error(conn) do
	+ conn
	+ \|> render_error(:too_many_requests, "Throttled")
	+ \|> halt()
	+ end
	+
	+ defp make_key_name(settings) do
	+ ""
	+ \|> attach_params(settings)
	+ \|> attach_identity(settings)
	+ end
	+
	+ defp get_scale(_, {scale, _}), do: scale
	+
	+ defp get_scale(:anon, [{scale, _}, {_, _}]), do: scale
	+
	+ defp get_scale(:user, [{_, _}, {scale, _}]), do: scale
	+
	+ defp get_limits(%{limits: {_scale, limit}}), do: limit
	+
	+ defp get_limits(%{mode: :user, limits: [_, {_, limit}]}), do: limit
	+
	+ defp get_limits(%{limits: [{_, limit}, _]}), do: limit
	+
	+ defp make_bucket_name(%{mode: :user, name: name_root}),
	+ do: user_bucket_name(name_root)
	+
	+ defp make_bucket_name(%{mode: :anon, name: name_root}),
	+ do: anon_bucket_name(name_root)
	+
	+ defp attach_params(input, %{conn_params: conn_params, opts: opts}) do
	+ param_string =
	+ opts
	+ \|> Keyword.get(:params, [])
	+ \|> Enum.sort()
	+ \|> Enum.map(&Map.get(conn_params, &1, ""))
	+ \|> Enum.join(":")
	+
	+ "#{input}#{param_string}"
	+ end
	+
	+ defp initialize_bucket(%{name: _name, limits: nil}), do: :ok
	+
	+ defp initialize_bucket(%{name: name, limits: limits}) do
	+ LimiterSupervisor.add_limiter(anon_bucket_name(name), get_scale(:anon, limits))
	+ LimiterSupervisor.add_limiter(user_bucket_name(name), get_scale(:user, limits))
	+ end
	+
	+ defp attach_identity(base, %{mode: :user, conn_info: conn_info}),
	+ do: "user:#{base}:#{conn_info}"
	+
	+ defp attach_identity(base, %{mode: :anon, conn_info: conn_info}),
	+ do: "ip:#{base}:#{conn_info}"
	+
	+ defp user_bucket_name(name_root), do: "user:#{name_root}" \|> String.to_atom()
	+ defp anon_bucket_name(name_root), do: "anon:#{name_root}" \|> String.to_atom()
	+end
	diff --git a/lib/pleroma/plugs/rate_limiter/supervisor.ex b/lib/pleroma/plugs/rate_limiter/supervisor.ex
	new file mode 100644
	index 000000000..9672f7876
	--- /dev/null
	+++ b/lib/pleroma/plugs/rate_limiter/supervisor.ex
	@@ -0,0 +1,16 @@
	+defmodule Pleroma.Plugs.RateLimiter.Supervisor do
	+ use Supervisor
	+
	+ def start_link(opts) do
	+ Supervisor.start_link(__MODULE__, opts, name: __MODULE__)
	+ end
	+
	+ def init(_args) do
	+ children = [
	+ Pleroma.Plugs.RateLimiter.LimiterSupervisor
	+ ]
	+
	+ opts = [strategy: :one_for_one, name: Pleroma.Web.Streamer.Supervisor]
	+ Supervisor.init(children, opts)
	+ end
	+end
	diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
	index 73fad519e..5b01b964b 100644
	--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
	+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
	@@ -1,387 +1,387 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MastodonAPI.AccountController do
	use Pleroma.Web, :controller

	import Pleroma.Web.ControllerHelper,
	only: [add_link_headers: 2, truthy_param?: 1, assign_account_by_id: 2, json_response: 3]

	alias Pleroma.Emoji
	alias Pleroma.Plugs.OAuthScopesPlug
	alias Pleroma.Plugs.RateLimiter
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.MastodonAPI.ListView
	alias Pleroma.Web.MastodonAPI.MastodonAPI
	alias Pleroma.Web.MastodonAPI.StatusView
	alias Pleroma.Web.OAuth.Token
	alias Pleroma.Web.TwitterAPI.TwitterAPI

	plug(
	OAuthScopesPlug,
	%{fallback: :proceed_unauthenticated, scopes: ["read:accounts"]}
	when action == :show
	)

	plug(
	OAuthScopesPlug,
	%{scopes: ["read:accounts"]}
	when action in [:endorsements, :verify_credentials, :followers, :following]
	)

	plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action == :update_credentials)

	plug(OAuthScopesPlug, %{scopes: ["read:lists"]} when action == :lists)

	plug(
	OAuthScopesPlug,
	%{scopes: ["follow", "read:blocks"]} when action == :blocks
	)

	plug(
	OAuthScopesPlug,
	%{scopes: ["follow", "write:blocks"]} when action in [:block, :unblock]
	)

	plug(OAuthScopesPlug, %{scopes: ["read:follows"]} when action == :relationships)

	# Note: :follows (POST /api/v1/follows) is the same as :follow, consider removing :follows
	plug(
	OAuthScopesPlug,
	%{scopes: ["follow", "write:follows"]} when action in [:follows, :follow, :unfollow]
	)

	plug(OAuthScopesPlug, %{scopes: ["follow", "read:mutes"]} when action == :mutes)

	plug(OAuthScopesPlug, %{scopes: ["follow", "write:mutes"]} when action in [:mute, :unmute])

	plug(
	Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
	when action != :create
	)

	@relations [:follow, :unfollow]
	@needs_account ~W(followers following lists follow unfollow mute unmute block unblock)a

	- plug(RateLimiter, {:relations_id_action, params: ["id", "uri"]} when action in @relations)
	- plug(RateLimiter, :relations_actions when action in @relations)
	- plug(RateLimiter, :app_account_creation when action == :create)
	+ plug(RateLimiter, [name: :relations_id_action, params: ["id", "uri"]] when action in @relations)
	+ plug(RateLimiter, [name: :relations_actions] when action in @relations)
	+ plug(RateLimiter, [name: :app_account_creation] when action == :create)
	plug(:assign_account_by_id when action in @needs_account)

	action_fallback(Pleroma.Web.MastodonAPI.FallbackController)

	@doc "POST /api/v1/accounts"
	def create(
	%{assigns: %{app: app}} = conn,
	%{"username" => nickname, "email" => _, "password" => _, "agreement" => true} = params
	) do
	params =
	params
	\|> Map.take([
	"email",
	"captcha_solution",
	"captcha_token",
	"captcha_answer_data",
	"token",
	"password"
	])
	\|> Map.put("nickname", nickname)
	\|> Map.put("fullname", params["fullname"] \|\| nickname)
	\|> Map.put("bio", params["bio"] \|\| "")
	\|> Map.put("confirm", params["password"])

	with {:ok, user} <- TwitterAPI.register_user(params, need_confirmation: true),
	{:ok, token} <- Token.create_token(app, user, %{scopes: app.scopes}) do
	json(conn, %{
	token_type: "Bearer",
	access_token: token.token,
	scope: app.scopes,
	created_at: Token.Utils.format_created_at(token)
	})
	else
	{:error, errors} -> json_response(conn, :bad_request, errors)
	end
	end

	def create(%{assigns: %{app: _app}} = conn, _) do
	render_error(conn, :bad_request, "Missing parameters")
	end

	def create(conn, _) do
	render_error(conn, :forbidden, "Invalid credentials")
	end

	@doc "GET /api/v1/accounts/verify_credentials"
	def verify_credentials(%{assigns: %{user: user}} = conn, _) do
	chat_token = Phoenix.Token.sign(conn, "user socket", user.id)

	render(conn, "show.json",
	user: user,
	for: user,
	with_pleroma_settings: true,
	with_chat_token: chat_token
	)
	end

	@doc "PATCH /api/v1/accounts/update_credentials"
	def update_credentials(%{assigns: %{user: original_user}} = conn, params) do
	user = original_user

	params =
	if Map.has_key?(params, "fields_attributes") do
	Map.update!(params, "fields_attributes", fn fields ->
	fields
	\|> normalize_fields_attributes()
	\|> Enum.filter(fn %{"name" => n} -> n != "" end)
	end)
	else
	params
	end

	user_params =
	[
	:no_rich_text,
	:locked,
	:hide_followers_count,
	:hide_follows_count,
	:hide_followers,
	:hide_follows,
	:hide_favorites,
	:show_role,
	:skip_thread_containment,
	:discoverable
	]
	\|> Enum.reduce(%{}, fn key, acc ->
	add_if_present(acc, params, to_string(key), key, &{:ok, truthy_param?(&1)})
	end)
	\|> add_if_present(params, "display_name", :name)
	\|> add_if_present(params, "note", :bio, fn value -> {:ok, User.parse_bio(value, user)} end)
	\|> add_if_present(params, "avatar", :avatar, fn value ->
	with %Plug.Upload{} <- value,
	{:ok, object} <- ActivityPub.upload(value, type: :avatar) do
	{:ok, object.data}
	end
	end)
	\|> add_if_present(params, "header", :banner, fn value ->
	with %Plug.Upload{} <- value,
	{:ok, object} <- ActivityPub.upload(value, type: :banner) do
	{:ok, object.data}
	end
	end)
	\|> add_if_present(params, "pleroma_background_image", :background, fn value ->
	with %Plug.Upload{} <- value,
	{:ok, object} <- ActivityPub.upload(value, type: :background) do
	{:ok, object.data}
	end
	end)
	\|> add_if_present(params, "fields_attributes", :fields, fn fields ->
	fields = Enum.map(fields, fn f -> Map.update!(f, "value", &AutoLinker.link(&1)) end)

	{:ok, fields}
	end)
	\|> add_if_present(params, "fields_attributes", :raw_fields)
	\|> add_if_present(params, "pleroma_settings_store", :pleroma_settings_store, fn value ->
	{:ok, Map.merge(user.pleroma_settings_store, value)}
	end)
	\|> add_if_present(params, "default_scope", :default_scope)

	emojis_text = (user_params["display_name"] \|\| "") <> (user_params["note"] \|\| "")

	user_emojis =
	user
	\|> Map.get(:emoji, [])
	\|> Enum.concat(Emoji.Formatter.get_emoji_map(emojis_text))
	\|> Enum.dedup()

	user_params = Map.put(user_params, :emoji, user_emojis)
	changeset = User.update_changeset(user, user_params)

	with {:ok, user} <- User.update_and_set_cache(changeset) do
	if original_user != user, do: CommonAPI.update(user)

	render(conn, "show.json", user: user, for: user, with_pleroma_settings: true)
	else
	_e -> render_error(conn, :forbidden, "Invalid request")
	end
	end

	defp add_if_present(map, params, params_field, map_field, value_function \\ &{:ok, &1}) do
	with true <- Map.has_key?(params, params_field),
	{:ok, new_value} <- value_function.(params[params_field]) do
	Map.put(map, map_field, new_value)
	else
	_ -> map
	end
	end

	defp normalize_fields_attributes(fields) do
	if Enum.all?(fields, &is_tuple/1) do
	Enum.map(fields, fn {_, v} -> v end)
	else
	fields
	end
	end

	@doc "GET /api/v1/accounts/relationships"
	def relationships(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	targets = User.get_all_by_ids(List.wrap(id))

	render(conn, "relationships.json", user: user, targets: targets)
	end

	# Instead of returning a 400 when no "id" params is present, Mastodon returns an empty array.
	def relationships(%{assigns: %{user: _user}} = conn, _), do: json(conn, [])

	@doc "GET /api/v1/accounts/:id"
	def show(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do
	with %User{} = user <- User.get_cached_by_nickname_or_id(nickname_or_id, for: for_user),
	true <- User.auth_active?(user) \|\| user.id == for_user.id \|\| User.superuser?(for_user) do
	render(conn, "show.json", user: user, for: for_user)
	else
	_e -> render_error(conn, :not_found, "Can't find user")
	end
	end

	@doc "GET /api/v1/accounts/:id/statuses"
	def statuses(%{assigns: %{user: reading_user}} = conn, params) do
	with %User{} = user <- User.get_cached_by_nickname_or_id(params["id"], for: reading_user) do
	params = Map.put(params, "tag", params["tagged"])
	activities = ActivityPub.fetch_user_activities(user, reading_user, params)

	conn
	\|> add_link_headers(activities)
	\|> put_view(StatusView)
	\|> render("index.json", activities: activities, for: reading_user, as: :activity)
	end
	end

	@doc "GET /api/v1/accounts/:id/followers"
	def followers(%{assigns: %{user: for_user, account: user}} = conn, params) do
	followers =
	cond do
	for_user && user.id == for_user.id -> MastodonAPI.get_followers(user, params)
	user.hide_followers -> []
	true -> MastodonAPI.get_followers(user, params)
	end

	conn
	\|> add_link_headers(followers)
	\|> render("index.json", for: for_user, users: followers, as: :user)
	end

	@doc "GET /api/v1/accounts/:id/following"
	def following(%{assigns: %{user: for_user, account: user}} = conn, params) do
	followers =
	cond do
	for_user && user.id == for_user.id -> MastodonAPI.get_friends(user, params)
	user.hide_follows -> []
	true -> MastodonAPI.get_friends(user, params)
	end

	conn
	\|> add_link_headers(followers)
	\|> render("index.json", for: for_user, users: followers, as: :user)
	end

	@doc "GET /api/v1/accounts/:id/lists"
	def lists(%{assigns: %{user: user, account: account}} = conn, _params) do
	lists = Pleroma.List.get_lists_account_belongs(user, account)

	conn
	\|> put_view(ListView)
	\|> render("index.json", lists: lists)
	end

	@doc "POST /api/v1/accounts/:id/follow"
	def follow(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _params) do
	{:error, :not_found}
	end

	def follow(%{assigns: %{user: follower, account: followed}} = conn, _params) do
	with {:ok, follower} <- MastodonAPI.follow(follower, followed, conn.params) do
	render(conn, "relationship.json", user: follower, target: followed)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/accounts/:id/unfollow"
	def unfollow(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _params) do
	{:error, :not_found}
	end

	def unfollow(%{assigns: %{user: follower, account: followed}} = conn, _params) do
	with {:ok, follower} <- CommonAPI.unfollow(follower, followed) do
	render(conn, "relationship.json", user: follower, target: followed)
	end
	end

	@doc "POST /api/v1/accounts/:id/mute"
	def mute(%{assigns: %{user: muter, account: muted}} = conn, params) do
	notifications? = params \|> Map.get("notifications", true) \|> truthy_param?()

	with {:ok, muter} <- User.mute(muter, muted, notifications?) do
	render(conn, "relationship.json", user: muter, target: muted)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/accounts/:id/unmute"
	def unmute(%{assigns: %{user: muter, account: muted}} = conn, _params) do
	with {:ok, muter} <- User.unmute(muter, muted) do
	render(conn, "relationship.json", user: muter, target: muted)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/accounts/:id/block"
	def block(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do
	with {:ok, blocker} <- User.block(blocker, blocked),
	{:ok, _activity} <- ActivityPub.block(blocker, blocked) do
	render(conn, "relationship.json", user: blocker, target: blocked)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/accounts/:id/unblock"
	def unblock(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do
	with {:ok, blocker} <- User.unblock(blocker, blocked),
	{:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do
	render(conn, "relationship.json", user: blocker, target: blocked)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/follows"
	def follows(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
	with {_, %User{} = followed} <- {:followed, User.get_cached_by_nickname(uri)},
	{_, true} <- {:followed, follower.id != followed.id},
	{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
	render(conn, "show.json", user: followed, for: follower)
	else
	{:followed, _} -> {:error, :not_found}
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "GET /api/v1/mutes"
	def mutes(%{assigns: %{user: user}} = conn, _) do
	render(conn, "index.json", users: User.muted_users(user), for: user, as: :user)
	end

	@doc "GET /api/v1/blocks"
	def blocks(%{assigns: %{user: user}} = conn, _) do
	render(conn, "index.json", users: User.blocked_users(user), for: user, as: :user)
	end

	@doc "GET /api/v1/endorsements"
	def endorsements(conn, params),
	do: Pleroma.Web.MastodonAPI.MastodonAPIController.empty_array(conn, params)
	end
	diff --git a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
	index bfd5120ba..d9e51de7f 100644
	--- a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
	+++ b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
	@@ -1,91 +1,91 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MastodonAPI.AuthController do
	use Pleroma.Web, :controller

	alias Pleroma.User
	alias Pleroma.Web.OAuth.App
	alias Pleroma.Web.OAuth.Authorization
	alias Pleroma.Web.OAuth.Token
	alias Pleroma.Web.TwitterAPI.TwitterAPI

	action_fallback(Pleroma.Web.MastodonAPI.FallbackController)

	@local_mastodon_name "Mastodon-Local"

	- plug(Pleroma.Plugs.RateLimiter, :password_reset when action == :password_reset)
	+ plug(Pleroma.Plugs.RateLimiter, [name: :password_reset] when action == :password_reset)

	@doc "GET /web/login"
	def login(%{assigns: %{user: %User{}}} = conn, _params) do
	redirect(conn, to: local_mastodon_root_path(conn))
	end

	@doc "Local Mastodon FE login init action"
	def login(conn, %{"code" => auth_token}) do
	with {:ok, app} <- get_or_make_app(),
	{:ok, auth} <- Authorization.get_by_token(app, auth_token),
	{:ok, token} <- Token.exchange_token(app, auth) do
	conn
	\|> put_session(:oauth_token, token.token)
	\|> redirect(to: local_mastodon_root_path(conn))
	end
	end

	@doc "Local Mastodon FE callback action"
	def login(conn, _) do
	with {:ok, app} <- get_or_make_app() do
	path =
	o_auth_path(conn, :authorize,
	response_type: "code",
	client_id: app.client_id,
	redirect_uri: ".",
	scope: Enum.join(app.scopes, " ")
	)

	redirect(conn, to: path)
	end
	end

	@doc "DELETE /auth/sign_out"
	def logout(conn, _) do
	conn
	\|> clear_session
	\|> redirect(to: "/")
	end

	@doc "POST /auth/password"
	def password_reset(conn, params) do
	nickname_or_email = params["email"] \|\| params["nickname"]

	with {:ok, _} <- TwitterAPI.password_reset(nickname_or_email) do
	conn
	\|> put_status(:no_content)
	\|> json("")
	else
	{:error, "unknown user"} ->
	send_resp(conn, :not_found, "")

	{:error, _} ->
	send_resp(conn, :bad_request, "")
	end
	end

	defp local_mastodon_root_path(conn) do
	case get_session(conn, :return_to) do
	nil ->
	masto_fe_path(conn, :index, ["getting-started"])

	return_to ->
	delete_session(conn, :return_to)
	return_to
	end
	end

	@spec get_or_make_app() :: {:ok, App.t()} \| {:error, Ecto.Changeset.t()}
	defp get_or_make_app do
	%{client_name: @local_mastodon_name, redirect_uris: "."}
	\|> App.get_or_make(["read", "write", "follow", "push"])
	end
	end
	diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
	index 6cfd68a84..0a929f55b 100644
	--- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
	+++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
	@@ -1,128 +1,128 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MastodonAPI.SearchController do
	use Pleroma.Web, :controller

	alias Pleroma.Activity
	alias Pleroma.Plugs.OAuthScopesPlug
	alias Pleroma.Plugs.RateLimiter
	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web
	alias Pleroma.Web.ControllerHelper
	alias Pleroma.Web.MastodonAPI.AccountView
	alias Pleroma.Web.MastodonAPI.StatusView

	require Logger

	# Note: Mastodon doesn't allow unauthenticated access (requires read:accounts / read:search)
	plug(OAuthScopesPlug, %{scopes: ["read:search"], fallback: :proceed_unauthenticated})

	plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)

	- plug(RateLimiter, :search when action in [:search, :search2, :account_search])
	+ plug(RateLimiter, [name: :search] when action in [:search, :search2, :account_search])

	def account_search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	accounts = User.search(query, search_options(params, user))

	conn
	\|> put_view(AccountView)
	\|> render("index.json", users: accounts, for: user, as: :user)
	end

	def search2(conn, params), do: do_search(:v2, conn, params)
	def search(conn, params), do: do_search(:v1, conn, params)

	defp do_search(version, %{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	options = search_options(params, user)
	timeout = Keyword.get(Repo.config(), :timeout, 15_000)
	default_values = %{"statuses" => [], "accounts" => [], "hashtags" => []}

	result =
	default_values
	\|> Enum.map(fn {resource, default_value} ->
	if params["type"] == nil or params["type"] == resource do
	{resource, fn -> resource_search(version, resource, query, options) end}
	else
	{resource, fn -> default_value end}
	end
	end)
	\|> Task.async_stream(fn {resource, f} -> {resource, with_fallback(f)} end,
	timeout: timeout,
	on_timeout: :kill_task
	)
	\|> Enum.reduce(default_values, fn
	{:ok, {resource, result}}, acc ->
	Map.put(acc, resource, result)

	_error, acc ->
	acc
	end)

	json(conn, result)
	end

	defp search_options(params, user) do
	[
	resolve: params["resolve"] == "true",
	following: params["following"] == "true",
	limit: ControllerHelper.fetch_integer_param(params, "limit"),
	offset: ControllerHelper.fetch_integer_param(params, "offset"),
	type: params["type"],
	author: get_author(params),
	for_user: user
	]
	\|> Enum.filter(&elem(&1, 1))
	end

	defp resource_search(_, "accounts", query, options) do
	accounts = with_fallback(fn -> User.search(query, options) end)
	AccountView.render("index.json", users: accounts, for: options[:for_user], as: :user)
	end

	defp resource_search(_, "statuses", query, options) do
	statuses = with_fallback(fn -> Activity.search(options[:for_user], query, options) end)
	StatusView.render("index.json", activities: statuses, for: options[:for_user], as: :activity)
	end

	defp resource_search(:v2, "hashtags", query, _options) do
	tags_path = Web.base_url() <> "/tag/"

	query
	\|> prepare_tags()
	\|> Enum.map(fn tag ->
	tag = String.trim_leading(tag, "#")
	%{name: tag, url: tags_path <> tag}
	end)
	end

	defp resource_search(:v1, "hashtags", query, _options) do
	query
	\|> prepare_tags()
	\|> Enum.map(fn tag -> String.trim_leading(tag, "#") end)
	end

	defp prepare_tags(query) do
	query
	\|> String.split()
	\|> Enum.uniq()
	\|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
	end

	defp with_fallback(f, fallback \\ []) do
	try do
	f.()
	rescue
	error ->
	Logger.error("#{__MODULE__} search error: #{inspect(error)}")
	fallback
	end
	end

	defp get_author(%{"account_id" => account_id}) when is_binary(account_id),
	do: User.get_cached_by_id(account_id)

	defp get_author(_params), do: nil
	end
	diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
	index e5d016f63..74b223cf4 100644
	--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
	+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
	@@ -1,381 +1,381 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MastodonAPI.StatusController do
	use Pleroma.Web, :controller

	import Pleroma.Web.ControllerHelper, only: [try_render: 3, add_link_headers: 2]

	require Ecto.Query

	alias Pleroma.Activity
	alias Pleroma.Bookmark
	alias Pleroma.Object
	alias Pleroma.Plugs.OAuthScopesPlug
	alias Pleroma.Plugs.RateLimiter
	alias Pleroma.Repo
	alias Pleroma.ScheduledActivity
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Visibility
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.MastodonAPI.AccountView
	alias Pleroma.Web.MastodonAPI.ScheduledActivityView

	@unauthenticated_access %{fallback: :proceed_unauthenticated, scopes: []}

	plug(
	OAuthScopesPlug,
	%{@unauthenticated_access \| scopes: ["read:statuses"]}
	when action in [
	:index,
	:show,
	:card,
	:context
	]
	)

	plug(
	OAuthScopesPlug,
	%{scopes: ["write:statuses"]}
	when action in [
	:create,
	:delete,
	:reblog,
	:unreblog
	]
	)

	plug(OAuthScopesPlug, %{scopes: ["read:favourites"]} when action == :favourites)

	plug(
	OAuthScopesPlug,
	%{scopes: ["write:favourites"]} when action in [:favourite, :unfavourite]
	)

	plug(
	OAuthScopesPlug,
	%{scopes: ["write:mutes"]} when action in [:mute_conversation, :unmute_conversation]
	)

	plug(
	OAuthScopesPlug,
	%{@unauthenticated_access \| scopes: ["read:accounts"]}
	when action in [:favourited_by, :reblogged_by]
	)

	plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action in [:pin, :unpin])

	# Note: scope not present in Mastodon: read:bookmarks
	plug(OAuthScopesPlug, %{scopes: ["read:bookmarks"]} when action == :bookmarks)

	# Note: scope not present in Mastodon: write:bookmarks
	plug(
	OAuthScopesPlug,
	%{scopes: ["write:bookmarks"]} when action in [:bookmark, :unbookmark]
	)

	plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)

	@rate_limited_status_actions ~w(reblog unreblog favourite unfavourite create delete)a

	plug(
	RateLimiter,
	- {:status_id_action, bucket_name: "status_id_action:reblog_unreblog", params: ["id"]}
	+ [name: :status_id_action, bucket_name: "status_id_action:reblog_unreblog", params: ["id"]]
	when action in ~w(reblog unreblog)a
	)

	plug(
	RateLimiter,
	- {:status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]}
	+ [name: :status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]]
	when action in ~w(favourite unfavourite)a
	)

	- plug(RateLimiter, :statuses_actions when action in @rate_limited_status_actions)
	+ plug(RateLimiter, [name: :statuses_actions] when action in @rate_limited_status_actions)

	action_fallback(Pleroma.Web.MastodonAPI.FallbackController)

	@doc """
	GET `/api/v1/statuses?ids[]=1&ids[]=2`

	`ids` query param is required
	"""
	def index(%{assigns: %{user: user}} = conn, %{"ids" => ids}) do
	limit = 100

	activities =
	ids
	\|> Enum.take(limit)
	\|> Activity.all_by_ids_with_object()
	\|> Enum.filter(&Visibility.visible_for_user?(&1, user))

	render(conn, "index.json", activities: activities, for: user, as: :activity)
	end

	@doc """
	POST /api/v1/statuses

	Creates a scheduled status when `scheduled_at` param is present and it's far enough
	"""
	def create(
	%{assigns: %{user: user}} = conn,
	%{"status" => _, "scheduled_at" => scheduled_at} = params
	) do
	params = Map.put(params, "in_reply_to_status_id", params["in_reply_to_id"])

	if ScheduledActivity.far_enough?(scheduled_at) do
	with {:ok, scheduled_activity} <-
	ScheduledActivity.create(user, %{"params" => params, "scheduled_at" => scheduled_at}) do
	conn
	\|> put_view(ScheduledActivityView)
	\|> render("show.json", scheduled_activity: scheduled_activity)
	end
	else
	create(conn, Map.drop(params, ["scheduled_at"]))
	end
	end

	@doc """
	POST /api/v1/statuses

	Creates a regular status
	"""
	def create(%{assigns: %{user: user}} = conn, %{"status" => _} = params) do
	params = Map.put(params, "in_reply_to_status_id", params["in_reply_to_id"])

	with {:ok, activity} <- CommonAPI.post(user, params) do
	try_render(conn, "show.json",
	activity: activity,
	for: user,
	as: :activity,
	with_direct_conversation_id: true
	)
	else
	{:error, message} ->
	conn
	\|> put_status(:unprocessable_entity)
	\|> json(%{error: message})
	end
	end

	def create(%{assigns: %{user: _user}} = conn, %{"media_ids" => _} = params) do
	create(conn, Map.put(params, "status", ""))
	end

	@doc "GET /api/v1/statuses/:id"
	def show(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id_with_object(id),
	true <- Visibility.visible_for_user?(activity, user) do
	try_render(conn, "show.json",
	activity: activity,
	for: user,
	with_direct_conversation_id: true
	)
	end
	end

	@doc "DELETE /api/v1/statuses/:id"
	def delete(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
	json(conn, %{})
	else
	_e -> render_error(conn, :forbidden, "Can't delete this post")
	end
	end

	@doc "POST /api/v1/statuses/:id/reblog"
	def reblog(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id} = params) do
	with {:ok, announce, _activity} <- CommonAPI.repeat(ap_id_or_id, user, params),
	%Activity{} = announce <- Activity.normalize(announce.data) do
	try_render(conn, "show.json", %{activity: announce, for: user, as: :activity})
	end
	end

	@doc "POST /api/v1/statuses/:id/unreblog"
	def unreblog(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, _unannounce, %{data: %{"id" => id}}} <- CommonAPI.unrepeat(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_by_object_ap_id_with_object(id) do
	try_render(conn, "show.json", %{activity: activity, for: user, as: :activity})
	end
	end

	@doc "POST /api/v1/statuses/:id/favourite"
	def favourite(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, _fav, %{data: %{"id" => id}}} <- CommonAPI.favorite(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/unfavourite"
	def unfavourite(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, _, _, %{data: %{"id" => id}}} <- CommonAPI.unfavorite(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/pin"
	def pin(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, activity} <- CommonAPI.pin(ap_id_or_id, user) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/unpin"
	def unpin(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, activity} <- CommonAPI.unpin(ap_id_or_id, user) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/bookmark"
	def bookmark(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id_with_object(id),
	%User{} = user <- User.get_cached_by_nickname(user.nickname),
	true <- Visibility.visible_for_user?(activity, user),
	{:ok, _bookmark} <- Bookmark.create(user.id, activity.id) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/unbookmark"
	def unbookmark(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id_with_object(id),
	%User{} = user <- User.get_cached_by_nickname(user.nickname),
	true <- Visibility.visible_for_user?(activity, user),
	{:ok, _bookmark} <- Bookmark.destroy(user.id, activity.id) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/mute"
	def mute_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id(id),
	{:ok, activity} <- CommonAPI.add_mute(user, activity) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "POST /api/v1/statuses/:id/unmute"
	def unmute_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id(id),
	{:ok, activity} <- CommonAPI.remove_mute(user, activity) do
	try_render(conn, "show.json", activity: activity, for: user, as: :activity)
	end
	end

	@doc "GET /api/v1/statuses/:id/card"
	@deprecated "https://github.com/tootsuite/mastodon/pull/11213"
	def card(%{assigns: %{user: user}} = conn, %{"id" => status_id}) do
	with %Activity{} = activity <- Activity.get_by_id(status_id),
	true <- Visibility.visible_for_user?(activity, user) do
	data = Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
	render(conn, "card.json", data)
	else
	_ -> render_error(conn, :not_found, "Record not found")
	end
	end

	@doc "GET /api/v1/statuses/:id/favourited_by"
	def favourited_by(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id_with_object(id),
	{:visible, true} <- {:visible, Visibility.visible_for_user?(activity, user)},
	%Object{data: %{"likes" => likes}} <- Object.normalize(activity) do
	users =
	User
	\|> Ecto.Query.where([u], u.ap_id in ^likes)
	\|> Repo.all()
	\|> Enum.filter(&(not User.blocks?(user, &1)))

	conn
	\|> put_view(AccountView)
	\|> render("index.json", for: user, users: users, as: :user)
	else
	{:visible, false} -> {:error, :not_found}
	_ -> json(conn, [])
	end
	end

	@doc "GET /api/v1/statuses/:id/reblogged_by"
	def reblogged_by(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id_with_object(id),
	{:visible, true} <- {:visible, Visibility.visible_for_user?(activity, user)},
	%Object{data: %{"announcements" => announces, "id" => ap_id}} <-
	Object.normalize(activity) do
	announces =
	"Announce"
	\|> Activity.Queries.by_type()
	\|> Ecto.Query.where([a], a.actor in ^announces)
	# this is to use the index
	\|> Activity.Queries.by_object_id(ap_id)
	\|> Repo.all()
	\|> Enum.filter(&Visibility.visible_for_user?(&1, user))
	\|> Enum.map(& &1.actor)
	\|> Enum.uniq()

	users =
	User
	\|> Ecto.Query.where([u], u.ap_id in ^announces)
	\|> Repo.all()
	\|> Enum.filter(&(not User.blocks?(user, &1)))

	conn
	\|> put_view(AccountView)
	\|> render("index.json", for: user, users: users, as: :user)
	else
	{:visible, false} -> {:error, :not_found}
	_ -> json(conn, [])
	end
	end

	@doc "GET /api/v1/statuses/:id/context"
	def context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Activity.get_by_id(id) do
	activities =
	ActivityPub.fetch_activities_for_context(activity.data["context"], %{
	"blocking_user" => user,
	"user" => user,
	"exclude_id" => activity.id
	})

	render(conn, "context.json", activity: activity, activities: activities, user: user)
	end
	end

	@doc "GET /api/v1/favourites"
	def favourites(%{assigns: %{user: user}} = conn, params) do
	params =
	params
	\|> Map.put("type", "Create")
	\|> Map.put("favorited_by", user.ap_id)
	\|> Map.put("blocking_user", user)

	activities =
	ActivityPub.fetch_activities([], params)
	\|> Enum.reverse()

	conn
	\|> add_link_headers(activities)
	\|> render("index.json", activities: activities, for: user, as: :activity)
	end

	@doc "GET /api/v1/bookmarks"
	def bookmarks(%{assigns: %{user: user}} = conn, params) do
	user = User.get_cached_by_id(user.id)

	bookmarks =
	user.id
	\|> Bookmark.for_user_query()
	\|> Pleroma.Pagination.fetch_paginated(params)

	activities =
	bookmarks
	\|> Enum.map(fn b -> Map.put(b.activity, :bookmark, Map.delete(b, :activity)) end)

	conn
	\|> add_link_headers(bookmarks)
	\|> render("index.json", %{activities: activities, for: user, as: :activity})
	end
	end
	diff --git a/lib/pleroma/web/mongooseim/mongoose_im_controller.ex b/lib/pleroma/web/mongooseim/mongoose_im_controller.ex
	index 6ed181cff..358600e7d 100644
	--- a/lib/pleroma/web/mongooseim/mongoose_im_controller.ex
	+++ b/lib/pleroma/web/mongooseim/mongoose_im_controller.ex
	@@ -1,46 +1,46 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MongooseIM.MongooseIMController do
	use Pleroma.Web, :controller

	alias Comeonin.Pbkdf2
	alias Pleroma.Plugs.RateLimiter
	alias Pleroma.Repo
	alias Pleroma.User

	- plug(RateLimiter, :authentication when action in [:user_exists, :check_password])
	- plug(RateLimiter, {:authentication, params: ["user"]} when action == :check_password)
	+ plug(RateLimiter, [name: :authentication] when action in [:user_exists, :check_password])
	+ plug(RateLimiter, [name: :authentication, params: ["user"]] when action == :check_password)

	def user_exists(conn, %{"user" => username}) do
	with %User{} <- Repo.get_by(User, nickname: username, local: true) do
	conn
	\|> json(true)
	else
	_ ->
	conn
	\|> put_status(:not_found)
	\|> json(false)
	end
	end

	def check_password(conn, %{"user" => username, "pass" => password}) do
	with %User{password_hash: password_hash} <-
	Repo.get_by(User, nickname: username, local: true),
	true <- Pbkdf2.checkpw(password, password_hash) do
	conn
	\|> json(true)
	else
	false ->
	conn
	\|> put_status(:forbidden)
	\|> json(false)

	_ ->
	conn
	\|> put_status(:not_found)
	\|> json(false)
	end
	end
	end
	diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
	index fe71aca8c..1b1394787 100644
	--- a/lib/pleroma/web/oauth/oauth_controller.ex
	+++ b/lib/pleroma/web/oauth/oauth_controller.ex
	@@ -1,490 +1,491 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.OAuth.OAuthController do
	use Pleroma.Web, :controller

	alias Pleroma.Helpers.UriHelper
	+ alias Pleroma.Plugs.RateLimiter
	alias Pleroma.Registration
	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web.Auth.Authenticator
	alias Pleroma.Web.ControllerHelper
	alias Pleroma.Web.OAuth.App
	alias Pleroma.Web.OAuth.Authorization
	alias Pleroma.Web.OAuth.Token
	alias Pleroma.Web.OAuth.Token.Strategy.RefreshToken
	alias Pleroma.Web.OAuth.Token.Strategy.Revoke, as: RevokeToken
	alias Pleroma.Web.OAuth.Scopes

	require Logger

	if Pleroma.Config.oauth_consumer_enabled?(), do: plug(Ueberauth)

	plug(:fetch_session)
	plug(:fetch_flash)
	- plug(Pleroma.Plugs.RateLimiter, :authentication when action == :create_authorization)
	+ plug(RateLimiter, [name: :authentication] when action == :create_authorization)

	action_fallback(Pleroma.Web.OAuth.FallbackController)

	@oob_token_redirect_uri "urn:ietf:wg:oauth:2.0:oob"

	# Note: this definition is only called from error-handling methods with `conn.params` as 2nd arg
	def authorize(%Plug.Conn{} = conn, %{"authorization" => _} = params) do
	{auth_attrs, params} = Map.pop(params, "authorization")
	authorize(conn, Map.merge(params, auth_attrs))
	end

	def authorize(%Plug.Conn{assigns: %{token: %Token{}}} = conn, params) do
	if ControllerHelper.truthy_param?(params["force_login"]) do
	do_authorize(conn, params)
	else
	handle_existing_authorization(conn, params)
	end
	end

	def authorize(%Plug.Conn{} = conn, params), do: do_authorize(conn, params)

	defp do_authorize(%Plug.Conn{} = conn, params) do
	app = Repo.get_by(App, client_id: params["client_id"])
	available_scopes = (app && app.scopes) \|\| []
	scopes = Scopes.fetch_scopes(params, available_scopes)

	# Note: `params` might differ from `conn.params`; use `@params` not `@conn.params` in template
	render(conn, Authenticator.auth_template(), %{
	response_type: params["response_type"],
	client_id: params["client_id"],
	available_scopes: available_scopes,
	scopes: scopes,
	redirect_uri: params["redirect_uri"],
	state: params["state"],
	params: params
	})
	end

	defp handle_existing_authorization(
	%Plug.Conn{assigns: %{token: %Token{} = token}} = conn,
	%{"redirect_uri" => @oob_token_redirect_uri}
	) do
	render(conn, "oob_token_exists.html", %{token: token})
	end

	defp handle_existing_authorization(
	%Plug.Conn{assigns: %{token: %Token{} = token}} = conn,
	%{} = params
	) do
	app = Repo.preload(token, :app).app

	redirect_uri =
	if is_binary(params["redirect_uri"]) do
	params["redirect_uri"]
	else
	default_redirect_uri(app)
	end

	if redirect_uri in String.split(app.redirect_uris) do
	redirect_uri = redirect_uri(conn, redirect_uri)
	url_params = %{access_token: token.token}
	url_params = UriHelper.append_param_if_present(url_params, :state, params["state"])
	url = UriHelper.append_uri_params(redirect_uri, url_params)
	redirect(conn, external: url)
	else
	conn
	\|> put_flash(:error, dgettext("errors", "Unlisted redirect_uri."))
	\|> redirect(external: redirect_uri(conn, redirect_uri))
	end
	end

	def create_authorization(
	%Plug.Conn{} = conn,
	%{"authorization" => _} = params,
	opts \\ []
	) do
	with {:ok, auth} <- do_create_authorization(conn, params, opts[:user]) do
	after_create_authorization(conn, auth, params)
	else
	error ->
	handle_create_authorization_error(conn, error, params)
	end
	end

	def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
	"authorization" => %{"redirect_uri" => @oob_token_redirect_uri}
	}) do
	render(conn, "oob_authorization_created.html", %{auth: auth})
	end

	def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
	"authorization" => %{"redirect_uri" => redirect_uri} = auth_attrs
	}) do
	app = Repo.preload(auth, :app).app

	# An extra safety measure before we redirect (also done in `do_create_authorization/2`)
	if redirect_uri in String.split(app.redirect_uris) do
	redirect_uri = redirect_uri(conn, redirect_uri)
	url_params = %{code: auth.token}
	url_params = UriHelper.append_param_if_present(url_params, :state, auth_attrs["state"])
	url = UriHelper.append_uri_params(redirect_uri, url_params)
	redirect(conn, external: url)
	else
	conn
	\|> put_flash(:error, dgettext("errors", "Unlisted redirect_uri."))
	\|> redirect(external: redirect_uri(conn, redirect_uri))
	end
	end

	defp handle_create_authorization_error(
	%Plug.Conn{} = conn,
	{:error, scopes_issue},
	%{"authorization" => _} = params
	)
	when scopes_issue in [:unsupported_scopes, :missing_scopes] do
	# Per https://github.com/tootsuite/mastodon/blob/
	# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L39
	conn
	\|> put_flash(:error, dgettext("errors", "This action is outside the authorized scopes"))
	\|> put_status(:unauthorized)
	\|> authorize(params)
	end

	defp handle_create_authorization_error(
	%Plug.Conn{} = conn,
	{:auth_active, false},
	%{"authorization" => _} = params
	) do
	# Per https://github.com/tootsuite/mastodon/blob/
	# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
	conn
	\|> put_flash(:error, dgettext("errors", "Your login is missing a confirmed e-mail address"))
	\|> put_status(:forbidden)
	\|> authorize(params)
	end

	defp handle_create_authorization_error(%Plug.Conn{} = conn, error, %{"authorization" => _}) do
	Authenticator.handle_error(conn, error)
	end

	@doc "Renew access_token with refresh_token"
	def token_exchange(
	%Plug.Conn{} = conn,
	%{"grant_type" => "refresh_token", "refresh_token" => token} = _params
	) do
	with {:ok, app} <- Token.Utils.fetch_app(conn),
	{:ok, %{user: user} = token} <- Token.get_by_refresh_token(app, token),
	{:ok, token} <- RefreshToken.grant(token) do
	response_attrs = %{created_at: Token.Utils.format_created_at(token)}

	json(conn, Token.Response.build(user, token, response_attrs))
	else
	_error -> render_invalid_credentials_error(conn)
	end
	end

	def token_exchange(%Plug.Conn{} = conn, %{"grant_type" => "authorization_code"} = params) do
	with {:ok, app} <- Token.Utils.fetch_app(conn),
	fixed_token = Token.Utils.fix_padding(params["code"]),
	{:ok, auth} <- Authorization.get_by_token(app, fixed_token),
	%User{} = user <- User.get_cached_by_id(auth.user_id),
	{:ok, token} <- Token.exchange_token(app, auth) do
	response_attrs = %{created_at: Token.Utils.format_created_at(token)}

	json(conn, Token.Response.build(user, token, response_attrs))
	else
	_error -> render_invalid_credentials_error(conn)
	end
	end

	def token_exchange(
	%Plug.Conn{} = conn,
	%{"grant_type" => "password"} = params
	) do
	with {:ok, %User{} = user} <- Authenticator.get_user(conn),
	{:ok, app} <- Token.Utils.fetch_app(conn),
	{:auth_active, true} <- {:auth_active, User.auth_active?(user)},
	{:user_active, true} <- {:user_active, !user.deactivated},
	{:password_reset_pending, false} <-
	{:password_reset_pending, user.password_reset_pending},
	{:ok, scopes} <- validate_scopes(app, params),
	{:ok, auth} <- Authorization.create_authorization(app, user, scopes),
	{:ok, token} <- Token.exchange_token(app, auth) do
	json(conn, Token.Response.build(user, token))
	else
	{:auth_active, false} ->
	# Per https://github.com/tootsuite/mastodon/blob/
	# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
	render_error(
	conn,
	:forbidden,
	"Your login is missing a confirmed e-mail address",
	%{},
	"missing_confirmed_email"
	)

	{:user_active, false} ->
	render_error(
	conn,
	:forbidden,
	"Your account is currently disabled",
	%{},
	"account_is_disabled"
	)

	{:password_reset_pending, true} ->
	render_error(
	conn,
	:forbidden,
	"Password reset is required",
	%{},
	"password_reset_required"
	)

	_error ->
	render_invalid_credentials_error(conn)
	end
	end

	def token_exchange(
	%Plug.Conn{} = conn,
	%{"grant_type" => "password", "name" => name, "password" => _password} = params
	) do
	params =
	params
	\|> Map.delete("name")
	\|> Map.put("username", name)

	token_exchange(conn, params)
	end

	def token_exchange(%Plug.Conn{} = conn, %{"grant_type" => "client_credentials"} = _params) do
	with {:ok, app} <- Token.Utils.fetch_app(conn),
	{:ok, auth} <- Authorization.create_authorization(app, %User{}),
	{:ok, token} <- Token.exchange_token(app, auth) do
	json(conn, Token.Response.build_for_client_credentials(token))
	else
	_error -> render_invalid_credentials_error(conn)
	end
	end

	# Bad request
	def token_exchange(%Plug.Conn{} = conn, params), do: bad_request(conn, params)

	def token_revoke(%Plug.Conn{} = conn, %{"token" => _token} = params) do
	with {:ok, app} <- Token.Utils.fetch_app(conn),
	{:ok, _token} <- RevokeToken.revoke(app, params) do
	json(conn, %{})
	else
	_error ->
	# RFC 7009: invalid tokens [in the request] do not cause an error response
	json(conn, %{})
	end
	end

	def token_revoke(%Plug.Conn{} = conn, params), do: bad_request(conn, params)

	# Response for bad request
	defp bad_request(%Plug.Conn{} = conn, _) do
	render_error(conn, :internal_server_error, "Bad request")
	end

	@doc "Prepares OAuth request to provider for Ueberauth"
	def prepare_request(%Plug.Conn{} = conn, %{
	"provider" => provider,
	"authorization" => auth_attrs
	}) do
	scope =
	auth_attrs
	\|> Scopes.fetch_scopes([])
	\|> Scopes.to_string()

	state =
	auth_attrs
	\|> Map.delete("scopes")
	\|> Map.put("scope", scope)
	\|> Jason.encode!()

	params =
	auth_attrs
	\|> Map.drop(~w(scope scopes client_id redirect_uri))
	\|> Map.put("state", state)

	# Handing the request to Ueberauth
	redirect(conn, to: o_auth_path(conn, :request, provider, params))
	end

	def request(%Plug.Conn{} = conn, params) do
	message =
	if params["provider"] do
	dgettext("errors", "Unsupported OAuth provider: %{provider}.",
	provider: params["provider"]
	)
	else
	dgettext("errors", "Bad OAuth request.")
	end

	conn
	\|> put_flash(:error, message)
	\|> redirect(to: "/")
	end

	def callback(%Plug.Conn{assigns: %{ueberauth_failure: failure}} = conn, params) do
	params = callback_params(params)
	messages = for e <- Map.get(failure, :errors, []), do: e.message
	message = Enum.join(messages, "; ")

	conn
	\|> put_flash(
	:error,
	dgettext("errors", "Failed to authenticate: %{message}.", message: message)
	)
	\|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
	end

	def callback(%Plug.Conn{} = conn, params) do
	params = callback_params(params)

	with {:ok, registration} <- Authenticator.get_registration(conn) do
	auth_attrs = Map.take(params, ~w(client_id redirect_uri scope scopes state))

	case Repo.get_assoc(registration, :user) do
	{:ok, user} ->
	create_authorization(conn, %{"authorization" => auth_attrs}, user: user)

	_ ->
	registration_params =
	Map.merge(auth_attrs, %{
	"nickname" => Registration.nickname(registration),
	"email" => Registration.email(registration)
	})

	conn
	\|> put_session_registration_id(registration.id)
	\|> registration_details(%{"authorization" => registration_params})
	end
	else
	error ->
	Logger.debug(inspect(["OAUTH_ERROR", error, conn.assigns]))

	conn
	\|> put_flash(:error, dgettext("errors", "Failed to set up user account."))
	\|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
	end
	end

	defp callback_params(%{"state" => state} = params) do
	Map.merge(params, Jason.decode!(state))
	end

	def registration_details(%Plug.Conn{} = conn, %{"authorization" => auth_attrs}) do
	render(conn, "register.html", %{
	client_id: auth_attrs["client_id"],
	redirect_uri: auth_attrs["redirect_uri"],
	state: auth_attrs["state"],
	scopes: Scopes.fetch_scopes(auth_attrs, []),
	nickname: auth_attrs["nickname"],
	email: auth_attrs["email"]
	})
	end

	def register(%Plug.Conn{} = conn, %{"authorization" => _, "op" => "connect"} = params) do
	with registration_id when not is_nil(registration_id) <- get_session_registration_id(conn),
	%Registration{} = registration <- Repo.get(Registration, registration_id),
	{_, {:ok, auth}} <- {:create_authorization, do_create_authorization(conn, params)},
	%User{} = user <- Repo.preload(auth, :user).user,
	{:ok, _updated_registration} <- Registration.bind_to_user(registration, user) do
	conn
	\|> put_session_registration_id(nil)
	\|> after_create_authorization(auth, params)
	else
	{:create_authorization, error} ->
	{:register, handle_create_authorization_error(conn, error, params)}

	_ ->
	{:register, :generic_error}
	end
	end

	def register(%Plug.Conn{} = conn, %{"authorization" => _, "op" => "register"} = params) do
	with registration_id when not is_nil(registration_id) <- get_session_registration_id(conn),
	%Registration{} = registration <- Repo.get(Registration, registration_id),
	{:ok, user} <- Authenticator.create_from_registration(conn, registration) do
	conn
	\|> put_session_registration_id(nil)
	\|> create_authorization(
	params,
	user: user
	)
	else
	{:error, changeset} ->
	message =
	Enum.map(changeset.errors, fn {field, {error, _}} ->
	"#{field} #{error}"
	end)
	\|> Enum.join("; ")

	message =
	String.replace(
	message,
	"ap_id has already been taken",
	"nickname has already been taken"
	)

	conn
	\|> put_status(:forbidden)
	\|> put_flash(:error, "Error: #{message}.")
	\|> registration_details(params)

	_ ->
	{:register, :generic_error}
	end
	end

	defp do_create_authorization(
	%Plug.Conn{} = conn,
	%{
	"authorization" =>
	%{
	"client_id" => client_id,
	"redirect_uri" => redirect_uri
	} = auth_attrs
	},
	user \\ nil
	) do
	with {_, {:ok, %User{} = user}} <-
	{:get_user, (user && {:ok, user}) \|\| Authenticator.get_user(conn)},
	%App{} = app <- Repo.get_by(App, client_id: client_id),
	true <- redirect_uri in String.split(app.redirect_uris),
	{:ok, scopes} <- validate_scopes(app, auth_attrs),
	{:auth_active, true} <- {:auth_active, User.auth_active?(user)} do
	Authorization.create_authorization(app, user, scopes)
	end
	end

	# Special case: Local MastodonFE
	defp redirect_uri(%Plug.Conn{} = conn, "."), do: auth_url(conn, :login)

	defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri

	defp get_session_registration_id(%Plug.Conn{} = conn), do: get_session(conn, :registration_id)

	defp put_session_registration_id(%Plug.Conn{} = conn, registration_id),
	do: put_session(conn, :registration_id, registration_id)

	@spec validate_scopes(App.t(), map()) ::
	{:ok, list()} \| {:error, :missing_scopes \| :unsupported_scopes}
	defp validate_scopes(app, params) do
	params
	\|> Scopes.fetch_scopes(app.scopes)
	\|> Scopes.validate(app.scopes)
	end

	def default_redirect_uri(%App{} = app) do
	app.redirect_uris
	\|> String.split()
	\|> Enum.at(0)
	end

	defp render_invalid_credentials_error(conn) do
	render_error(conn, :bad_request, "Invalid credentials")
	end
	end
	diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
	index 6958519de..12a7c2365 100644
	--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
	+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
	@@ -1,164 +1,165 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.OStatus.OStatusController do
	use Pleroma.Web, :controller

	alias Fallback.RedirectController
	alias Pleroma.Activity
	alias Pleroma.Object
	+ alias Pleroma.Plugs.RateLimiter
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.ActivityPubController
	alias Pleroma.Web.ActivityPub.ObjectView
	alias Pleroma.Web.ActivityPub.Visibility
	alias Pleroma.Web.Endpoint
	alias Pleroma.Web.Metadata.PlayerView
	alias Pleroma.Web.Router

	plug(
	- Pleroma.Plugs.RateLimiter,
	- {:ap_routes, params: ["uuid"]} when action in [:object, :activity]
	+ RateLimiter,
	+ [name: :ap_routes, params: ["uuid"]] when action in [:object, :activity]
	)

	plug(
	Pleroma.Plugs.SetFormatPlug
	when action in [:object, :activity, :notice]
	)

	action_fallback(:errors)

	def object(%{assigns: %{format: format}} = conn, %{"uuid" => _uuid})
	when format in ["json", "activity+json"] do
	ActivityPubController.call(conn, :object)
	end

	def object(%{assigns: %{format: format}} = conn, %{"uuid" => uuid}) do
	with id <- o_status_url(conn, :object, uuid),
	{_, %Activity{} = activity} <-
	{:activity, Activity.get_create_by_object_ap_id_with_object(id)},
	{_, true} <- {:public?, Visibility.is_public?(activity)},
	%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
	case format do
	"html" -> redirect(conn, to: "/notice/#{activity.id}")
	_ -> represent_activity(conn, nil, activity, user)
	end
	else
	reason when reason in [{:public?, false}, {:activity, nil}] ->
	{:error, :not_found}

	e ->
	e
	end
	end

	def activity(%{assigns: %{format: format}} = conn, %{"uuid" => _uuid})
	when format in ["json", "activity+json"] do
	ActivityPubController.call(conn, :activity)
	end

	def activity(%{assigns: %{format: format}} = conn, %{"uuid" => uuid}) do
	with id <- o_status_url(conn, :activity, uuid),
	{_, %Activity{} = activity} <- {:activity, Activity.normalize(id)},
	{_, true} <- {:public?, Visibility.is_public?(activity)},
	%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
	case format do
	"html" -> redirect(conn, to: "/notice/#{activity.id}")
	_ -> represent_activity(conn, format, activity, user)
	end
	else
	reason when reason in [{:public?, false}, {:activity, nil}] ->
	{:error, :not_found}

	e ->
	e
	end
	end

	def notice(%{assigns: %{format: format}} = conn, %{"id" => id}) do
	with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)},
	{_, true} <- {:public?, Visibility.is_public?(activity)},
	%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
	cond do
	format == "html" && activity.data["type"] == "Create" ->
	%Object{} = object = Object.normalize(activity)

	RedirectController.redirector_with_meta(
	conn,
	%{
	activity_id: activity.id,
	object: object,
	url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id),
	user: user
	}
	)

	format == "html" ->
	RedirectController.redirector(conn, nil)

	true ->
	represent_activity(conn, format, activity, user)
	end
	else
	reason when reason in [{:public?, false}, {:activity, nil}] ->
	conn
	\|> put_status(404)
	\|> RedirectController.redirector(nil, 404)

	e ->
	e
	end
	end

	# Returns an HTML embedded <audio> or <video> player suitable for embed iframes.
	def notice_player(conn, %{"id" => id}) do
	with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id_with_object(id),
	true <- Visibility.is_public?(activity),
	%Object{} = object <- Object.normalize(activity),
	%{data: %{"attachment" => [%{"url" => [url \| _]} \| _]}} <- object,
	true <- String.starts_with?(url["mediaType"], ["audio", "video"]) do
	conn
	\|> put_layout(:metadata_player)
	\|> put_resp_header("x-frame-options", "ALLOW")
	\|> put_resp_header(
	"content-security-policy",
	"default-src 'none';style-src 'self' 'unsafe-inline';img-src 'self' data: https:; media-src 'self' https:;"
	)
	\|> put_view(PlayerView)
	\|> render("player.html", url)
	else
	_error ->
	conn
	\|> put_status(404)
	\|> RedirectController.redirector(nil, 404)
	end
	end

	defp represent_activity(
	conn,
	"activity+json",
	%Activity{data: %{"type" => "Create"}} = activity,
	_user
	) do
	object = Object.normalize(activity)

	conn
	\|> put_resp_header("content-type", "application/activity+json")
	\|> put_view(ObjectView)
	\|> render("object.json", %{object: object})
	end

	defp represent_activity(_conn, _, _, _) do
	{:error, :not_found}
	end

	def errors(conn, {:error, :not_found}) do
	render_error(conn, :not_found, "Not found")
	end

	def errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found})

	def errors(conn, _) do
	render_error(conn, :internal_server_error, "Something went wrong")
	end
	end
	diff --git a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
	index db6faac83..bc2f1017c 100644
	--- a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
	+++ b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
	@@ -1,162 +1,162 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.PleromaAPI.AccountController do
	use Pleroma.Web, :controller

	import Pleroma.Web.ControllerHelper,
	only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2]

	alias Ecto.Changeset
	alias Pleroma.Plugs.OAuthScopesPlug
	alias Pleroma.Plugs.RateLimiter
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.MastodonAPI.StatusView

	require Pleroma.Constants

	plug(
	OAuthScopesPlug,
	%{scopes: ["follow", "write:follows"]} when action in [:subscribe, :unsubscribe]
	)

	plug(
	OAuthScopesPlug,
	%{scopes: ["write:accounts"]}
	# Note: the following actions are not permission-secured in Mastodon:
	when action in [
	:update_avatar,
	:update_banner,
	:update_background
	]
	)

	plug(OAuthScopesPlug, %{scopes: ["read:favourites"]} when action == :favourites)

	# An extra safety measure for possible actions not guarded by OAuth permissions specification
	plug(
	Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
	when action != :confirmation_resend
	)

	- plug(RateLimiter, :account_confirmation_resend when action == :confirmation_resend)
	+ plug(RateLimiter, [name: :account_confirmation_resend] when action == :confirmation_resend)
	plug(:assign_account_by_id when action in [:favourites, :subscribe, :unsubscribe])
	plug(:put_view, Pleroma.Web.MastodonAPI.AccountView)

	@doc "POST /api/v1/pleroma/accounts/confirmation_resend"
	def confirmation_resend(conn, params) do
	nickname_or_email = params["email"] \|\| params["nickname"]

	with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email),
	{:ok, _} <- User.try_send_confirmation_email(user) do
	json_response(conn, :no_content, "")
	end
	end

	@doc "PATCH /api/v1/pleroma/accounts/update_avatar"
	def update_avatar(%{assigns: %{user: user}} = conn, %{"img" => ""}) do
	{:ok, user} =
	user
	\|> Changeset.change(%{avatar: nil})
	\|> User.update_and_set_cache()

	CommonAPI.update(user)

	json(conn, %{url: nil})
	end

	def update_avatar(%{assigns: %{user: user}} = conn, params) do
	{:ok, %{data: data}} = ActivityPub.upload(params, type: :avatar)
	{:ok, user} = user \|> Changeset.change(%{avatar: data}) \|> User.update_and_set_cache()
	%{"url" => [%{"href" => href} \| _]} = data

	CommonAPI.update(user)

	json(conn, %{url: href})
	end

	@doc "PATCH /api/v1/pleroma/accounts/update_banner"
	def update_banner(%{assigns: %{user: user}} = conn, %{"banner" => ""}) do
	with {:ok, user} <- User.update_banner(user, %{}) do
	CommonAPI.update(user)
	json(conn, %{url: nil})
	end
	end

	def update_banner(%{assigns: %{user: user}} = conn, params) do
	with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}, type: :banner),
	{:ok, user} <- User.update_banner(user, object.data) do
	CommonAPI.update(user)
	%{"url" => [%{"href" => href} \| _]} = object.data

	json(conn, %{url: href})
	end
	end

	@doc "PATCH /api/v1/pleroma/accounts/update_background"
	def update_background(%{assigns: %{user: user}} = conn, %{"img" => ""}) do
	with {:ok, _user} <- User.update_background(user, %{}) do
	json(conn, %{url: nil})
	end
	end

	def update_background(%{assigns: %{user: user}} = conn, params) do
	with {:ok, object} <- ActivityPub.upload(params, type: :background),
	{:ok, _user} <- User.update_background(user, object.data) do
	%{"url" => [%{"href" => href} \| _]} = object.data

	json(conn, %{url: href})
	end
	end

	@doc "GET /api/v1/pleroma/accounts/:id/favourites"
	def favourites(%{assigns: %{account: %{hide_favorites: true}}} = conn, _params) do
	render_error(conn, :forbidden, "Can't get favorites")
	end

	def favourites(%{assigns: %{user: for_user, account: user}} = conn, params) do
	params =
	params
	\|> Map.put("type", "Create")
	\|> Map.put("favorited_by", user.ap_id)
	\|> Map.put("blocking_user", for_user)

	recipients =
	if for_user do
	[Pleroma.Constants.as_public()] ++ [for_user.ap_id \| User.following(for_user)]
	else
	[Pleroma.Constants.as_public()]
	end

	activities =
	recipients
	\|> ActivityPub.fetch_activities(params)
	\|> Enum.reverse()

	conn
	\|> add_link_headers(activities)
	\|> put_view(StatusView)
	\|> render("index.json", activities: activities, for: for_user, as: :activity)
	end

	@doc "POST /api/v1/pleroma/accounts/:id/subscribe"
	def subscribe(%{assigns: %{user: user, account: subscription_target}} = conn, _params) do
	with {:ok, subscription_target} <- User.subscribe(user, subscription_target) do
	render(conn, "relationship.json", user: user, target: subscription_target)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end

	@doc "POST /api/v1/pleroma/accounts/:id/unsubscribe"
	def unsubscribe(%{assigns: %{user: user, account: subscription_target}} = conn, _params) do
	with {:ok, subscription_target} <- User.unsubscribe(user, subscription_target) do
	render(conn, "relationship.json", user: user, target: subscription_target)
	else
	{:error, message} -> json_response(conn, :forbidden, %{error: message})
	end
	end
	end
	diff --git a/mix.exs b/mix.exs
	index 0a3a03a61..09839082c 100644
	--- a/mix.exs
	+++ b/mix.exs
	@@ -1,280 +1,280 @@
	defmodule Pleroma.Mixfile do
	use Mix.Project

	def project do
	[
	app: :pleroma,
	version: version("1.1.50"),
	elixir: "~> 1.8",
	elixirc_paths: elixirc_paths(Mix.env()),
	compilers: [:phoenix, :gettext] ++ Mix.compilers(),
	elixirc_options: [warnings_as_errors: true],
	xref: [exclude: [:eldap]],
	start_permanent: Mix.env() == :prod,
	aliases: aliases(),
	deps: deps(),
	test_coverage: [tool: ExCoveralls],
	preferred_cli_env: ["coveralls.html": :test],
	# Docs
	name: "Pleroma",
	homepage_url: "https://pleroma.social/",
	source_url: "https://git.pleroma.social/pleroma/pleroma",
	docs: [
	source_url_pattern:
	"https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
	logo: "priv/static/static/logo.png",
	extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/*/.md"),
	groups_for_extras: [
	"Installation manuals": Path.wildcard("docs/installation/*.md"),
	Configuration: Path.wildcard("docs/config/*.md"),
	Administration: Path.wildcard("docs/admin/*.md"),
	"Pleroma's APIs and Mastodon API extensions": Path.wildcard("docs/api/*.md")
	],
	main: "readme",
	output: "priv/static/doc"
	],
	releases: [
	pleroma: [
	include_executables_for: [:unix],
	applications: [ex_syslogger: :load, syslog: :load],
	steps: [:assemble, &copy_files/1, &copy_nginx_config/1]
	]
	]
	]
	end

	def copy_files(%{path: target_path} = release) do
	File.cp_r!("./rel/files", target_path)
	release
	end

	def copy_nginx_config(%{path: target_path} = release) do
	File.cp!(
	"./installation/pleroma.nginx",
	Path.join([target_path, "installation", "pleroma.nginx"])
	)

	release
	end

	# Configuration for the OTP application.
	#
	# Type `mix help compile.app` for more information.
	def application do
	[
	mod: {Pleroma.Application, []},
	extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :myhtmlex, :swarm],
	included_applications: [:ex_syslogger]
	]
	end

	# Specifies which paths to compile per environment.
	defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"]
	defp elixirc_paths(:test), do: ["lib", "test/support"]
	defp elixirc_paths(_), do: ["lib"]

	# Specifies OAuth dependencies.
	defp oauth_deps do
	oauth_strategy_packages =
	System.get_env("OAUTH_CONSUMER_STRATEGIES")
	\|> to_string()
	\|> String.split()
	\|> Enum.map(fn strategy_entry ->
	with [_strategy, dependency] <- String.split(strategy_entry, ":") do
	dependency
	else
	[strategy] -> "ueberauth_#{strategy}"
	end
	end)

	for s <- oauth_strategy_packages, do: {String.to_atom(s), ">= 0.0.0"}
	end

	# Specifies your project dependencies.
	#
	# Type `mix help deps` for examples and options.
	defp deps do
	[
	{:phoenix, "~> 1.4.8"},
	{:tzdata, "~> 0.5.21"},
	{:plug_cowboy, "~> 2.0"},
	{:phoenix_pubsub, "~> 1.1"},
	{:phoenix_ecto, "~> 4.0"},
	{:ecto_sql, "~> 3.2"},
	{:postgrex, ">= 0.13.5"},
	{:oban, "~> 0.8.1"},
	{:quantum, "~> 2.3"},
	{:gettext, "~> 0.15"},
	{:comeonin, "~> 4.1.1"},
	{:pbkdf2_elixir, "~> 0.12.3"},
	{:trailing_format_plug, "~> 0.0.7"},
	{:fast_sanitize,
	git: "https://git.pleroma.social/pleroma/fast_sanitize.git",
	ref: "1af67547a02a104e26c99d03012383e8643bc4c2"},
	{:html_entities, "~> 0.5", override: true},
	{:phoenix_html, "~> 2.10"},
	{:calendar, "~> 0.17.4"},
	{:cachex, "~> 3.0.2"},
	{:poison, "~> 3.0", override: true},
	{:tesla, "~> 1.3", override: true},
	{:jason, "~> 1.0"},
	{:mogrify, "~> 0.6.1"},
	{:ex_aws, "~> 2.1"},
	{:ex_aws_s3, "~> 2.0"},
	{:sweet_xml, "~> 0.6.6"},
	{:earmark, "~> 1.3"},
	{:bbcode, "~> 0.1.1"},
	{:ex_machina, "~> 2.3", only: :test},
	{:credo, "~> 0.9.3", only: [:dev, :test]},
	{:mock, "~> 0.3.3", only: :test},
	{:crypt,
	git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
	{:cors_plug, "~> 1.5"},
	{:ex_doc, "~> 0.21", only: :dev, runtime: false},
	{:web_push_encryption, "~> 0.2.1"},
	{:swoosh, "~> 0.23.2"},
	{:phoenix_swoosh, "~> 0.2"},
	{:gen_smtp, "~> 0.13"},
	{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
	{:floki, "~> 0.23.0"},
	{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
	{:timex, "~> 3.5"},
	{:ueberauth, "~> 0.4"},
	{:auto_linker,
	git: "https://git.pleroma.social/pleroma/auto_linker.git",
	ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
	{:http_signatures,
	git: "https://git.pleroma.social/pleroma/http_signatures.git",
	ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
	{:telemetry, "~> 0.3"},
	{:poolboy, "~> 1.5"},
	{:prometheus_ex, "~> 3.0"},
	{:prometheus_plugs, "~> 1.1"},
	{:prometheus_phoenix, "~> 1.3"},
	{:prometheus_ecto, "~> 1.4"},
	{:recon, github: "ferd/recon", tag: "2.4.0"},
	{:quack, "~> 0.1.1"},
	{:joken, "~> 2.0"},
	{:benchee, "~> 1.0"},
	{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
	- {:ex_rated, "~> 1.3"},
	+ {:con_cache, "~> 0.14"},
	{:ex_const, "~> 0.2"},
	{:plug_static_index_html, "~> 1.0.0"},
	{:excoveralls, "~> 0.11.1", only: :test},
	{:flake_id, "~> 0.1.0"},
	{:remote_ip,
	git: "https://git.pleroma.social/pleroma/remote_ip.git",
	ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"},
	{:mox, "~> 0.5", only: :test}
	] ++ oauth_deps()
	end

	# Aliases are shortcuts or tasks specific to the current project.
	# For example, to create, migrate and run the seeds file at once:
	#
	# $ mix ecto.setup
	#
	# See the documentation for `Mix` for more info on aliases.
	defp aliases do
	[
	"ecto.migrate": ["pleroma.ecto.migrate"],
	"ecto.rollback": ["pleroma.ecto.rollback"],
	"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
	"ecto.reset": ["ecto.drop", "ecto.setup"],
	test: ["ecto.create --quiet", "ecto.migrate", "test"],
	docs: ["pleroma.docs", "docs"]
	]
	end

	# Builds a version string made of:
	# * the application version
	# * a pre-release if ahead of the tag: the describe string (-count-commithash)
	# * branch name
	# * build metadata:
	# * a build name if `PLEROMA_BUILD_NAME` or `:pleroma, :build_name` is defined
	# * the mix environment if different than prod
	defp version(version) do
	identifier_filter = ~r/[^0-9a-z\-]+/i

	# Pre-release version, denoted from patch version with a hyphen
	{git_tag, git_pre_release} =
	with {tag, 0} <-
	System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
	tag = String.trim(tag),
	{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
	describe = String.trim(describe),
	ahead <- String.replace(describe, tag, ""),
	ahead <- String.trim_leading(ahead, "-") do
	{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}
	else
	_ ->
	{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
	{nil, "0-g" <> String.trim(commit_hash)}
	end

	if git_tag && version != git_tag do
	Mix.shell().error(
	"Application version #{inspect(version)} does not match git tag #{inspect(git_tag)}"
	)
	end

	# Branch name as pre-release version component, denoted with a dot
	branch_name =
	with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
	branch_name <- String.trim(branch_name),
	branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") \|\| branch_name,
	true <-
	!Enum.any?(["master", "HEAD", "release/", "stable"], fn name ->
	String.starts_with?(name, branch_name)
	end) do
	branch_name =
	branch_name
	\|> String.trim()
	\|> String.replace(identifier_filter, "-")

	branch_name
	end

	build_name =
	cond do
	name = Application.get_env(:pleroma, :build_name) -> name
	name = System.get_env("PLEROMA_BUILD_NAME") -> name
	true -> nil
	end

	env_name = if Mix.env() != :prod, do: to_string(Mix.env())
	env_override = System.get_env("PLEROMA_BUILD_ENV")

	env_name =
	case env_override do
	nil -> env_name
	env_override when env_override in ["", "prod"] -> nil
	env_override -> env_override
	end

	# Pre-release version, denoted by appending a hyphen
	# and a series of dot separated identifiers
	pre_release =
	[git_pre_release, branch_name]
	\|> Enum.filter(fn string -> string && string != "" end)
	\|> Enum.join(".")
	\|> (fn
	"" -> nil
	string -> "-" <> String.replace(string, identifier_filter, "-")
	end).()

	# Build metadata, denoted with a plus sign
	build_metadata =
	[build_name, env_name]
	\|> Enum.filter(fn string -> string && string != "" end)
	\|> Enum.join(".")
	\|> (fn
	"" -> nil
	string -> "+" <> String.replace(string, identifier_filter, "-")
	end).()

	[version, pre_release, build_metadata]
	\|> Enum.filter(fn string -> string && string != "" end)
	\|> Enum.join()
	end
	end
	diff --git a/mix.lock b/mix.lock
	index 082665c3c..1de9ae47b 100644
	--- a/mix.lock
	+++ b/mix.lock
	@@ -1,110 +1,111 @@
	%{
	"accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm"},
	"auto_linker": {:git, "https://git.pleroma.social/pleroma/auto_linker.git", "95e8188490e97505c56636c1379ffdf036c1fdde", [ref: "95e8188490e97505c56636c1379ffdf036c1fdde"]},
	"base62": {:hex, :base62, "1.2.1", "4866763e08555a7b3917064e9eef9194c41667276c51b59de2bc42c6ea65f806", [:mix], [{:custom_base, "~> 0.2.1", [hex: :custom_base, repo: "hexpm", optional: false]}], "hexpm"},
	"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
	"bbcode": {:hex, :bbcode, "0.1.1", "0023e2c7814119b2e620b7add67182e3f6019f92bfec9a22da7e99821aceba70", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm"},
	"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
	"cachex": {:hex, :cachex, "3.0.3", "4e2d3e05814a5738f5ff3903151d5c25636d72a3527251b753f501ad9c657967", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm"},
	"calendar": {:hex, :calendar, "0.17.6", "ec291cb2e4ba499c2e8c0ef5f4ace974e2f9d02ae9e807e711a9b0c7850b9aee", [:mix], [{:tzdata, "~> 0.5.20 or ~> 0.1.201603 or ~> 1.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
	"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},
	"comeonin": {:hex, :comeonin, "4.1.2", "3eb5620fd8e35508991664b4c2b04dd41e52f1620b36957be837c1d7784b7592", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"},
	+ "con_cache": {:hex, :con_cache, "0.14.0", "863acb90fa08017be3129074993af944cf7a4b6c3ee7c06c5cd0ed6b94fbc223", [:mix], [], "hexpm"},
	"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
	"cors_plug": {:hex, :cors_plug, "1.5.2", "72df63c87e4f94112f458ce9d25800900cc88608c1078f0e4faddf20933eda6e", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"cowboy": {:hex, :cowboy, "2.7.0", "91ed100138a764355f43316b1d23d7ff6bdb0de4ea618cb5d8677c93a7a2f115", [:rebar3], [{:cowlib, "~> 2.8.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
	"cowlib": {:hex, :cowlib, "2.8.0", "fd0ff1787db84ac415b8211573e9a30a3ebe71b5cbff7f720089972b2319c8a4", [:rebar3], [], "hexpm"},
	"credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"crontab": {:hex, :crontab, "1.1.8", "2ce0e74777dfcadb28a1debbea707e58b879e6aa0ffbf9c9bb540887bce43617", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
	"crypt": {:git, "https://github.com/msantos/crypt", "1f2b58927ab57e72910191a7ebaeff984382a1d3", [ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"]},
	"custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm"},
	"db_connection": {:hex, :db_connection, "2.1.1", "a51e8a2ee54ef2ae6ec41a668c85787ed40cb8944928c191280fe34c15b76ae5", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
	"decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"},
	"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm"},
	"earmark": {:hex, :earmark, "1.4.2", "3aa0bd23bc4c61cf2f1e5d752d1bb470560a6f8539974f767a38923bb20e1d7f", [:mix], [], "hexpm"},
	"ecto": {:hex, :ecto, "3.2.3", "51274df79862845b388733fddcf6f107d0c8c86e27abe7131fa98f8d30761bda", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"ecto_sql": {:hex, :ecto_sql, "3.2.0", "751cea597e8deb616084894dd75cbabfdbe7255ff01e8c058ca13f0353a3921b", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.2.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"esshd": {:hex, :esshd, "0.1.0", "6f93a2062adb43637edad0ea7357db2702a4b80dd9683482fe00f5134e97f4c1", [:mix], [], "hexpm"},
	"eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm"},
	"ex2ms": {:hex, :ex2ms, "1.5.0", "19e27f9212be9a96093fed8cdfbef0a2b56c21237196d26760f11dfcfae58e97", [:mix], [], "hexpm"},
	"ex_aws": {:hex, :ex_aws, "2.1.1", "1e4de2106cfbf4e837de41be41cd15813eabc722315e388f0d6bb3732cec47cd", [:mix], [{:configparser_ex, "~> 4.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "1.6.3 or 1.6.5 or 1.7.1 or 1.8.6 or ~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8", [hex: :jsx, repo: "hexpm", optional: true]}, {:poison, ">= 1.2.0", [hex: :poison, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_aws_s3": {:hex, :ex_aws_s3, "2.0.2", "c0258bbdfea55de4f98f0b2f0ca61fe402cc696f573815134beb1866e778f47b", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_const": {:hex, :ex_const, "0.2.4", "d06e540c9d834865b012a17407761455efa71d0ce91e5831e86881b9c9d82448", [:mix], [], "hexpm"},
	"ex_doc": {:hex, :ex_doc, "0.21.2", "caca5bc28ed7b3bdc0b662f8afe2bee1eedb5c3cf7b322feeeb7c6ebbde089d6", [:mix], [{:earmark, "~> 1.3.3 or ~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_rated": {:hex, :ex_rated, "1.3.3", "30ecbdabe91f7eaa9d37fa4e81c85ba420f371babeb9d1910adbcd79ec798d27", [:mix], [{:ex2ms, "~> 1.5", [hex: :ex2ms, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_syslogger": {:git, "https://github.com/slashmili/ex_syslogger.git", "f3963399047af17e038897c69e20d552e6899e1d", [tag: "1.4.0"]},
	"excoveralls": {:hex, :excoveralls, "0.11.2", "0c6f2c8db7683b0caa9d490fb8125709c54580b4255ffa7ad35f3264b075a643", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
	"fast_sanitize": {:git, "https://git.pleroma.social/pleroma/fast_sanitize.git", "1af67547a02a104e26c99d03012383e8643bc4c2", [ref: "1af67547a02a104e26c99d03012383e8643bc4c2"]},
	"flake_id": {:hex, :flake_id, "0.1.0", "7716b086d2e405d09b647121a166498a0d93d1a623bead243e1f74216079ccb3", [:mix], [{:base62, "~> 1.2", [hex: :base62, repo: "hexpm", optional: false]}, {:ecto, ">= 2.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
	"floki": {:hex, :floki, "0.23.0", "956ab6dba828c96e732454809fb0bd8d43ce0979b75f34de6322e73d4c917829", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm"},
	"gen_smtp": {:hex, :gen_smtp, "0.15.0", "9f51960c17769b26833b50df0b96123605a8024738b62db747fece14eb2fbfcc", [:rebar3], [], "hexpm"},
	"gen_stage": {:hex, :gen_stage, "0.14.3", "d0c66f1c87faa301c1a85a809a3ee9097a4264b2edf7644bf5c123237ef732bf", [:mix], [], "hexpm"},
	"gen_state_machine": {:hex, :gen_state_machine, "2.0.5", "9ac15ec6e66acac994cc442dcc2c6f9796cf380ec4b08267223014be1c728a95", [:mix], [], "hexpm"},
	"gettext": {:hex, :gettext, "0.17.1", "8baab33482df4907b3eae22f719da492cee3981a26e649b9c2be1c0192616962", [:mix], [], "hexpm"},
	"hackney": {:hex, :hackney, "1.15.2", "07e33c794f8f8964ee86cebec1a8ed88db5070e52e904b8f12209773c1036085", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.5", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
	"html_entities": {:hex, :html_entities, "0.5.0", "40f5c5b9cbe23073b48a4e69c67b6c11974f623a76165e2b92d098c0e88ccb1d", [:mix], [], "hexpm"},
	"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.3.0", "f005ad692b717691203f940c686208aa3d8ffd9dd4bb3699240096a51fa9564e", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
	"http_signatures": {:git, "https://git.pleroma.social/pleroma/http_signatures.git", "293d77bb6f4a67ac8bde1428735c3b42f22cbb30", [ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"]},
	"httpoison": {:hex, :httpoison, "1.6.1", "2ce5bf6e535cd0ab02e905ba8c276580bab80052c5c549f53ddea52d72e81f33", [:mix], [{:hackney, "~> 1.15 and >= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
	"inet_cidr": {:hex, :inet_cidr, "1.0.4", "a05744ab7c221ca8e395c926c3919a821eb512e8f36547c062f62c4ca0cf3d6e", [:mix], [], "hexpm"},
	"jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
	"joken": {:hex, :joken, "2.1.0", "bf21a73105d82649f617c5e59a7f8919aa47013d2519ebcc39d998d8d12adda9", [:mix], [{:jose, "~> 1.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm"},
	"jose": {:hex, :jose, "1.9.0", "4167c5f6d06ffaebffd15cdb8da61a108445ef5e85ab8f5a7ad926fdf3ada154", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"},
	"libring": {:hex, :libring, "1.4.0", "41246ba2f3fbc76b3971f6bce83119dfec1eee17e977a48d8a9cfaaf58c2a8d6", [:mix], [], "hexpm"},
	"makeup": {:hex, :makeup, "1.0.0", "671df94cf5a594b739ce03b0d0316aa64312cee2574b6a44becb83cd90fb05dc", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
	"meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm"},
	"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
	"mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm"},
	"mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"},
	"mochiweb": {:hex, :mochiweb, "2.18.0", "eb55f1db3e6e960fac4e6db4e2db9ec3602cc9f30b86cd1481d56545c3145d2e", [:rebar3], [], "hexpm"},
	"mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
	"mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"},
	"mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"},
	"myhtmlex": {:git, "https://git.pleroma.social/pleroma/myhtmlex.git", "ad0097e2f61d4953bfef20fb6abddf23b87111e6", [ref: "ad0097e2f61d4953bfef20fb6abddf23b87111e6", submodules: true]},
	"nimble_parsec": {:hex, :nimble_parsec, "0.5.1", "c90796ecee0289dbb5ad16d3ad06f957b0cd1199769641c961cfe0b97db190e0", [:mix], [], "hexpm"},
	"nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]},
	"oban": {:hex, :oban, "0.8.1", "4bbf62eb1829f856d69aeb5069ac7036afe07db8221a17de2a9169cc7a58a318", [:mix], [{:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
	"pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.4", "8dd29ed783f2e12195d7e0a4640effc0a7c37e6537da491f1db01839eee6d053", [:mix], [], "hexpm"},
	"phoenix": {:hex, :phoenix, "1.4.10", "619e4a545505f562cd294df52294372d012823f4fd9d34a6657a8b242898c255", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
	"phoenix_swoosh": {:hex, :phoenix_swoosh, "0.2.0", "a7e0b32077cd6d2323ae15198839b05d9caddfa20663fd85787479e81f89520e", [:mix], [{:phoenix, "~> 1.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:swoosh, "~> 0.1", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm"},
	"plug": {:hex, :plug, "1.8.3", "12d5f9796dc72e8ac9614e94bda5e51c4c028d0d428e9297650d09e15a684478", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
	"plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
	"plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
	"poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
	"postgrex": {:hex, :postgrex, "0.15.1", "23ce3417de70f4c0e9e7419ad85bdabcc6860a6925fe2c6f3b1b5b1e8e47bf2f", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"prometheus": {:hex, :prometheus, "4.4.1", "1e96073b3ed7788053768fea779cbc896ddc3bdd9ba60687f2ad50b252ac87d6", [:mix, :rebar3], [], "hexpm"},
	"prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_phoenix": {:hex, :prometheus_phoenix, "1.3.0", "c4b527e0b3a9ef1af26bdcfbfad3998f37795b9185d475ca610fe4388fdd3bb5", [:mix], [{:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm"},
	"quack": {:hex, :quack, "0.1.1", "cca7b4da1a233757fdb44b3334fce80c94785b3ad5a602053b7a002b5a8967bf", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.0", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm"},
	"quantum": {:hex, :quantum, "2.3.4", "72a0e8855e2adc101459eac8454787cb74ab4169de6ca50f670e72142d4960e9", [:mix], [{:calendar, "~> 0.17", [hex: :calendar, repo: "hexpm", optional: true]}, {:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.12", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:swarm, "~> 3.3", [hex: :swarm, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: true]}], "hexpm"},
	"ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"},
	"recon": {:git, "https://github.com/ferd/recon.git", "75d70c7c08926d2f24f1ee6de14ee50fe8a52763", [tag: "2.4.0"]},
	"remote_ip": {:git, "https://git.pleroma.social/pleroma/remote_ip.git", "825dc00aaba5a1b7c4202a532b696b595dd3bcb3", [ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"]},
	"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.5", "6eaf7ad16cb568bb01753dbbd7a95ff8b91c7979482b95f38443fe2c8852a79b", [:make, :mix, :rebar3], [], "hexpm"},
	"swarm": {:hex, :swarm, "3.4.0", "64f8b30055d74640d2186c66354b33b999438692a91be275bb89cdc7e401f448", [:mix], [{:gen_state_machine, "~> 2.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:libring, "~> 1.0", [hex: :libring, repo: "hexpm", optional: false]}], "hexpm"},
	"sweet_xml": {:hex, :sweet_xml, "0.6.6", "fc3e91ec5dd7c787b6195757fbcf0abc670cee1e4172687b45183032221b66b8", [:mix], [], "hexpm"},
	"swoosh": {:hex, :swoosh, "0.23.5", "bfd9404bbf5069b1be2ffd317923ce57e58b332e25dbca2a35dedd7820dfee5a", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"},
	"syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]},
	"telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
	"tesla": {:hex, :tesla, "1.3.0", "f35d72f029e608f9cdc6f6d6fcc7c66cf6d6512a70cfef9206b21b8bd0203a30", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 0.4", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.3", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
	"timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"tzdata": {:hex, :tzdata, "0.5.22", "f2ba9105117ee0360eae2eca389783ef7db36d533899b2e84559404dbc77ebb8", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"ueberauth": {:hex, :ueberauth, "0.6.2", "25a31111249d60bad8b65438b2306a4dc91f3208faa62f5a8c33e8713989b2e8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
	"unsafe": {:hex, :unsafe, "1.0.1", "a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8", [:mix], [], "hexpm"},
	"web_push_encryption": {:hex, :web_push_encryption, "0.2.3", "a0ceab85a805a30852f143d22d71c434046fbdbafbc7292e7887cec500826a80", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"websocket_client": {:git, "https://github.com/jeremyong/websocket_client.git", "9a6f65d05ebf2725d62fb19262b21f1805a59fbf", []},
	}
	diff --git a/test/plugs/rate_limiter_test.exs b/test/plugs/rate_limiter_test.exs
	index 395095079..bee8530a3 100644
	--- a/test/plugs/rate_limiter_test.exs
	+++ b/test/plugs/rate_limiter_test.exs
	@@ -1,174 +1,207 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Plugs.RateLimiterTest do
	use ExUnit.Case, async: true
	use Plug.Test

	alias Pleroma.Plugs.RateLimiter

	import Pleroma.Factory

	# Note: each example must work with separate buckets in order to prevent concurrency issues

	- test "init/1" do
	- limiter_name = :test_init
	- Pleroma.Config.put([:rate_limit, limiter_name], {1, 1})
	+ describe "config" do
	+ test "config is required for plug to work" do
	+ limiter_name = :test_init
	+ Pleroma.Config.put([:rate_limit, limiter_name], {1, 1})

	- assert {limiter_name, {1, 1}, []} == RateLimiter.init(limiter_name)
	- assert nil == RateLimiter.init(:foo)
	- end
	+ assert %{limits: {1, 1}, name: :test_init, opts: [name: :test_init]} ==
	+ RateLimiter.init(name: limiter_name)

	- test "ip/1" do
	- assert "127.0.0.1" == RateLimiter.ip(%{remote_ip: {127, 0, 0, 1}})
	- end
	+ assert nil == RateLimiter.init(name: :foo)
	+ end

	- test "it restricts by opts" do
	- limiter_name = :test_opts
	- scale = 1000
	- limit = 5
	+ test "it restricts based on config values" do
	+ limiter_name = :test_opts
	+ scale = 1000
	+ limit = 5

	- Pleroma.Config.put([:rate_limit, limiter_name], {scale, limit})
	+ Pleroma.Config.put([:rate_limit, limiter_name], {scale, limit})

	- opts = RateLimiter.init(limiter_name)
	- conn = conn(:get, "/")
	- bucket_name = "#{limiter_name}:#{RateLimiter.ip(conn)}"
	+ opts = RateLimiter.init(name: limiter_name)
	+ conn = conn(:get, "/")

	- conn = RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ for i <- 1..5 do
	+ conn = RateLimiter.call(conn, opts)
	+ assert {^i, _} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ Process.sleep(150)
	+ end

	- conn = RateLimiter.call(conn, opts)
	- assert {2, 3, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = RateLimiter.call(conn, opts)
	+ assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	+ assert conn.halted

	- conn = RateLimiter.call(conn, opts)
	- assert {3, 2, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ Process.sleep(800)

	- conn = RateLimiter.call(conn, opts)
	- assert {4, 1, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = conn(:get, "/")

	- conn = RateLimiter.call(conn, opts)
	- assert {5, 0, to_reset, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = RateLimiter.call(conn, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, opts)

	- conn = RateLimiter.call(conn, opts)
	+ refute conn.status == Plug.Conn.Status.code(:too_many_requests)
	+ refute conn.resp_body
	+ refute conn.halted
	+ end
	+ end

	- assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	- assert conn.halted
	+ describe "options" do
	+ test "`bucket_name` option overrides default bucket name" do
	+ limiter_name = :test_bucket_name

	- Process.sleep(to_reset)
	+ Pleroma.Config.put([:rate_limit, limiter_name], {1000, 5})

	- conn = conn(:get, "/")
	+ base_bucket_name = "#{limiter_name}:group1"
	+ opts = RateLimiter.init(name: limiter_name, bucket_name: base_bucket_name)

	- conn = RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = conn(:get, "/")

	- refute conn.status == Plug.Conn.Status.code(:too_many_requests)
	- refute conn.resp_body
	- refute conn.halted
	- end
	+ RateLimiter.call(conn, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, opts)
	+ assert {:err, :not_found} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ end

	- test "`bucket_name` option overrides default bucket name" do
	- limiter_name = :test_bucket_name
	- scale = 1000
	- limit = 5
	+ test "`params` option allows different queries to be tracked independently" do
	+ limiter_name = :test_params
	+ Pleroma.Config.put([:rate_limit, limiter_name], {1000, 5})

	- Pleroma.Config.put([:rate_limit, limiter_name], {scale, limit})
	- base_bucket_name = "#{limiter_name}:group1"
	- opts = RateLimiter.init({limiter_name, bucket_name: base_bucket_name})
	+ opts = RateLimiter.init(name: limiter_name, params: ["id"])

	- conn = conn(:get, "/")
	- default_bucket_name = "#{limiter_name}:#{RateLimiter.ip(conn)}"
	- customized_bucket_name = "#{base_bucket_name}:#{RateLimiter.ip(conn)}"
	+ conn = conn(:get, "/?id=1")
	+ conn = Plug.Conn.fetch_query_params(conn)
	+ conn_2 = conn(:get, "/?id=2")

	- RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(customized_bucket_name, scale, limit)
	- assert {0, 5, _, _, _} = ExRated.inspect_bucket(default_bucket_name, scale, limit)
	- end
	-
	- test "`params` option appends specified params' values to bucket name" do
	- limiter_name = :test_params
	- scale = 1000
	- limit = 5
	+ RateLimiter.call(conn, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ assert {0, 5} = RateLimiter.inspect_bucket(conn_2, limiter_name, opts)
	+ end

	- Pleroma.Config.put([:rate_limit, limiter_name], {scale, limit})
	- opts = RateLimiter.init({limiter_name, params: ["id"]})
	- id = "1"
	+ test "it supports combination of options modifying bucket name" do
	+ limiter_name = :test_options_combo
	+ Pleroma.Config.put([:rate_limit, limiter_name], {1000, 5})

	- conn = conn(:get, "/?id=#{id}")
	- conn = Plug.Conn.fetch_query_params(conn)
	+ base_bucket_name = "#{limiter_name}:group1"
	+ opts = RateLimiter.init(name: limiter_name, bucket_name: base_bucket_name, params: ["id"])
	+ id = "100"

	- default_bucket_name = "#{limiter_name}:#{RateLimiter.ip(conn)}"
	- parametrized_bucket_name = "#{limiter_name}:#{id}:#{RateLimiter.ip(conn)}"
	+ conn = conn(:get, "/?id=#{id}")
	+ conn = Plug.Conn.fetch_query_params(conn)
	+ conn_2 = conn(:get, "/?id=#{101}")

	- RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(parametrized_bucket_name, scale, limit)
	- assert {0, 5, _, _, _} = ExRated.inspect_bucket(default_bucket_name, scale, limit)
	+ RateLimiter.call(conn, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, opts)
	+ assert {0, 5} = RateLimiter.inspect_bucket(conn_2, base_bucket_name, opts)
	+ end
	end

	- test "it supports combination of options modifying bucket name" do
	- limiter_name = :test_options_combo
	- scale = 1000
	- limit = 5
	+ describe "unauthenticated users" do
	+ test "are restricted based on remote IP" do
	+ limiter_name = :test_unauthenticated
	+ Pleroma.Config.put([:rate_limit, limiter_name], [{1000, 5}, {1, 10}])
	+
	+ opts = RateLimiter.init(name: limiter_name)

	- Pleroma.Config.put([:rate_limit, limiter_name], {scale, limit})
	- base_bucket_name = "#{limiter_name}:group1"
	- opts = RateLimiter.init({limiter_name, bucket_name: base_bucket_name, params: ["id"]})
	- id = "100"
	+ conn = %{conn(:get, "/") \| remote_ip: {127, 0, 0, 2}}
	+ conn_2 = %{conn(:get, "/") \| remote_ip: {127, 0, 0, 3}}

	- conn = conn(:get, "/?id=#{id}")
	- conn = Plug.Conn.fetch_query_params(conn)
	+ for i <- 1..5 do
	+ conn = RateLimiter.call(conn, opts)
	+ assert {^i, _} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ refute conn.halted
	+ end

	- default_bucket_name = "#{limiter_name}:#{RateLimiter.ip(conn)}"
	- parametrized_bucket_name = "#{base_bucket_name}:#{id}:#{RateLimiter.ip(conn)}"
	+ conn = RateLimiter.call(conn, opts)

	- RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(parametrized_bucket_name, scale, limit)
	- assert {0, 5, _, _, _} = ExRated.inspect_bucket(default_bucket_name, scale, limit)
	+ assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	+ assert conn.halted
	+
	+ conn_2 = RateLimiter.call(conn_2, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn_2, limiter_name, opts)
	+
	+ refute conn_2.status == Plug.Conn.Status.code(:too_many_requests)
	+ refute conn_2.resp_body
	+ refute conn_2.halted
	+ end
	end

	- test "optional limits for authenticated users" do
	- limiter_name = :test_authenticated
	- Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
	+ describe "authenticated users" do
	+ setup do
	+ Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
	+
	+ :ok
	+ end
	+
	+ test "can have limits seperate from unauthenticated connections" do
	+ limiter_name = :test_authenticated
	+
	+ scale = 1000
	+ limit = 5
	+ Pleroma.Config.put([:rate_limit, limiter_name], [{1, 10}, {scale, limit}])
	+
	+ opts = RateLimiter.init(name: limiter_name)

	- scale = 1000
	- limit = 5
	- Pleroma.Config.put([:rate_limit, limiter_name], [{1, 10}, {scale, limit}])
	+ user = insert(:user)
	+ conn = conn(:get, "/") \|> assign(:user, user)

	- opts = RateLimiter.init(limiter_name)
	+ for i <- 1..5 do
	+ conn = RateLimiter.call(conn, opts)
	+ assert {^i, _} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ refute conn.halted
	+ end

	- user = insert(:user)
	- conn = conn(:get, "/") \|> assign(:user, user)
	- bucket_name = "#{limiter_name}:#{user.id}"
	+ conn = RateLimiter.call(conn, opts)

	- conn = RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	+ assert conn.halted

	- conn = RateLimiter.call(conn, opts)
	- assert {2, 3, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ Process.sleep(1550)

	- conn = RateLimiter.call(conn, opts)
	- assert {3, 2, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = conn(:get, "/") \|> assign(:user, user)
	+ conn = RateLimiter.call(conn, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, opts)

	- conn = RateLimiter.call(conn, opts)
	- assert {4, 1, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ refute conn.status == Plug.Conn.Status.code(:too_many_requests)
	+ refute conn.resp_body
	+ refute conn.halted
	+ end

	- conn = RateLimiter.call(conn, opts)
	- assert {5, 0, to_reset, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ test "diffrerent users are counted independently" do
	+ limiter_name = :test_authenticated
	+ Pleroma.Config.put([:rate_limit, limiter_name], [{1, 10}, {1000, 5}])

	- conn = RateLimiter.call(conn, opts)
	+ opts = RateLimiter.init(name: limiter_name)

	- assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	- assert conn.halted
	+ user = insert(:user)
	+ conn = conn(:get, "/") \|> assign(:user, user)

	- Process.sleep(to_reset)
	+ user_2 = insert(:user)
	+ conn_2 = conn(:get, "/") \|> assign(:user, user_2)

	- conn = conn(:get, "/") \|> assign(:user, user)
	+ for i <- 1..5 do
	+ conn = RateLimiter.call(conn, opts)
	+ assert {^i, _} = RateLimiter.inspect_bucket(conn, limiter_name, opts)
	+ end

	- conn = RateLimiter.call(conn, opts)
	- assert {1, 4, _, _, _} = ExRated.inspect_bucket(bucket_name, scale, limit)
	+ conn = RateLimiter.call(conn, opts)
	+ assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests)
	+ assert conn.halted

	- refute conn.status == Plug.Conn.Status.code(:too_many_requests)
	- refute conn.resp_body
	- refute conn.halted
	+ conn_2 = RateLimiter.call(conn_2, opts)
	+ assert {1, 4} = RateLimiter.inspect_bucket(conn_2, limiter_name, opts)
	+ refute conn_2.status == Plug.Conn.Status.code(:too_many_requests)
	+ refute conn_2.resp_body
	+ refute conn_2.halted
	+ end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Tue, Oct 13, 7:18 PM (1 d, 20 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1786876
Default Alt Text: (128 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions