projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
nodeinfo
/
nodeinfo_controller.ex
diff --git
a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 947edd8b7d49e8483da21d327502f40758f6cb98..f9a5ddcc00e79814e5931289bb5ac8615acca3ac 100644
(file)
--- a/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
@@
-60,6
+60,7
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
"pleroma_explicit_addressing",
"shareable_emoji_packs",
"multifetch",
"pleroma_explicit_addressing",
"shareable_emoji_packs",
"multifetch",
+ "pleroma:api/v1/notifications:include_types_filter",
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
@@
-74,7
+75,8
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
end,
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
end,
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
- end
+ end,
+ "pleroma_emoji_reactions"
]
|> Enum.filter(& &1)
]
|> Enum.filter(& &1)