diff options
author | William Pitcock <nenolod@dereferenced.org> | 2018-10-29 16:30:12 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2018-10-29 16:43:05 +0000 |
commit | 167d3789a5a334859dfb9bf1612bdfc993032667 (patch) | |
tree | 807d23ebd6c1bde32009bf1ade273094c1d90d96 /lib | |
parent | fa483cd7c211ba7d755d307f095bde31efdb81d4 (diff) | |
download | pleroma-167d3789a5a334859dfb9bf1612bdfc993032667.tar.gz |
activitypub: upload: pass through an upload limit if one is provided
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 4b8b6eb52..537b99f31 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -575,9 +575,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> Enum.reverse() end - def upload(file) do - data = Upload.store(file, Application.get_env(:pleroma, :instance)[:dedupe_media]) - Repo.insert(%Object{data: data}) + def upload(file, size_limit \\ nil) do + with data <- + Upload.store(file, Application.get_env(:pleroma, :instance)[:dedupe_media], size_limit), + false <- is_nil(data) do + Repo.insert(%Object{data: data}) + end end def user_data_from_user_object(data) do |