aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-26 13:41:18 +0000
committerkaniini <nenolod@gmail.com>2019-01-26 13:41:18 +0000
commitb050d27c2d667d3c61e2c5716d26971f24b4bc5c (patch)
tree9c1c91eb75c7981ee0e40967f9c010777ddc2389 /lib
parent6383fa3a5d1a269315001b445dafc73a059dd8cb (diff)
parent499a4591a4689094bff597e30ce599a6fc189ea3 (diff)
downloadpleroma-b050d27c2d667d3c61e2c5716d26971f24b4bc5c.tar.gz
Merge branch 'bugfix/content_nil_lenght_check' into 'develop'
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil See merge request pleroma/pleroma!711
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 6b4682e35..07779fa00 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -64,7 +64,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
- defp check_remote_limit(%{"object" => %{"content" => content}}) do
+ defp check_remote_limit(%{"object" => %{"content" => content}}) when not is_nil(content) do
limit = Pleroma.Config.get([:instance, :remote_limit])
String.length(content) <= limit
end