projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1794] Fixes URI query handling for hashtags extraction in search.
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
instance_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/instance_view.ex
b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 8088306c3bd0c01f6f4d0d4ae725f48067a448a8..c498fe6326084e5302502a277fc29c145ba00d73 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/instance_view.ex
@@
-23,7
+23,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
streaming_api: Pleroma.Web.Endpoint.websocket_url()
},
stats: Pleroma.Stats.get_stats(),
streaming_api: Pleroma.Web.Endpoint.websocket_url()
},
stats: Pleroma.Stats.get_stats(),
- thumbnail:
Pleroma.Web.base_url() <> "/instance/thumbnail.jpeg"
,
+ thumbnail:
instance_thumbnail()
,
languages: ["en"],
registrations: Keyword.get(instance, :registrations_open),
# Extra (not present in Mastodon):
languages: ["en"],
registrations: Keyword.get(instance, :registrations_open),
# Extra (not present in Mastodon):
@@
-69,7
+69,8
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
end,
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
end,
- "pleroma_emoji_reactions"
+ "pleroma_emoji_reactions",
+ "pleroma_chat_messages"
]
|> Enum.filter(& &1)
end
]
|> Enum.filter(& &1)
end
@@
-87,4
+88,9
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
end
|> Map.put(:enabled, Config.get([:instance, :federating]))
end
end
|> Map.put(:enabled, Config.get([:instance, :federating]))
end
+
+ defp instance_thumbnail do
+ Pleroma.Config.get([:instance, :instance_thumbnail]) ||
+ "#{Pleroma.Web.base_url()}/instance/thumbnail.jpeg"
+ end
end
end