AkkomaGang/akkoma
AkkomaGang/akkoma
14
63
Fork 84
Code Issues 162 Pull requests 12 Packages Projects 2 Releases 14 Wiki Activity

Add object id to uploaded attachments

Browse source
This commit is contained in:
Tusooa Zhu 2022-06-08 11:05:48 -04:00 committed by FloatingGhost
parent f7c722c3f7
commit a9038093ba
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/upload.ex
View file

@ -36,6 +36,7 @@ defmodule Pleroma.Upload do
alias Ecto.UUID alias Ecto.UUID
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.Maps alias Pleroma.Maps
alias Pleroma.Web.ActivityPub.Utils
require Logger require Logger
@type source :: @type source ::
@ -88,6 +89,7 @@ defmodule Pleroma.Upload do
{:ok, url_spec} <- Pleroma.Uploaders.Uploader.put_file(opts.uploader, upload) do {:ok, url_spec} <- Pleroma.Uploaders.Uploader.put_file(opts.uploader, upload) do
{:ok, {:ok,
%{ %{
"id" => Utils.generate_object_id(),
"type" => opts.activity_type, "type" => opts.activity_type,
"mediaType" => upload.content_type, "mediaType" => upload.content_type,
"url" => [ "url" => [

8
test/pleroma/upload_test.exs
View file

@ -49,9 +49,11 @@ defmodule Pleroma.UploadTest do
test "it returns file" do test "it returns file" do
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg") File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
assert Upload.store(@upload_file) == assert {:ok, result} = Upload.store(@upload_file)
{:ok,
assert result ==
%{ %{
"id" => result["id"],
"name" => "image.jpg", "name" => "image.jpg",
"type" => "Document", "type" => "Document",
"mediaType" => "image/jpeg", "mediaType" => "image/jpeg",
@ -62,7 +64,7 @@ defmodule Pleroma.UploadTest do
"type" => "Link" "type" => "Link"
} }
] ]
}} }
Task.await(Agent.get(TestUploaderSuccess, fn task_pid -> task_pid end)) Task.await(Agent.get(TestUploaderSuccess, fn task_pid -> task_pid end))
end end