diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-13 06:55:05 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-13 06:55:05 +0300 |
| commit | 2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e (patch) | |
| tree | 1a5f6ca055b74b65da136c1009757bf790b61795 | |
| parent | 936951826e689eecbe26ae4828aa5f9152d3e1b4 (diff) | |
| parent | 5ca643b80de6e8b82ccb2411b1fa1259a8d565ae (diff) | |
| download | pleroma-2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e.tar.gz | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
| -rw-r--r-- | docs/api/admin_api.md | 10 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 2 | ||||
| -rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index d79c342be..fd608c459 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -60,9 +60,13 @@ Authentication is required and the user must be an admin. - Method: `POST` - Params: - - `nickname` - - `email` - - `password` + `users`: [ + { + `nickname`, + `email`, + `password` + } + ] - Response: User’s nickname ## `/api/pleroma/admin/users/follow` diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 9f699de9e..5b8e7f8f1 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -165,7 +165,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("context", replied_object.data["context"] || object["conversation"]) else e -> - Logger.error("Couldn't fetch \"#{inspect(in_reply_to_id)}\", error: #{inspect(e)}") + Logger.error("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}") object end else diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 87ef843c6..67f972472 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -102,7 +102,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do assert capture_log(fn -> {:ok, _returned_activity} = Transmogrifier.handle_incoming(data) - end) =~ "[error] Couldn't fetch \"\"https://404.site/whatever\"\", error: nil" + end) =~ "[error] Couldn't fetch \"https://404.site/whatever\", error: nil" end test "it works for incoming notices" do |