diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-03-10 13:08:00 -0500 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 16:58:13 +0300 |
commit | f8dc597c51ef294311687e5f3ff468635779638f (patch) | |
tree | 71b2a7e34d6f0f9703f0584e22a1c540553035f4 | |
parent | 423cfaf141afb03676aeb5e0f377be67e89092fc (diff) | |
download | pleroma-f8dc597c51ef294311687e5f3ff468635779638f.tar.gz |
Fix enforcement of character limits
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 | ||||
-rw-r--r-- | test/web/common_api/common_api_test.exs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 8746273c4..348fdedf1 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -591,7 +591,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do limit = Pleroma.Config.get([:instance, :limit]) length = String.length(full_payload) - if length < limit do + if length <= limit do :ok else {:error, dgettext("errors", "The status is over the character limit")} diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 299d968db..b80523160 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -202,13 +202,15 @@ defmodule Pleroma.Web.CommonAPITest do CommonAPI.post(user, %{"status" => ""}) end - test "it returns error when character limit is exceeded" do + test "it validates character limits are correctly enforced" do Pleroma.Config.put([:instance, :limit], 5) user = insert(:user) assert {:error, "The status is over the character limit"} = CommonAPI.post(user, %{"status" => "foobar"}) + + assert {:ok, activity} = CommonAPI.post(user, %{"status" => "12345"}) end test "it can handle activities that expire" do |