diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 16:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 21:29:14 +0300 |
| commit | c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047 (patch) | |
| tree | 3ba35681409d9c5dd9ca4d355ff39d4dd67448d4 /lib/pleroma/uploaders/uploader.ex | |
| parent | 969769730e0b7578ddc6a5cd02f9b24eff5902a0 (diff) | |
| parent | 12b28c8925c2c55e0d7bb66ff3320532a1aade3b (diff) | |
| download | pleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.tar.gz | |
Merge branch 'develop' into feature/tag_feed
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}} |