diff options
author | feld <feld@feld.me> | 2020-01-12 18:48:59 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2020-01-12 18:48:59 +0000 |
commit | a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4 (patch) | |
tree | b03a833986d9cbdadc7e807ff3ae6054a36842e5 /lib/pleroma/uploaders/uploader.ex | |
parent | 8b4d81609d5627d62b826bcd3e87290cb513495f (diff) | |
parent | 88f0eed0f24cb05949edcea49215ee939babac58 (diff) | |
download | pleroma-a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4.tar.gz |
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
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}} |