projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Require follow and read OAuth scopes for GET /api/v1/apps
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
app_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/app_view.ex
b/lib/pleroma/web/mastodon_api/views/app_view.ex
index 36071cd25dbaa70672bc6cec69335923f16769a7..450943aee18862bd6c25c9cf45c541216393ee2c 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AppView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AppView do
@@
-15,6
+15,10
@@
defmodule Pleroma.Web.MastodonAPI.AppView do
}
end
}
end
+ def render("index.json", %{apps: apps}) do
+ render_many(apps, Pleroma.Web.MastodonAPI.AppView, "show.json")
+ end
+
def render("show.json", %{admin: true, app: %App{} = app} = assigns) do
"show.json"
|> render(Map.delete(assigns, :admin))
def render("show.json", %{admin: true, app: %App{} = app} = assigns) do
"show.json"
|> render(Map.delete(assigns, :admin))
@@
-34,10
+38,10
@@
defmodule Pleroma.Web.MastodonAPI.AppView do
|> with_vapid_key()
end
|> with_vapid_key()
end
- def render("
short.json", %{app: %App{website: webis
te, client_name: name}}) do
+ def render("
compact_non_secret.json", %{app: %App{website: websi
te, client_name: name}}) do
%{
name: name,
%{
name: name,
- website: web
is
te
+ website: web
si
te
}
|> with_vapid_key()
end
}
|> with_vapid_key()
end
@@
-45,10
+49,6
@@
defmodule Pleroma.Web.MastodonAPI.AppView do
defp with_vapid_key(data) do
vapid_key = Application.get_env(:web_push_encryption, :vapid_details, [])[:public_key]
defp with_vapid_key(data) do
vapid_key = Application.get_env(:web_push_encryption, :vapid_details, [])[:public_key]
- if vapid_key do
- Map.put(data, "vapid_key", vapid_key)
- else
- data
- end
+ Pleroma.Maps.put_if_present(data, "vapid_key", vapid_key)
end
end
end
end