Merge branch 'develop' into test/activity_pub/transmogrifier.ex

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`

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -165,7 +165,7 @@ def fix_in_reply_to(%{"inReplyTo" => in_reply_to} = object, options)
         |> 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

test/web/activity_pub/transmogrifier_test.exs

@@ -102,7 +102,7 @@ test "it does not crash if the object in inReplyTo can't be fetched" 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