diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
commit | 9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (patch) | |
tree | fc28e2fb05ad0158fe881de7a49e90d941e10ad4 /lib/pleroma/uploaders/swift/uploader.ex | |
parent | 9f235028569968871ef9ea933459c6e9369e737a (diff) | |
parent | e19e82975871388831fd23adc50fcaaea85ad5da (diff) | |
download | pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.tar.gz |
Merge branch 'develop' into feature/allow-user-query-via-id
Diffstat (limited to 'lib/pleroma/uploaders/swift/uploader.ex')
-rw-r--r-- | lib/pleroma/uploaders/swift/uploader.ex | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/lib/pleroma/uploaders/swift/uploader.ex b/lib/pleroma/uploaders/swift/uploader.ex deleted file mode 100644 index d122b09e7..000000000 --- a/lib/pleroma/uploaders/swift/uploader.ex +++ /dev/null @@ -1,19 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Uploaders.Swift do - @behaviour Pleroma.Uploaders.Uploader - - def get_file(name) do - {:ok, {:url, Path.join([Pleroma.Config.get!([__MODULE__, :object_url]), name])}} - end - - def put_file(upload) do - Pleroma.Uploaders.Swift.Client.upload_file( - upload.path, - File.read!(upload.tmpfile), - upload.content_type - ) - end -end |