squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/persisted-mastofe-settings' into 'develop'

Browse Source 
MastoAPI: Persist frontend timelines and settings.

Closes #113

See merge request pleroma/pleroma!98
This commit is contained in:
lambda 2018-04-08 06:01:06 +00:00
commit 9a2d3705c6
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -604,7 +604,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
"video\/mp4"
]
},
settings: %{
settings: Map.get(user.info, "settings") || %{
onboarded: true,
home: %{
shows: %{
@ -649,6 +649,18 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
end
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
with new_info <- Map.put(user.info, "settings", settings),
change <- User.info_changeset(user, %{info: new_info}),
{:ok, _user} <- User.update_and_set_cache(change) do
conn
|> json(%{})
else e ->
conn
|> json(%{error: inspect(e)})
end
end
def login(conn, _) do
conn
|> render(MastodonView, "login.html", %{error: false})

6
lib/pleroma/web/router.ex
View File

@ -120,6 +120,12 @@ defmodule Pleroma.Web.Router do
post("/media", MastodonAPIController, :upload)
end
scope "/api/web", Pleroma.Web.MastodonAPI do
pipe_through(:authenticated_api)
put("/settings", MastodonAPIController, :put_settings)
end
scope "/api/v1", Pleroma.Web.MastodonAPI do
pipe_through(:api)
get("/instance", MastodonAPIController, :masto_instance)