Add object id to uploaded attachments

lib/pleroma/upload.ex

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

test/pleroma/upload_test.exs

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