diff options
author | kaniini <nenolod@gmail.com> | 2019-04-10 02:10:31 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-04-10 02:10:31 +0000 |
commit | 97395e013e5dac84399769438f8b90cffa38afd5 (patch) | |
tree | 1429546e8d412f5c52b5be77115c87f1bbb831a5 /lib/pleroma/web/twitter_api | |
parent | 144648de92abea7330cf264b7608634a27bb6bdf (diff) | |
parent | cd90695a349f33b84f287794bae6070e9eec446a (diff) | |
download | pleroma-97395e013e5dac84399769438f8b90cffa38afd5.tar.gz |
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 26407aebd..bb71742ec 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -292,6 +292,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do json(conn, emoji) end + def update_notificaton_settings(%{assigns: %{user: user}} = conn, params) do + with {:ok, _} <- User.update_notification_settings(user, params) do + json(conn, %{status: "success"}) + end + end + def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do follow_import(conn, %{"list" => File.read!(listfile.path)}) end |