diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-13 12:41:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-13 12:41:07 +0300 |
| commit | b7908844f24f4ede4244261d43f30ed3724efbb7 (patch) | |
| tree | 1b2f17fbba3cbd006573b8447117cc9e35c09d99 /lib/pleroma/uploaders/uploader.ex | |
| parent | 54c9db38c8035ecc115e136a09a3d991e426959a (diff) | |
| parent | a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4 (diff) | |
| download | pleroma-b7908844f24f4ede4244261d43f30ed3724efbb7.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'lib/pleroma/uploaders/uploader.ex')
| -rw-r--r-- | lib/pleroma/uploaders/uploader.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex index c0b22c28a..d71e213d2 100644 --- a/lib/pleroma/uploaders/uploader.ex +++ b/lib/pleroma/uploaders/uploader.ex @@ -36,6 +36,8 @@ defmodule Pleroma.Uploaders.Uploader do @callback put_file(Pleroma.Upload.t()) :: :ok | {:ok, file_spec()} | {:error, String.t()} | :wait_callback + @callback delete_file(file :: String.t()) :: :ok | {:error, String.t()} + @callback http_callback(Plug.Conn.t(), Map.t()) :: {:ok, Plug.Conn.t()} | {:ok, Plug.Conn.t(), file_spec()} @@ -43,7 +45,6 @@ defmodule Pleroma.Uploaders.Uploader do @optional_callbacks http_callback: 2 @spec put_file(module(), Pleroma.Upload.t()) :: {:ok, file_spec()} | {:error, String.t()} - def put_file(uploader, upload) do case uploader.put_file(upload) do :ok -> {:ok, {:file, upload.path}} |