projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/tag_feed
[akkoma]
/
lib
/
pleroma
/
web
/
masto_fe_controller.ex
diff --git
a/lib/pleroma/web/masto_fe_controller.ex
b/lib/pleroma/web/masto_fe_controller.ex
index 87860f1d5a2a5c0979cc68801ca4357d244e8379..ca261ad6ed96a944822cc130e8bb6769a37ee407 100644
(file)
--- a/
lib/pleroma/web/masto_fe_controller.ex
+++ b/
lib/pleroma/web/masto_fe_controller.ex
@@
-34,9
+34,15
@@
defmodule Pleroma.Web.MastoFEController do
end
end
end
end
+ @doc "GET /web/manifest.json"
+ def manifest(conn, _params) do
+ conn
+ |> render("manifest.json")
+ end
+
@doc "PUT /api/web/settings"
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
@doc "PUT /api/web/settings"
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
- with {:ok, _} <- User.
update_info(user, &User.Info.mastodon_settings_update(&1, settings)
) do
+ with {:ok, _} <- User.
mastodon_settings_update(user, settings
) do
json(conn, %{})
else
e ->
json(conn, %{})
else
e ->