hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'notification-pleroma-settings' into 'develop'

Browse source 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
This commit is contained in:
kaniini 2019-04-10 02:10:31 +00:00
commit 97395e013e
10 changed files with 217 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -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