Merge branch 'develop' into gun

diff --combined docs/API/admin_api.md
index cd8123c5dd85851616a9a2a40b60e8bd725557f1,47acd240e05325b13d409c5a347de49cfb435584..4a448c1a59d07103b2f2a3451daaa137e028a4b9
--- 1/docs/API/admin_api.md
--- 2/docs/API/admin_api.md
+++ b/docs/API/admin_api.md
@@@ -682,6 -682,8 +682,8 @@@ Note: Available `:permission_group` is 
  
  ### Get list of merged default settings with saved in database.
  
+ *If `need_reboot` flag exists in response, instance must be restarted, so reboot time settings can take effect.*
+ 
  **Only works when configuration from database is enabled.**
  
  - Params:
@@@ -692,20 -694,24 +694,24 @@@
  
  ```json
  {
-   configs: [
+   "configs": [
      {
        "group": ":pleroma",
        "key": "Pleroma.Upload",
        "value": []
       }
-   ]
+   ],
+   "need_reboot": true
  }
  ```
+  need_reboot - *optional*, if were changed reboot time settings.
  
  ## `POST /api/pleroma/admin/config`
  
  ### Update config settings
  
+ *If `need_reboot` flag exists in response, instance must be restarted, so reboot time settings can take effect.*
+ 
  **Only works when configuration from database is enabled.**
  
  Some modifications are necessary to save the config settings correctly:
@@@ -731,8 -737,6 +737,8 @@@
  Most of the settings will be applied in `runtime`, this means that you don't need to restart the instance. But some settings are applied in `compile time` and require a reboot of the instance, such as:
  - all settings inside these keys:
    - `:hackney_pools`
 +  - `:connections_pool`
 +  - `:pools`
    - `:chat`
  - partially settings inside these keys:
    - `:seconds_valid` in `Pleroma.Captcha`
@@@ -795,7 -799,7 +801,7 @@@ config :quack
  ```
  ```json
  {
-   configs: [
+   "configs": [
      {"group": ":quack", "key": ":level", "value": ":debug"},
      {"group": ":quack", "key": ":meta", "value": [":all"]},
      ...
@@@ -806,7 -810,7 +812,7 @@@
  
  ```json
  {
-   configs: [
+   "configs": [
      {
        "group": ":pleroma",
        "key": "Pleroma.Upload",
@@@ -838,15 -842,17 +844,17 @@@
      - 400 Bad Request `"To use this endpoint you need to enable configuration from database."`
  ```json
  {
-   configs: [
+   "configs": [
      {
        "group": ":pleroma",
        "key": "Pleroma.Upload",
        "value": [...]
       }
-   ]
+   ],
+   "need_reboot": true
  }
  ```
+ need_reboot - *optional*, if were changed reboot time settings.
  
  ## ` GET /api/pleroma/admin/config/descriptions`
  

diff --combined lib/pleroma/config/transfer_task.ex
index 251074aaac6d4f49cdd402d0f78ac0b2c23efde4,f037ce8a515803d9b5edc49c298fe375bb49e336..0087ab0e4f55f3f583268e07fbd5b2bd74b07122
--- 1/lib/pleroma/config/transfer_task.ex
--- 2/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@@ -18,10 -18,7 +18,10 @@@ defmodule Pleroma.Config.TransferTask d
      {:pleroma, Oban},
      {:pleroma, :rate_limit},
      {:pleroma, :markup},
 -    {:plerome, :streamer}
 +    {:pleroma, :streamer},
 +    {:pleroma, :pools},
 +    {:pleroma, :connections_pool},
 +    {:tesla, :adapter}
    ]
  
    @reboot_time_subkeys [
@@@ -77,28 -74,6 +77,28 @@@
      end
    end
  
 +  defp group_for_restart(:logger, key, _, merged_value) do
 +    # change logger configuration in runtime, without restart
 +    if Keyword.keyword?(merged_value) and
 +         key not in [:compile_time_application, :backends, :compile_time_purge_matching] do
 +      Logger.configure_backend(key, merged_value)
 +    else
 +      Logger.configure([{key, merged_value}])
 +    end
 +
 +    nil
 +  end
 +
 +  defp group_for_restart(:tesla, _, _, _), do: :pleroma
 +
 +  defp group_for_restart(group, _, _, _) when group != :pleroma, do: group
 +
 +  defp group_for_restart(group, key, value, _) do
 +    if pleroma_need_restart?(group, key, value) do
 +      group
 +    end
 +  end
 +
    defp merge_and_update(setting) do
      try do
        key = ConfigDB.from_string(setting.key)
@@@ -120,7 -95,21 +120,7 @@@
  
        :ok = update_env(group, key, merged_value)
  
 -      if group != :logger do
 -        if group != :pleroma or pleroma_need_restart?(group, key, value) do
 -          group
 -        end
 -      else
 -        # change logger configuration in runtime, without restart
 -        if Keyword.keyword?(merged_value) and
 -             key not in [:compile_time_application, :backends, :compile_time_purge_matching] do
 -          Logger.configure_backend(key, merged_value)
 -        else
 -          Logger.configure([{key, merged_value}])
 -        end
 -
 -        nil
 -      end
 +      group_for_restart(group, key, value, merged_value)
      rescue
        error ->
          error_msg =
@@@ -157,9 -146,7 +157,7 @@@
    defp update_env(group, key, nil), do: Application.delete_env(group, key)
    defp update_env(group, key, value), do: Application.put_env(group, key, value)
  
-   defp restart(_, :pleroma, :test), do: Logger.warn("pleroma restarted")
- 
-   defp restart(_, :pleroma, _), do: send(Restarter.Pleroma, :after_boot)
+   defp restart(_, :pleroma, env), do: Restarter.Pleroma.restart_after_boot(env)
  
    defp restart(started_applications, app, _) do
      with {^app, _, _} <- List.keyfind(started_applications, app, 0),

diff --combined lib/pleroma/web/rel_me.ex
index 0ae92637518d7303a62d7da2ae3a0a4292ff4761,540fa65dffba1ce8702509acac42b065f214390a..b33dd64ddc9e51a4c1d69500d519befe50d3c5eb
--- 1/lib/pleroma/web/rel_me.ex
--- 2/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@@ -3,9 -3,11 +3,9 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.RelMe do
 -  @hackney_options [
 +  @options [
      pool: :media,
 -    recv_timeout: 2_000,
 -    max_body: 2_000_000,
 -    with_body: true
 +    max_body: 2_000_000
    ]
  
    if Pleroma.Config.get(:env) == :test do
@@@ -23,21 -25,12 +23,22 @@@
    def parse(_), do: {:error, "No URL provided"}
  
    defp parse_url(url) do
 +    opts =
 +      if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
 +        Keyword.merge(@options,
 +          recv_timeout: 2_000,
 +          with_body: true
 +        )
 +      else
 +        @options
 +      end
 +
      with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <-
 -           Pleroma.HTTP.get(url, [], adapter: @hackney_options),
 +           Pleroma.HTTP.get(url, [], adapter: opts),
+          {:ok, html_tree} <- Floki.parse_document(html),
           data <-
-            Floki.attribute(html, "link[rel~=me]", "href") ++
-              Floki.attribute(html, "a[rel~=me]", "href") do
+            Floki.attribute(html_tree, "link[rel~=me]", "href") ++
+              Floki.attribute(html_tree, "a[rel~=me]", "href") do
        {:ok, data}
      end
    rescue

diff --combined lib/pleroma/web/rich_media/parser.ex
index 9deb038451e2e8a8cdd63af7e891653a426017cf,9702e90f19b8ed02ce5569b2576731e204d0ab00..e05a0a204662a952ce8ba138bb0cd9e9e6dd4a21
--- 1/lib/pleroma/web/rich_media/parser.ex
--- 2/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@@ -3,9 -3,11 +3,9 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.RichMedia.Parser do
 -  @hackney_options [
 +  @options [
      pool: :media,
 -    recv_timeout: 2_000,
 -    max_body: 2_000_000,
 -    with_body: true
 +    max_body: 2_000_000
    ]
  
    defp parsers do
@@@ -75,32 -77,22 +75,32 @@@
    end
  
    defp parse_url(url) do
 +    opts =
 +      if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
 +        Keyword.merge(@options,
 +          recv_timeout: 2_000,
 +          with_body: true
 +        )
 +      else
 +        @options
 +      end
 +
      try do
 -      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options)
 +      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: opts)
  
        html
-       |> parse_html
+       |> parse_html()
        |> maybe_parse()
        |> Map.put(:url, url)
        |> clean_parsed_data()
        |> check_parsed_data()
      rescue
        e ->
-         {:error, "Parsing error: #{inspect(e)}"}
+         {:error, "Parsing error: #{inspect(e)} #{inspect(__STACKTRACE__)}"}
      end
    end
  
-   defp parse_html(html), do: Floki.parse(html)
+   defp parse_html(html), do: Floki.parse_document!(html)
  
    defp maybe_parse(html) do
      Enum.reduce_while(parsers(), %{}, fn parser, acc ->

diff --combined mix.exs
index 7c6de5423e31e3969aef4cb00d907f28919b7f26,24f1834725aced27c6b675590aa01b3e5eac2e1b..273307bbe99e20ace12dc160d9abd95f8422bd58
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -120,10 -120,6 +120,10 @@@ defmodule Pleroma.Mixfile d
        {:cachex, "~> 3.0.2"},
        {:poison, "~> 3.0", override: true},
        {:tesla, "~> 1.3", override: true},
 +      {:castore, "~> 0.1"},
 +      {:cowlib, "~> 2.8", override: true},
 +      {:gun,
 +       github: "ninenines/gun", ref: "bd6425ab87428cf4c95f4d23e0a48fd065fbd714", override: true},
        {:jason, "~> 1.0"},
        {:mogrify, "~> 0.6.1"},
        {:ex_aws, "~> 2.1"},
@@@ -143,8 -139,8 +143,8 @@@
        {: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, "~> 1.4"},
+       {:floki, "~> 0.25"},
        {:timex, "~> 3.5"},
        {:ueberauth, "~> 0.4"},
        {:auto_linker,

diff --combined mix.lock
index 158a87e4787230c8f57dbf516b703db03e08c187,5a667055f0cf4cac4aabbf923b8750944c771760..12ce1afac3f0228d202427f0b05a03ef378abad2
--- 1/mix.lock
--- 2/mix.lock
+++ b/mix.lock
@@@ -9,7 -9,6 +9,7 @@@
    "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", "3aadb1e605747122f60aa7b0b121cca23c14868558157563b3f3e19ea929f7d0"},
    "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", "738d0e17a93c2ccfe4ddc707bdc8e672e9074c8569498483feb1c4530fb91b2b"},
    "captcha": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", "e0f16822d578866e186a0974d65ad58cddc1e2ab", [ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"]},
 +  "castore": {:hex, :castore, "0.1.5", "591c763a637af2cc468a72f006878584bc6c306f8d111ef8ba1d4c10e0684010", [:mix], [], "hexpm", "6db356b2bc6cc22561e051ff545c20ad064af57647e436650aa24d7d06cd941a"},
    "certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "805abd97539caf89ec6d4732c91e62ba9da0cda51ac462380bbd28ee697a8c42"},
    "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
    "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", "d8700a0ca4dbb616c22c9b3f6dd539d88deaafec3efe66869d6370c9a559b3e9"},
@@@ -21,42 -20,41 +21,42 @@@
    "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", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
-   "db_connection": {:hex, :db_connection, "2.2.1", "caee17725495f5129cb7faebde001dc4406796f12a62b8949f4ac69315080566", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "2b02ece62d9f983fcd40954e443b7d9e6589664380e5546b2b9b523cd0fb59e1"},
+   "db_connection": {:hex, :db_connection, "2.2.1", "caee17725495f5129cb7faebde001dc4406796f12a62b8949f4ac69315080566", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
    "decimal": {:hex, :decimal, "1.8.1", "a4ef3f5f3428bdbc0d35374029ffcf4ede8533536fa79896dd450168d9acdf3c", [:mix], [], "hexpm", "3cb154b00225ac687f6cbd4acc4b7960027c757a5152b369923ead9ddbca7aec"},
    "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
-   "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"},
-   "ecto": {:hex, :ecto, "3.3.3", "0830bf3aebcbf3d8c1a1811cd581773b6866886c012f52c0f027031fa96a0b53", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "12e368e3c2a2938d7776defaabdae40e82900fc4d8d66120ec1e01dfd8b93c3a"},
+   "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm"},
+   "ecto": {:hex, :ecto, "3.3.3", "0830bf3aebcbf3d8c1a1811cd581773b6866886c012f52c0f027031fa96a0b53", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
    "ecto_enum": {:hex, :ecto_enum, "1.4.0", "d14b00e04b974afc69c251632d1e49594d899067ee2b376277efd8233027aec8", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "> 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:mariaex, ">= 0.0.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"},
-   "ecto_sql": {:hex, :ecto_sql, "3.3.4", "aa18af12eb875fbcda2f75e608b3bd534ebf020fc4f6448e4672fcdcbb081244", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.4 or ~> 3.3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.3.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", "5eccbdbf92e3c6f213007a82d5dbba4cd9bb659d1a21331f89f408e4c0efd7a8"},
-   "esshd": {:hex, :esshd, "0.1.1", "d4dd4c46698093a40a56afecce8a46e246eb35463c457c246dacba2e056f31b5", [:mix], [], "hexpm", "d73e341e3009d390aa36387dc8862860bf9f874c94d9fd92ade2926376f49981"},
+   "ecto_sql": {:hex, :ecto_sql, "3.3.4", "aa18af12eb875fbcda2f75e608b3bd534ebf020fc4f6448e4672fcdcbb081244", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.4 or ~> 3.3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.3.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.1", "d4dd4c46698093a40a56afecce8a46e246eb35463c457c246dacba2e056f31b5", [:mix], [], "hexpm"},
    "eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm", "b14f1dc204321429479c569cfbe8fb287541184ed040956c8862cb7a677b8406"},
    "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", "06b6fde12b33bb6d65d5d3493e903ba5a56d57a72350c15285a4298338089e10"},
    "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", "0569f5b211b1a3b12b705fe2a9d0e237eb1360b9d76298028df2346cad13097a"},
    "ex_const": {:hex, :ex_const, "0.2.4", "d06e540c9d834865b012a17407761455efa71d0ce91e5831e86881b9c9d82448", [:mix], [], "hexpm", "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"},
-   "ex_doc": {:hex, :ex_doc, "0.21.3", "857ec876b35a587c5d9148a2512e952e24c24345552259464b98bfbb883c7b42", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "0db1ee8d1547ab4877c5b5dffc6604ef9454e189928d5ba8967d4a58a801f161"},
+   "ex_doc": {:hex, :ex_doc, "0.21.3", "857ec876b35a587c5d9148a2512e952e24c24345552259464b98bfbb883c7b42", [:mix], [{:earmark, "~> 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", "b84f6af156264530b312a8ab98ac6088f6b77ae5fe2058305c81434aa01fbaf9"},
-   "ex_syslogger": {:hex, :ex_syslogger, "1.5.0", "bc936ee3fd13d9e592cb4c3a1e8a55fccd33b05e3aa7b185f211f3ed263ff8f0", [:mix], [{:poison, ">= 1.5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:syslog, "~> 1.0.5", [hex: :syslog, repo: "hexpm", optional: false]}], "hexpm", "f3b4b184dcdd5f356b7c26c6cd72ab0918ba9dfb4061ccfaf519e562942af87b"},
-   "excoveralls": {:hex, :excoveralls, "0.12.2", "a513defac45c59e310ac42fcf2b8ae96f1f85746410f30b1ff2b710a4b6cd44b", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "151c476331d49b45601ffc45f43cb3a8beb396b02a34e3777fea0ad34ae57d89"},
+   "ex_syslogger": {:hex, :ex_syslogger, "1.5.0", "bc936ee3fd13d9e592cb4c3a1e8a55fccd33b05e3aa7b185f211f3ed263ff8f0", [:mix], [{:poison, ">= 1.5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:syslog, "~> 1.0.5", [hex: :syslog, repo: "hexpm", optional: false]}], "hexpm"},
+   "excoveralls": {:hex, :excoveralls, "0.12.2", "a513defac45c59e310ac42fcf2b8ae96f1f85746410f30b1ff2b710a4b6cd44b", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
    "fast_html": {:hex, :fast_html, "1.0.3", "2cc0d4b68496266a1530e0c852cafeaede0bd10cfdee26fda50dc696c203162f", [:make, :mix], [], "hexpm", "ab3d782b639d3c4655fbaec0f9d032c91f8cab8dd791ac7469c2381bc7c32f85"},
    "fast_sanitize": {:hex, :fast_sanitize, "0.1.7", "2a7cd8734c88a2de6de55022104f8a3b87f1fdbe8bbf131d9049764b53d50d0d", [:mix], [{:fast_html, "~> 1.0", [hex: :fast_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f39fe8ea08fbac17487c30bf09b7d9f3e12472e51fb07a88ffeb8fd17da8ab67"},
    "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", "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"},
-   "floki": {:hex, :floki, "0.23.1", "e100306ce7d8841d70a559748e5091542e2cfc67ffb3ade92b89a8435034dab1", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "39b431b6330206cadee418e793177401ebedf2e86abc945ddd545aedb37dfc19"},
+   "floki": {:hex, :floki, "0.25.0", "b1c9ddf5f32a3a90b43b76f3386ca054325dc2478af020e87b5111c19f2284ac", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm"},
    "gen_smtp": {:hex, :gen_smtp, "0.15.0", "9f51960c17769b26833b50df0b96123605a8024738b62db747fece14eb2fbfcc", [:rebar3], [], "hexpm", "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"},
    "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.4", "f13088e1ec10ce01665cf25f5ff779e7df3f2dc71b37084976cf89d1aa124d5c", [:mix], [], "hexpm"},
 +  "gettext": {:hex, :gettext, "0.17.4", "f13088e1ec10ce01665cf25f5ff779e7df3f2dc71b37084976cf89d1aa124d5c", [:mix], [], "hexpm", "3c75b5ea8288e2ee7ea503ff9e30dfe4d07ad3c054576a6e60040e79a801e14d"},
 +  "gun": {:git, "https://github.com/ninenines/gun.git", "bd6425ab87428cf4c95f4d23e0a48fd065fbd714", [ref: "bd6425ab87428cf4c95f4d23e0a48fd065fbd714"]},
    "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", "e0100f8ef7d1124222c11ad362c857d3df7cb5f4204054f9f0f4a728666591fc"},
-   "html_entities": {:hex, :html_entities, "0.5.1", "1c9715058b42c35a2ab65edc5b36d0ea66dd083767bef6e3edb57870ef556549", [:mix], [], "hexpm", "30efab070904eb897ff05cd52fa61c1025d7f8ef3a9ca250bc4e6513d16c32de"},
+   "html_entities": {:hex, :html_entities, "0.5.1", "1c9715058b42c35a2ab65edc5b36d0ea66dd083767bef6e3edb57870ef556549", [: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.2", "ace7c8d3a361cebccbed19c283c349b3d26991eff73a1eaaa8abae2e3c8089b6", [:mix], [{:hackney, "~> 1.15 and >= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "aa2c74bd271af34239a3948779612f87df2422c2fdcfdbcec28d9c105f0773fe"},
+   "httpoison": {:hex, :httpoison, "1.6.2", "ace7c8d3a361cebccbed19c283c349b3d26991eff73a1eaaa8abae2e3c8089b6", [: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", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
    "inet_cidr": {:hex, :inet_cidr, "1.0.4", "a05744ab7c221ca8e395c926c3919a821eb512e8f36547c062f62c4ca0cf3d6e", [:mix], [], "hexpm", "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"},
    "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fdf843bca858203ae1de16da2ee206f53416bbda5dc8c9e78f43243de4bc3afe"},
-   "joken": {:hex, :joken, "2.2.0", "2daa1b12be05184aff7b5ace1d43ca1f81345962285fff3f88db74927c954d3a", [:mix], [{:jose, "~> 1.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "b4f92e30388206f869dd25d1af628a1d99d7586e5cf0672f64d4df84c4d2f5e9"},
-   "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix, :rebar3], [], "hexpm", "3c7ddc8a9394b92891db7c2771da94bf819834a1a4c92e30857b7d582e2f8257"},
+   "joken": {:hex, :joken, "2.2.0", "2daa1b12be05184aff7b5ace1d43ca1f81345962285fff3f88db74927c954d3a", [:mix], [{:jose, "~> 1.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm"},
+   "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix, :rebar3], [], "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", "a10c6eb62cca416019663129699769f0c2ccf39428b3bb3c0cb38c718a0c186d"},
    "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "d4b316c7222a85bbaa2fd7c6e90e37e953257ad196dc229505137c5e505e9eff"},
@@@ -69,38 -67,38 +69,38 @@@
    "mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm", "3bc928d817974fa10cc11e6c89b9a9361e37e96dbbf3d868c41094ec05745dcd"},
    "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm", "052346cf322311c49a0f22789f3698eea030eec09b8c47367f0686ef2634ae14"},
    "myhtmlex": {:git, "https://git.pleroma.social/pleroma/myhtmlex.git", "ad0097e2f61d4953bfef20fb6abddf23b87111e6", [ref: "ad0097e2f61d4953bfef20fb6abddf23b87111e6", submodules: true]},
-   "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm", "589b5af56f4afca65217a1f3eb3fee7e79b09c40c742fddc1c312b3ac0b3399f"},
+   "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm"},
    "nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]},
    "oban": {:hex, :oban, "0.12.1", "695e9490c6e0edfca616d80639528e448bd29b3bff7b7dd10a56c79b00a5d7fb", [: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", "c1d58d69b8b5a86e7167abbb8cc92764a66f25f12f6172052595067fc6a30a17"},
    "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"},
    "pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.4", "8dd29ed783f2e12195d7e0a4640effc0a7c37e6537da491f1db01839eee6d053", [:mix], [], "hexpm", "595d09db74cb093b1903381c9de423276a931a2480a46a1a5dc7f932a2a6375b"},
-   "phoenix": {:hex, :phoenix, "1.4.13", "67271ad69b51f3719354604f4a3f968f83aa61c19199343656c9caee057ff3b8", [: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", "ab765a0feddb81fc62e2116c827b5f068df85159c162bee760745276ad7ddc1b"},
-   "phoenix_ecto": {:hex, :phoenix_ecto, "4.1.0", "a044d0756d0464c5a541b4a0bf4bcaf89bffcaf92468862408290682c73ae50d", [: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", "c5e666a341ff104d0399d8f0e4ff094559b2fde13a5985d4cb5023b2c2ac558b"},
-   "phoenix_html": {:hex, :phoenix_html, "2.14.0", "d8c6bc28acc8e65f8ea0080ee05aa13d912c8758699283b8d3427b655aabe284", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "b0bb30eda478a06dbfbe96728061a93833db3861a49ccb516f839ecb08493fbb"},
+   "phoenix": {:hex, :phoenix, "1.4.13", "67271ad69b51f3719354604f4a3f968f83aa61c19199343656c9caee057ff3b8", [: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.1.0", "a044d0756d0464c5a541b4a0bf4bcaf89bffcaf92468862408290682c73ae50d", [: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.14.0", "d8c6bc28acc8e65f8ea0080ee05aa13d912c8758699283b8d3427b655aabe284", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
    "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm", "1f13f9f0f3e769a667a6b6828d29dec37497a082d195cc52dbef401a9b69bf38"},
    "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", "ebf1bfa7b3c1c850c04929afe02e2e0d7ab135e0706332c865de03e761676b1f"},
    "plug": {:hex, :plug, "1.9.0", "8d7c4e26962283ff9f8f3347bd73838e2413fbc38b7bb5467d5924f68f3a5a4a", [: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", "9902eda2c52ada2a096434682e99a2493f5d06a94d6ac6bcfff9805f952350f1"},
-   "plug_cowboy": {:hex, :plug_cowboy, "2.1.2", "8b0addb5908c5238fac38e442e81b6fcd32788eaa03246b4d55d147c47c5805e", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "7d722581ce865a237e14da6d946f92704101740a256bd13ec91e63c0b122fc70"},
-   "plug_crypto": {:hex, :plug_crypto, "1.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [:mix], [], "hexpm", "6b8b608f895b6ffcfad49c37c7883e8df98ae19c6a28113b02aa1e9c5b22d6b5"},
+   "plug_cowboy": {:hex, :plug_cowboy, "2.1.2", "8b0addb5908c5238fac38e442e81b6fcd32788eaa03246b4d55d147c47c5805e", [: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.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [: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", "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"},
    "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"},
    "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
    "postgrex": {:hex, :postgrex, "0.15.3", "5806baa8a19a68c4d07c7a624ccdb9b57e89cbc573f1b98099e3741214746ae4", [: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", "4737ce62a31747b4c63c12b20c62307e51bb4fcd730ca0c32c280991e0606c90"},
-   "prometheus": {:hex, :prometheus, "4.5.0", "8f4a2246fe0beb50af0f77c5e0a5bb78fe575c34a9655d7f8bc743aad1c6bf76", [:mix, :rebar3], [], "hexpm", "679b5215480fff612b8351f45c839d995a07ce403e42ff02f1c6b20960d41a4e"},
+   "prometheus": {:hex, :prometheus, "4.5.0", "8f4a2246fe0beb50af0f77c5e0a5bb78fe575c34a9655d7f8bc743aad1c6bf76", [: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", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
    "prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm", "9fd13404a48437e044b288b41f76e64acd9735fb8b0e3809f494811dfa66d0fb"},
    "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", "c4d1404ac4e9d3d963da601db2a7d8ea31194f0017057fabf0cfb9bf5a6c8c75"},
    "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", "0273a6483ccb936d79ca19b0ab629aef0dba958697c94782bb728b920dfc6a79"},
    "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", "d736bfa7444112eb840027bb887832a0e403a4a3437f48028c3b29a2dbbd2543"},
    "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm", "451d8527787df716d99dc36162fca05934915db0b6141bbdac2ea8d3c7afc7d7"},
-   "recon": {:hex, :recon, "2.5.0", "2f7fcbec2c35034bade2f9717f77059dc54eb4e929a3049ca7ba6775c0bd66cd", [:mix, :rebar3], [], "hexpm", "72f3840fedd94f06315c523f6cecf5b4827233bed7ae3fe135b2a0ebeab5e196"},
+   "recon": {:hex, :recon, "2.5.0", "2f7fcbec2c35034bade2f9717f77059dc54eb4e929a3049ca7ba6775c0bd66cd", [:mix, :rebar3], [], "hexpm"},
    "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", "13104d7897e38ed7f044c4de953a6c28597d1c952075eb2e328bc6d6f2bfc496"},
    "sweet_xml": {:hex, :sweet_xml, "0.6.6", "fc3e91ec5dd7c787b6195757fbcf0abc670cee1e4172687b45183032221b66b8", [:mix], [], "hexpm", "2e1ec458f892ffa81f9f8386e3f35a1af6db7a7a37748a64478f13163a1f3573"},
    "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", "e3928e1d2889a308aaf3e42755809ac21cffd77cb58eef01cbfdab4ce2fd1e21"},
-   "syslog": {:hex, :syslog, "1.0.6", "995970c9aa7feb380ac493302138e308d6e04fd57da95b439a6df5bb3bf75076", [:rebar3], [], "hexpm", "769ddfabd0d2a16f3f9c17eb7509951e0ca4f68363fb26f2ee51a8ec4a49881a"},
+   "syslog": {:hex, :syslog, "1.0.6", "995970c9aa7feb380ac493302138e308d6e04fd57da95b439a6df5bb3bf75076", [:rebar3], [], "hexpm"},
    "telemetry": {:hex, :telemetry, "0.4.1", "ae2718484892448a24470e6aa341bc847c3277bfb8d4e9289f7474d752c09c7f", [:rebar3], [], "hexpm", "4738382e36a0a9a2b6e25d67c960e40e1a2c95560b9f936d8e29de8cd858480f"},
-   "tesla": {:hex, :tesla, "1.3.2", "deb92c5c9ce35e747a395ba413ca78593a4f75bf0e1545630ee2e3d34264021e", [: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, "~> 1.0", [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", "7567704c4790e21bd9a961b56d0b6a988ff68cc4dacfe6b2106e258da1d5cdda"},
+   "tesla": {:hex, :tesla, "1.3.2", "deb92c5c9ce35e747a395ba413ca78593a4f75bf0e1545630ee2e3d34264021e", [: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, "~> 1.0", [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", "f354efb2400dd7a80fd9eb6c8419068c4f632da4ac47f3d8822d6e33f08bc852"},
    "trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"},
    "tzdata": {:hex, :tzdata, "0.5.22", "f2ba9105117ee0360eae2eca389783ef7db36d533899b2e84559404dbc77ebb8", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cd66c8a1e6a9e121d1f538b01bef459334bb4029a1ffb4eeeb5e4eae0337e7b6"},

diff --combined test/web/admin_api/admin_api_controller_test.exs
index 02ffbfa0b056c3653a893f8bc2799846bf76bbda,60db581445586f908971ee28fcb5e945f6390b43..5b0c294392bd7e8788f779d58dec1fa897cd2a36
--- 1/test/web/admin_api/admin_api_controller_test.exs
--- 2/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@@ -6,7 -6,11 +6,11 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    use Pleroma.Web.ConnCase
    use Oban.Testing, repo: Pleroma.Repo
  
+   import Pleroma.Factory
+   import ExUnit.CaptureLog
+ 
    alias Pleroma.Activity
+   alias Pleroma.Config
    alias Pleroma.ConfigDB
    alias Pleroma.HTML
    alias Pleroma.ModerationLog
@@@ -19,7 -23,6 +23,6 @@@
    alias Pleroma.Web.CommonAPI
    alias Pleroma.Web.MastodonAPI.StatusView
    alias Pleroma.Web.MediaProxy
-   import Pleroma.Factory
  
    setup_all do
      Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
@@@ -41,7 -44,7 +44,7 @@@
  
    describe "with [:auth, :enforce_oauth_admin_scope_usage]," do
      clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
-       Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], true)
+       Config.put([:auth, :enforce_oauth_admin_scope_usage], true)
      end
  
      test "GET /api/pleroma/admin/users/:nickname requires admin:read:accounts or broader scope",
@@@ -91,7 -94,7 +94,7 @@@
  
    describe "unless [:auth, :enforce_oauth_admin_scope_usage]," do
      clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
-       Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
+       Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
      end
  
      test "GET /api/pleroma/admin/users/:nickname requires " <>
@@@ -579,11 -582,11 +582,11 @@@
  
    describe "POST /api/pleroma/admin/email_invite, with valid config" do
      clear_config([:instance, :registrations_open]) do
-       Pleroma.Config.put([:instance, :registrations_open], false)
+       Config.put([:instance, :registrations_open], false)
      end
  
      clear_config([:instance, :invites_enabled]) do
-       Pleroma.Config.put([:instance, :invites_enabled], true)
+       Config.put([:instance, :invites_enabled], true)
      end
  
      test "sends invitation and returns 204", %{admin: admin, conn: conn} do
@@@ -602,8 -605,8 +605,8 @@@
        assert token_record
        refute token_record.used
  
-       notify_email = Pleroma.Config.get([:instance, :notify_email])
-       instance_name = Pleroma.Config.get([:instance, :name])
+       notify_email = Config.get([:instance, :notify_email])
+       instance_name = Config.get([:instance, :name])
  
        email =
          Pleroma.Emails.UserEmail.user_invitation_email(
@@@ -639,8 -642,8 +642,8 @@@
      clear_config([:instance, :invites_enabled])
  
      test "it returns 500 if `invites_enabled` is not enabled", %{conn: conn} do
-       Pleroma.Config.put([:instance, :registrations_open], false)
-       Pleroma.Config.put([:instance, :invites_enabled], false)
+       Config.put([:instance, :registrations_open], false)
+       Config.put([:instance, :invites_enabled], false)
  
        conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
  
@@@ -648,8 -651,8 +651,8 @@@
      end
  
      test "it returns 500 if `registrations_open` is enabled", %{conn: conn} do
-       Pleroma.Config.put([:instance, :registrations_open], true)
-       Pleroma.Config.put([:instance, :invites_enabled], true)
+       Config.put([:instance, :registrations_open], true)
+       Config.put([:instance, :invites_enabled], true)
  
        conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
  
@@@ -1886,13 -1889,13 +1889,13 @@@
  
    describe "GET /api/pleroma/admin/config" do
      clear_config(:configurable_from_database) do
-       Pleroma.Config.put(:configurable_from_database, true)
+       Config.put(:configurable_from_database, true)
      end
  
      test "when configuration from database is off", %{conn: conn} do
-       initial = Pleroma.Config.get(:configurable_from_database)
-       Pleroma.Config.put(:configurable_from_database, false)
-       on_exit(fn -> Pleroma.Config.put(:configurable_from_database, initial) end)
+       initial = Config.get(:configurable_from_database)
+       Config.put(:configurable_from_database, false)
+       on_exit(fn -> Config.put(:configurable_from_database, initial) end)
        conn = get(conn, "/api/pleroma/admin/config")
  
        assert json_response(conn, 400) ==
@@@ -2036,11 -2039,12 +2039,12 @@@
          Application.delete_env(:pleroma, Pleroma.Captcha.NotReal)
          Application.put_env(:pleroma, :http, http)
          Application.put_env(:tesla, :adapter, Tesla.Mock)
+         Restarter.Pleroma.refresh()
        end)
      end
  
      clear_config(:configurable_from_database) do
-       Pleroma.Config.put(:configurable_from_database, true)
+       Config.put(:configurable_from_database, true)
      end
  
      @tag capture_log: true
@@@ -2249,21 -2253,63 +2253,63 @@@
      end
  
      test "saving config which need pleroma reboot", %{conn: conn} do
-       chat = Pleroma.Config.get(:chat)
-       on_exit(fn -> Pleroma.Config.put(:chat, chat) end)
+       chat = Config.get(:chat)
+       on_exit(fn -> Config.put(:chat, chat) end)
  
-       conn =
-         post(
-           conn,
-           "/api/pleroma/admin/config",
-           %{
-             configs: [
-               %{group: ":pleroma", key: ":chat", value: [%{"tuple" => [":enabled", true]}]}
-             ]
-           }
-         )
+       assert post(
+                conn,
+                "/api/pleroma/admin/config",
+                %{
+                  configs: [
+                    %{group: ":pleroma", key: ":chat", value: [%{"tuple" => [":enabled", true]}]}
+                  ]
+                }
+              )
+              |> json_response(200) == %{
+                "configs" => [
+                  %{
+                    "db" => [":enabled"],
+                    "group" => ":pleroma",
+                    "key" => ":chat",
+                    "value" => [%{"tuple" => [":enabled", true]}]
+                  }
+                ],
+                "need_reboot" => true
+              }
  
-       assert json_response(conn, 200) == %{
+       configs =
+         conn
+         |> get("/api/pleroma/admin/config")
+         |> json_response(200)
+ 
+       assert configs["need_reboot"]
+ 
+       capture_log(fn ->
+         assert conn |> get("/api/pleroma/admin/restart") |> json_response(200) == %{}
+       end) =~ "pleroma restarted"
+ 
+       configs =
+         conn
+         |> get("/api/pleroma/admin/config")
+         |> json_response(200)
+ 
+       refute Map.has_key?(configs, "need_reboot")
+     end
+ 
+     test "update setting which need reboot, don't change reboot flag until reboot", %{conn: conn} do
+       chat = Config.get(:chat)
+       on_exit(fn -> Config.put(:chat, chat) end)
+ 
+       assert post(
+                conn,
+                "/api/pleroma/admin/config",
+                %{
+                  configs: [
+                    %{group: ":pleroma", key: ":chat", value: [%{"tuple" => [":enabled", true]}]}
+                  ]
+                }
+              )
+              |> json_response(200) == %{
                 "configs" => [
                   %{
                     "db" => [":enabled"],
@@@ -2274,6 -2320,36 +2320,36 @@@
                 ],
                 "need_reboot" => true
               }
+ 
+       assert post(conn, "/api/pleroma/admin/config", %{
+                configs: [
+                  %{group: ":pleroma", key: ":key1", value: [%{"tuple" => [":key3", 3]}]}
+                ]
+              })
+              |> json_response(200) == %{
+                "configs" => [
+                  %{
+                    "group" => ":pleroma",
+                    "key" => ":key1",
+                    "value" => [
+                      %{"tuple" => [":key3", 3]}
+                    ],
+                    "db" => [":key3"]
+                  }
+                ],
+                "need_reboot" => true
+              }
+ 
+       capture_log(fn ->
+         assert conn |> get("/api/pleroma/admin/restart") |> json_response(200) == %{}
+       end) =~ "pleroma restarted"
+ 
+       configs =
+         conn
+         |> get("/api/pleroma/admin/config")
+         |> json_response(200)
+ 
+       refute Map.has_key?(configs, "need_reboot")
      end
  
      test "saving config with nested merge", %{conn: conn} do
@@@ -2410,7 -2486,7 +2486,7 @@@
                 {ExSyslogger, :ex_syslogger}
               ]
  
-       ExUnit.CaptureLog.capture_log(fn ->
+       capture_log(fn ->
          require Logger
          Logger.warn("Ooops...")
        end) =~ "Ooops..."
@@@ -2439,8 -2515,7 +2515,8 @@@
                     "value" => "Tesla.Adapter.Httpc",
                     "db" => [":adapter"]
                   }
 -               ]
 +               ],
 +               "need_reboot" => true
               }
      end
  
@@@ -2527,6 -2602,7 +2603,6 @@@
                  %{"tuple" => [":seconds_valid", 60]},
                  %{"tuple" => [":path", ""]},
                  %{"tuple" => [":key1", nil]},
 -                %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]},
                  %{"tuple" => [":regex1", "~r/https:\/\/example.com/"]},
                  %{"tuple" => [":regex2", "~r/https:\/\/example.com/u"]},
                  %{"tuple" => [":regex3", "~r/https:\/\/example.com/i"]},
@@@ -2543,7 -2619,7 +2619,7 @@@
          })
  
        assert Application.get_env(:tesla, :adapter) == Tesla.Adapter.Httpc
-       assert Pleroma.Config.get([Pleroma.Captcha.NotReal, :name]) == "Pleroma"
+       assert Config.get([Pleroma.Captcha.NotReal, :name]) == "Pleroma"
  
        assert json_response(conn, 200) == %{
                 "configs" => [
@@@ -2556,6 -2632,7 +2632,6 @@@
                       %{"tuple" => [":seconds_valid", 60]},
                       %{"tuple" => [":path", ""]},
                       %{"tuple" => [":key1", nil]},
 -                     %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]},
                       %{"tuple" => [":regex1", "~r/https:\\/\\/example.com/"]},
                       %{"tuple" => [":regex2", "~r/https:\\/\\/example.com/u"]},
                       %{"tuple" => [":regex3", "~r/https:\\/\\/example.com/i"]},
@@@ -2568,6 -2645,7 +2644,6 @@@
                       ":seconds_valid",
                       ":path",
                       ":key1",
 -                     ":partial_chain",
                       ":regex1",
                       ":regex2",
                       ":regex3",
@@@ -2581,8 -2659,7 +2657,8 @@@
                     "value" => "Tesla.Adapter.Httpc",
                     "db" => [":adapter"]
                   }
 -               ]
 +               ],
 +               "need_reboot" => true
               }
      end
  
@@@ -2978,13 -3055,15 +3054,15 @@@
  
    describe "GET /api/pleroma/admin/restart" do
      clear_config(:configurable_from_database) do
-       Pleroma.Config.put(:configurable_from_database, true)
+       Config.put(:configurable_from_database, true)
      end
  
      test "pleroma restarts", %{conn: conn} do
-       ExUnit.CaptureLog.capture_log(fn ->
+       capture_log(fn ->
          assert conn |> get("/api/pleroma/admin/restart") |> json_response(200) == %{}
        end) =~ "pleroma restarted"
+ 
+       refute Restarter.Pleroma.need_reboot?()
      end
    end