diff options
author | kaniini <nenolod@gmail.com> | 2019-05-13 18:34:52 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-05-13 18:34:52 +0000 |
commit | 5a4d55cf910f85b07f111972647a8b4410b5eb6b (patch) | |
tree | b17517c7bfe0829f3ab31c52399edad451dedf9d /lib | |
parent | 16cb9e5f1cae84322bd7953e58b438f3b4bd8b9c (diff) | |
parent | 7701a4c84191a445e0b62e8a241e8af86f86e16a (diff) | |
download | pleroma-5a4d55cf910f85b07f111972647a8b4410b5eb6b.tar.gz |
Merge branch 'filter-irreversible' into 'develop'
Make irreversible field, default to false in filters
See merge request pleroma/pleroma!1144
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 956736780..fd595031d 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1536,7 +1536,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do user_id: user.id, phrase: phrase, context: context, - hide: Map.get(params, "irreversible", nil), + hide: Map.get(params, "irreversible", false), whole_word: Map.get(params, "boolean", true) # expires_at } |