diff options
author | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
commit | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch) | |
tree | 46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /lib/pleroma/uploaders | |
parent | a704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff) | |
parent | a8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff) | |
download | pleroma-nsfw-api-mrf.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'lib/pleroma/uploaders')
-rw-r--r-- | lib/pleroma/uploaders/uploader.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex index 0be878ca2..deba548b7 100644 --- a/lib/pleroma/uploaders/uploader.ex +++ b/lib/pleroma/uploaders/uploader.ex @@ -35,7 +35,7 @@ defmodule Pleroma.Uploaders.Uploader do """ @type file_spec :: {:file | :url, String.t()} - @callback put_file(Pleroma.Upload.t()) :: + @callback put_file(upload :: struct()) :: :ok | {:ok, file_spec()} | {:error, String.t()} | :wait_callback @callback delete_file(file :: String.t()) :: :ok | {:error, String.t()} @@ -46,7 +46,7 @@ defmodule Pleroma.Uploaders.Uploader do | {:error, Plug.Conn.t(), String.t()} @optional_callbacks http_callback: 2 - @spec put_file(module(), Pleroma.Upload.t()) :: {:ok, file_spec()} | {:error, String.t()} + @spec put_file(module(), upload :: struct()) :: {:ok, file_spec()} | {:error, String.t()} def put_file(uploader, upload) do case uploader.put_file(upload) do :ok -> {:ok, {:file, upload.path}} |