Extract mascot actions from `MastodonAPIController` to MascotController See merge request pleroma/pleroma!1745stable
commit
a22a7437d8
@ -0,0 +1,35 @@
|
|||||||
|
# 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.MascotController do
|
||||||
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
alias Pleroma.User
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
|
|
||||||
|
@doc "GET /api/v1/pleroma/mascot"
|
||||||
|
def show(%{assigns: %{user: user}} = conn, _params) do
|
||||||
|
json(conn, User.get_mascot(user))
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc "PUT /api/v1/pleroma/mascot"
|
||||||
|
def update(%{assigns: %{user: user}} = conn, %{"file" => file}) do
|
||||||
|
with {:ok, object} <- ActivityPub.upload(file, actor: User.ap_id(user)),
|
||||||
|
# Reject if not an image
|
||||||
|
%{type: "image"} = attachment <- render_attachment(object) do
|
||||||
|
# Sure!
|
||||||
|
# Save to the user's info
|
||||||
|
{:ok, _user} = User.update_info(user, &User.Info.mascot_update(&1, attachment))
|
||||||
|
|
||||||
|
json(conn, attachment)
|
||||||
|
else
|
||||||
|
%{type: _} -> render_error(conn, :unsupported_media_type, "mascots can only be images")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp render_attachment(object) do
|
||||||
|
attachment_data = Map.put(object.data, "id", object.id)
|
||||||
|
Pleroma.Web.MastodonAPI.StatusView.render("attachment.json", %{attachment: attachment_data})
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,77 @@
|
|||||||
|
# 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.MascotControllerTest do
|
||||||
|
use Pleroma.Web.ConnCase
|
||||||
|
|
||||||
|
alias Pleroma.User
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
test "mascot upload", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
non_image_file = %Plug.Upload{
|
||||||
|
content_type: "audio/mpeg",
|
||||||
|
path: Path.absname("test/fixtures/sound.mp3"),
|
||||||
|
filename: "sound.mp3"
|
||||||
|
}
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> put("/api/v1/pleroma/mascot", %{"file" => non_image_file})
|
||||||
|
|
||||||
|
assert json_response(conn, 415)
|
||||||
|
|
||||||
|
file = %Plug.Upload{
|
||||||
|
content_type: "image/jpg",
|
||||||
|
path: Path.absname("test/fixtures/image.jpg"),
|
||||||
|
filename: "an_image.jpg"
|
||||||
|
}
|
||||||
|
|
||||||
|
conn =
|
||||||
|
build_conn()
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> put("/api/v1/pleroma/mascot", %{"file" => file})
|
||||||
|
|
||||||
|
assert %{"id" => _, "type" => image} = json_response(conn, 200)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "mascot retrieving", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
# When user hasn't set a mascot, we should just get pleroma tan back
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/api/v1/pleroma/mascot")
|
||||||
|
|
||||||
|
assert %{"url" => url} = json_response(conn, 200)
|
||||||
|
assert url =~ "pleroma-fox-tan-smol"
|
||||||
|
|
||||||
|
# When a user sets their mascot, we should get that back
|
||||||
|
file = %Plug.Upload{
|
||||||
|
content_type: "image/jpg",
|
||||||
|
path: Path.absname("test/fixtures/image.jpg"),
|
||||||
|
filename: "an_image.jpg"
|
||||||
|
}
|
||||||
|
|
||||||
|
conn =
|
||||||
|
build_conn()
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> put("/api/v1/pleroma/mascot", %{"file" => file})
|
||||||
|
|
||||||
|
assert json_response(conn, 200)
|
||||||
|
|
||||||
|
user = User.get_cached_by_id(user.id)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
build_conn()
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/api/v1/pleroma/mascot")
|
||||||
|
|
||||||
|
assert %{"url" => url, "type" => "image"} = json_response(conn, 200)
|
||||||
|
assert url =~ "an_image"
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in new issue