aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-14 13:29:32 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-14 13:29:32 +0000
commit1589b170e80fa33ffcfd7fd85aec115d7765375d (patch)
treec1de518adad818122896794f646c679db91f5538 /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parent9f211838eca3793bac8bbb6b64f200a8a6c8d29f (diff)
parente7c39b7ac8f0462ab563d3cf51f24c76feab0e8d (diff)
downloadpleroma-1589b170e80fa33ffcfd7fd85aec115d7765375d.tar.gz
Merge branch 'feature/1072-muting-notifications' into 'develop'
Feature/1072 muting notifications Closes #1072 See merge request pleroma/pleroma!1398
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 45ef7be3d..0313560a8 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -192,6 +192,13 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
def notifications(%{assigns: %{user: user}} = conn, params) do
+ params =
+ if Map.has_key?(params, "with_muted") do
+ Map.put(params, :with_muted, params["with_muted"] in [true, "True", "true", "1"])
+ else
+ params
+ end
+
notifications = Notification.for_user(user, params)
conn