X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fapp_view.ex;h=e44272c6f6309d50ab98cc7f3a05335996528d9b;hb=651f269568cb7e54cd96d8a0d8ea3533f77e9a3a;hp=1976d4dcb00a0ce92ce041e95f375e8f733c8714;hpb=691d1208b5abd5bfb6ff0c1c75a8f315ee0e4500;p=akkoma
diff --git a/lib/pleroma/web/mastodon_api/views/app_view.ex b/lib/pleroma/web/mastodon_api/views/app_view.ex
index 1976d4dcb..e44272c6f 100644
--- a/lib/pleroma/web/mastodon_api/views/app_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/app_view.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AppView do
@@ -7,21 +7,44 @@ defmodule Pleroma.Web.MastodonAPI.AppView do
alias Pleroma.Web.OAuth.App
- def render("show.json", %{app: %App{website: webiste, client_name: name}}) do
- result = %{
+ def render("index.json", %{apps: apps, count: count, page_size: page_size, admin: true}) do
+ %{
+ apps: render_many(apps, Pleroma.Web.MastodonAPI.AppView, "show.json", %{admin: true}),
+ count: count,
+ page_size: page_size
+ }
+ end
+
+ def render("show.json", %{admin: true, app: %App{} = app} = assigns) do
+ "show.json"
+ |> render(Map.delete(assigns, :admin))
+ |> Map.put(:trusted, app.trusted)
+ |> Map.put(:id, app.id)
+ end
+
+ def render("show.json", %{app: %App{} = app}) do
+ %{
+ id: app.id |> to_string,
+ name: app.client_name,
+ client_id: app.client_id,
+ client_secret: app.client_secret,
+ redirect_uri: app.redirect_uris,
+ website: app.website
+ }
+ |> with_vapid_key()
+ end
+
+ def render("short.json", %{app: %App{website: webiste, client_name: name}}) do
+ %{
name: name,
website: webiste
}
+ |> with_vapid_key()
+ end
- vapid_key = Pleroma.Web.Push.vapid_config() |> Keyword.get(:public_key)
-
- result =
- if vapid_key do
- Map.put(result, "vapid_key", vapid_key)
- else
- result
- end
+ defp with_vapid_key(data) do
+ vapid_key = Application.get_env(:web_push_encryption, :vapid_details, [])[:public_key]
- result
+ Pleroma.Maps.put_if_present(data, "vapid_key", vapid_key)
end
end