Merge remote-tracking branch 'origin/develop' into reactions
This commit is contained in:
commit
a7f22c6e93
|
@ -334,6 +334,7 @@ def internal_fetch(conn, _params) do
|
||||||
|> represent_service_actor(conn)
|
|> represent_service_actor(conn)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Returns the authenticated user's ActivityPub User object or a 404 Not Found if non-authenticated"
|
||||||
def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
|
def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("application/activity+json")
|
|> put_resp_content_type("application/activity+json")
|
||||||
|
@ -509,4 +510,31 @@ defp ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do
|
||||||
|
|
||||||
{new_user, for_user}
|
{new_user, for_user}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# TODO: Add support for "object" field
|
||||||
|
@doc """
|
||||||
|
Endpoint based on <https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload>
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
- (required) `file`: data of the media
|
||||||
|
- (optionnal) `description`: description of the media, intended for accessibility
|
||||||
|
|
||||||
|
Response:
|
||||||
|
- HTTP Code: 201 Created
|
||||||
|
- HTTP Body: ActivityPub object to be inserted into another's `attachment` field
|
||||||
|
"""
|
||||||
|
def upload_media(%{assigns: %{user: user}} = conn, %{"file" => file} = data) do
|
||||||
|
with {:ok, object} <-
|
||||||
|
ActivityPub.upload(
|
||||||
|
file,
|
||||||
|
actor: User.ap_id(user),
|
||||||
|
description: Map.get(data, "description")
|
||||||
|
) do
|
||||||
|
Logger.debug(inspect(object))
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> put_status(:created)
|
||||||
|
|> json(object.data)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -24,7 +24,8 @@ def render("endpoints.json", %{user: %User{local: true} = _user}) do
|
||||||
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
|
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
|
||||||
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),
|
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),
|
||||||
"oauthTokenEndpoint" => Helpers.o_auth_url(Endpoint, :token_exchange),
|
"oauthTokenEndpoint" => Helpers.o_auth_url(Endpoint, :token_exchange),
|
||||||
"sharedInbox" => Helpers.activity_pub_url(Endpoint, :inbox)
|
"sharedInbox" => Helpers.activity_pub_url(Endpoint, :inbox),
|
||||||
|
"uploadMedia" => Helpers.activity_pub_url(Endpoint, :upload_media)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
alias Pleroma.Web.MastodonAPI.ListView
|
alias Pleroma.Web.MastodonAPI.ListView
|
||||||
alias Pleroma.Web.MastodonAPI.MastodonAPI
|
alias Pleroma.Web.MastodonAPI.MastodonAPI
|
||||||
alias Pleroma.Web.MastodonAPI.MastodonView
|
alias Pleroma.Web.MastodonAPI.MastodonView
|
||||||
alias Pleroma.Web.MastodonAPI.ReportView
|
|
||||||
alias Pleroma.Web.MastodonAPI.StatusView
|
alias Pleroma.Web.MastodonAPI.StatusView
|
||||||
alias Pleroma.Web.MediaProxy
|
alias Pleroma.Web.MediaProxy
|
||||||
alias Pleroma.Web.OAuth.App
|
alias Pleroma.Web.OAuth.App
|
||||||
|
@ -944,20 +943,6 @@ defp fetch_suggestion_id(attrs) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def reports(%{assigns: %{user: user}} = conn, params) do
|
|
||||||
case CommonAPI.report(user, params) do
|
|
||||||
{:ok, activity} ->
|
|
||||||
conn
|
|
||||||
|> put_view(ReportView)
|
|
||||||
|> try_render("report.json", %{activity: activity})
|
|
||||||
|
|
||||||
{:error, err} ->
|
|
||||||
conn
|
|
||||||
|> put_status(:bad_request)
|
|
||||||
|> json(%{error: err})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def account_register(
|
def account_register(
|
||||||
%{assigns: %{app: app}} = conn,
|
%{assigns: %{app: app}} = conn,
|
||||||
%{"username" => nickname, "email" => _, "password" => _, "agreement" => true} = params
|
%{"username" => nickname, "email" => _, "password" => _, "agreement" => true} = params
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
# 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.ReportController do
|
||||||
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
|
||||||
|
|
||||||
|
@doc "POST /api/v1/reports"
|
||||||
|
def create(%{assigns: %{user: user}} = conn, params) do
|
||||||
|
with {:ok, activity} <- Pleroma.Web.CommonAPI.report(user, params) do
|
||||||
|
render(conn, "show.json", activity: activity)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -5,7 +5,7 @@
|
||||||
defmodule Pleroma.Web.MastodonAPI.ReportView do
|
defmodule Pleroma.Web.MastodonAPI.ReportView do
|
||||||
use Pleroma.Web, :view
|
use Pleroma.Web, :view
|
||||||
|
|
||||||
def render("report.json", %{activity: activity}) do
|
def render("show.json", %{activity: activity}) do
|
||||||
%{
|
%{
|
||||||
id: to_string(activity.id),
|
id: to_string(activity.id),
|
||||||
action_taken: false
|
action_taken: false
|
||||||
|
|
|
@ -414,7 +414,7 @@ defmodule Pleroma.Web.Router do
|
||||||
get("/pleroma/mascot", MastodonAPIController, :get_mascot)
|
get("/pleroma/mascot", MastodonAPIController, :get_mascot)
|
||||||
put("/pleroma/mascot", MastodonAPIController, :set_mascot)
|
put("/pleroma/mascot", MastodonAPIController, :set_mascot)
|
||||||
|
|
||||||
post("/reports", MastodonAPIController, :reports)
|
post("/reports", ReportController, :create)
|
||||||
end
|
end
|
||||||
|
|
||||||
scope [] do
|
scope [] do
|
||||||
|
@ -615,6 +615,7 @@ defmodule Pleroma.Web.Router do
|
||||||
scope [] do
|
scope [] do
|
||||||
pipe_through(:oauth_write)
|
pipe_through(:oauth_write)
|
||||||
post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
|
post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
|
||||||
|
post("/api/ap/upload_media", ActivityPubController, :upload_media)
|
||||||
end
|
end
|
||||||
|
|
||||||
scope [] do
|
scope [] do
|
||||||
|
|
|
@ -28,6 +28,10 @@
|
||||||
"oauthRegistrationEndpoint": {
|
"oauthRegistrationEndpoint": {
|
||||||
"@id": "litepub:oauthRegistrationEndpoint",
|
"@id": "litepub:oauthRegistrationEndpoint",
|
||||||
"@type": "@id"
|
"@type": "@id"
|
||||||
|
},
|
||||||
|
"uploadMedia": {
|
||||||
|
"@id": "litepub:uploadMedia",
|
||||||
|
"@type": "@id"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -976,4 +976,44 @@ test "it tracks a signed activity fetch when the json is cached", %{conn: conn}
|
||||||
assert Delivery.get(object.id, other_user.id)
|
assert Delivery.get(object.id, other_user.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Additionnal ActivityPub C2S endpoints" do
|
||||||
|
test "/api/ap/whoami", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/api/ap/whoami")
|
||||||
|
|
||||||
|
user = User.get_cached_by_id(user.id)
|
||||||
|
|
||||||
|
assert UserView.render("user.json", %{user: user}) == json_response(conn, 200)
|
||||||
|
end
|
||||||
|
|
||||||
|
clear_config([:media_proxy])
|
||||||
|
clear_config([Pleroma.Upload])
|
||||||
|
|
||||||
|
test "uploadMedia", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
desc = "Description of the image"
|
||||||
|
|
||||||
|
image = %Plug.Upload{
|
||||||
|
content_type: "image/jpg",
|
||||||
|
path: Path.absname("test/fixtures/image.jpg"),
|
||||||
|
filename: "an_image.jpg"
|
||||||
|
}
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> post("/api/ap/upload_media", %{"file" => image, "description" => desc})
|
||||||
|
|
||||||
|
assert object = json_response(conn, :created)
|
||||||
|
assert object["name"] == desc
|
||||||
|
assert object["type"] == "Document"
|
||||||
|
assert object["actor"] == user.ap_id
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
# 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.ReportControllerTest do
|
||||||
|
use Pleroma.Web.ConnCase
|
||||||
|
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
setup do
|
||||||
|
reporter = insert(:user)
|
||||||
|
target_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, activity} = CommonAPI.post(target_user, %{"status" => "foobar"})
|
||||||
|
|
||||||
|
[reporter: reporter, target_user: target_user, activity: activity]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "submit a basic report", %{conn: conn, reporter: reporter, target_user: target_user} do
|
||||||
|
assert %{"action_taken" => false, "id" => _} =
|
||||||
|
conn
|
||||||
|
|> assign(:user, reporter)
|
||||||
|
|> post("/api/v1/reports", %{"account_id" => target_user.id})
|
||||||
|
|> json_response(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "submit a report with statuses and comment", %{
|
||||||
|
conn: conn,
|
||||||
|
reporter: reporter,
|
||||||
|
target_user: target_user,
|
||||||
|
activity: activity
|
||||||
|
} do
|
||||||
|
assert %{"action_taken" => false, "id" => _} =
|
||||||
|
conn
|
||||||
|
|> assign(:user, reporter)
|
||||||
|
|> post("/api/v1/reports", %{
|
||||||
|
"account_id" => target_user.id,
|
||||||
|
"status_ids" => [activity.id],
|
||||||
|
"comment" => "bad status!",
|
||||||
|
"forward" => "false"
|
||||||
|
})
|
||||||
|
|> json_response(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "account_id is required", %{
|
||||||
|
conn: conn,
|
||||||
|
reporter: reporter,
|
||||||
|
activity: activity
|
||||||
|
} do
|
||||||
|
assert %{"error" => "Valid `account_id` required"} =
|
||||||
|
conn
|
||||||
|
|> assign(:user, reporter)
|
||||||
|
|> post("/api/v1/reports", %{"status_ids" => [activity.id]})
|
||||||
|
|> json_response(400)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "comment must be up to the size specified in the config", %{
|
||||||
|
conn: conn,
|
||||||
|
reporter: reporter,
|
||||||
|
target_user: target_user
|
||||||
|
} do
|
||||||
|
max_size = Pleroma.Config.get([:instance, :max_report_comment_size], 1000)
|
||||||
|
comment = String.pad_trailing("a", max_size + 1, "a")
|
||||||
|
|
||||||
|
error = %{"error" => "Comment must be up to #{max_size} characters"}
|
||||||
|
|
||||||
|
assert ^error =
|
||||||
|
conn
|
||||||
|
|> assign(:user, reporter)
|
||||||
|
|> post("/api/v1/reports", %{"account_id" => target_user.id, "comment" => comment})
|
||||||
|
|> json_response(400)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when account is not exist", %{
|
||||||
|
conn: conn,
|
||||||
|
reporter: reporter,
|
||||||
|
activity: activity
|
||||||
|
} do
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, reporter)
|
||||||
|
|> post("/api/v1/reports", %{"status_ids" => [activity.id], "account_id" => "foo"})
|
||||||
|
|
||||||
|
assert json_response(conn, 400) == %{"error" => "Account not found"}
|
||||||
|
end
|
||||||
|
end
|
|
@ -1317,85 +1317,6 @@ test "returns pinned statuses", %{conn: conn, user: user, activity: activity} do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "reports" do
|
|
||||||
setup do
|
|
||||||
reporter = insert(:user)
|
|
||||||
target_user = insert(:user)
|
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(target_user, %{"status" => "foobar"})
|
|
||||||
|
|
||||||
[reporter: reporter, target_user: target_user, activity: activity]
|
|
||||||
end
|
|
||||||
|
|
||||||
test "submit a basic report", %{conn: conn, reporter: reporter, target_user: target_user} do
|
|
||||||
assert %{"action_taken" => false, "id" => _} =
|
|
||||||
conn
|
|
||||||
|> assign(:user, reporter)
|
|
||||||
|> post("/api/v1/reports", %{"account_id" => target_user.id})
|
|
||||||
|> json_response(200)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "submit a report with statuses and comment", %{
|
|
||||||
conn: conn,
|
|
||||||
reporter: reporter,
|
|
||||||
target_user: target_user,
|
|
||||||
activity: activity
|
|
||||||
} do
|
|
||||||
assert %{"action_taken" => false, "id" => _} =
|
|
||||||
conn
|
|
||||||
|> assign(:user, reporter)
|
|
||||||
|> post("/api/v1/reports", %{
|
|
||||||
"account_id" => target_user.id,
|
|
||||||
"status_ids" => [activity.id],
|
|
||||||
"comment" => "bad status!",
|
|
||||||
"forward" => "false"
|
|
||||||
})
|
|
||||||
|> json_response(200)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "account_id is required", %{
|
|
||||||
conn: conn,
|
|
||||||
reporter: reporter,
|
|
||||||
activity: activity
|
|
||||||
} do
|
|
||||||
assert %{"error" => "Valid `account_id` required"} =
|
|
||||||
conn
|
|
||||||
|> assign(:user, reporter)
|
|
||||||
|> post("/api/v1/reports", %{"status_ids" => [activity.id]})
|
|
||||||
|> json_response(400)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "comment must be up to the size specified in the config", %{
|
|
||||||
conn: conn,
|
|
||||||
reporter: reporter,
|
|
||||||
target_user: target_user
|
|
||||||
} do
|
|
||||||
max_size = Config.get([:instance, :max_report_comment_size], 1000)
|
|
||||||
comment = String.pad_trailing("a", max_size + 1, "a")
|
|
||||||
|
|
||||||
error = %{"error" => "Comment must be up to #{max_size} characters"}
|
|
||||||
|
|
||||||
assert ^error =
|
|
||||||
conn
|
|
||||||
|> assign(:user, reporter)
|
|
||||||
|> post("/api/v1/reports", %{"account_id" => target_user.id, "comment" => comment})
|
|
||||||
|> json_response(400)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns error when account is not exist", %{
|
|
||||||
conn: conn,
|
|
||||||
reporter: reporter,
|
|
||||||
activity: activity
|
|
||||||
} do
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> assign(:user, reporter)
|
|
||||||
|> post("/api/v1/reports", %{"status_ids" => [activity.id], "account_id" => "foo"})
|
|
||||||
|
|
||||||
assert json_response(conn, 400) == %{"error" => "Account not found"}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "link headers" do
|
describe "link headers" do
|
||||||
test "preserves parameters in link headers", %{conn: conn} do
|
test "preserves parameters in link headers", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
|
@ -396,7 +396,8 @@ test "activity+json format. it redirects on actual feed of user", %{conn: conn}
|
||||||
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
||||||
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
||||||
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
||||||
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox"
|
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
|
||||||
|
"uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media"
|
||||||
}
|
}
|
||||||
|
|
||||||
assert response["@context"] == [
|
assert response["@context"] == [
|
||||||
|
@ -458,7 +459,8 @@ test "json format. it redirects on actual feed of user", %{conn: conn} do
|
||||||
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
||||||
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
||||||
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
||||||
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox"
|
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
|
||||||
|
"uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media"
|
||||||
}
|
}
|
||||||
|
|
||||||
assert response["@context"] == [
|
assert response["@context"] == [
|
||||||
|
|
Loading…
Reference in New Issue