Merge branch 'feature/fe-configuration' into 'develop'
serverside frontend configuration See merge request pleroma/pleroma!256
This commit is contained in:
commit
6f23fb53d3
|
@ -52,6 +52,7 @@
|
||||||
version: version,
|
version: version,
|
||||||
name: "Pleroma",
|
name: "Pleroma",
|
||||||
email: "example@example.com",
|
email: "example@example.com",
|
||||||
|
description: "A Pleroma instance, an alternative fediverse server",
|
||||||
limit: 5000,
|
limit: 5000,
|
||||||
upload_limit: 16_000_000,
|
upload_limit: 16_000_000,
|
||||||
registrations_open: true,
|
registrations_open: true,
|
||||||
|
@ -60,6 +61,19 @@
|
||||||
public: true,
|
public: true,
|
||||||
quarantined_instances: []
|
quarantined_instances: []
|
||||||
|
|
||||||
|
config :pleroma, :fe,
|
||||||
|
theme: "pleroma-dark",
|
||||||
|
logo: "/static/logo.png",
|
||||||
|
background: "/static/aurora_borealis.jpg",
|
||||||
|
redirect_root_no_login: "/main/all",
|
||||||
|
redirect_root_login: "/main/friends",
|
||||||
|
show_instance_panel: true,
|
||||||
|
show_who_to_follow_panel: false,
|
||||||
|
who_to_follow_provider:
|
||||||
|
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
|
||||||
|
who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
|
||||||
|
scope_options_enabled: false
|
||||||
|
|
||||||
config :pleroma, :activitypub,
|
config :pleroma, :activitypub,
|
||||||
accept_blocks: true,
|
accept_blocks: true,
|
||||||
unfollow_blocked: true,
|
unfollow_blocked: true,
|
||||||
|
|
|
@ -125,7 +125,7 @@ def masto_instance(conn, _params) do
|
||||||
response = %{
|
response = %{
|
||||||
uri: Web.base_url(),
|
uri: Web.base_url(),
|
||||||
title: Keyword.get(@instance, :name),
|
title: Keyword.get(@instance, :name),
|
||||||
description: "A Pleroma instance, an alternative fediverse server",
|
description: Keyword.get(@instance, :description),
|
||||||
version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
|
version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
|
||||||
email: Keyword.get(@instance, :email),
|
email: Keyword.get(@instance, :email),
|
||||||
urls: %{
|
urls: %{
|
||||||
|
|
|
@ -43,7 +43,9 @@ def nodeinfo(conn, %{"version" => "2.0"}) do
|
||||||
},
|
},
|
||||||
metadata: %{
|
metadata: %{
|
||||||
nodeName: Keyword.get(instance, :name),
|
nodeName: Keyword.get(instance, :name),
|
||||||
mediaProxy: Keyword.get(media_proxy, :enabled)
|
nodeDescription: Keyword.get(instance, :description),
|
||||||
|
mediaProxy: Keyword.get(media_proxy, :enabled),
|
||||||
|
private: !Keyword.get(instance, :public, true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,6 +126,8 @@ def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}
|
||||||
end
|
end
|
||||||
|
|
||||||
@instance Application.get_env(:pleroma, :instance)
|
@instance Application.get_env(:pleroma, :instance)
|
||||||
|
@instance_fe Application.get_env(:pleroma, :fe)
|
||||||
|
@instance_chat Application.get_env(:pleroma, :chat)
|
||||||
def config(conn, _params) do
|
def config(conn, _params) do
|
||||||
case get_format(conn) do
|
case get_format(conn) do
|
||||||
"xml" ->
|
"xml" ->
|
||||||
|
@ -148,9 +150,24 @@ def config(conn, _params) do
|
||||||
json(conn, %{
|
json(conn, %{
|
||||||
site: %{
|
site: %{
|
||||||
name: Keyword.get(@instance, :name),
|
name: Keyword.get(@instance, :name),
|
||||||
|
description: Keyword.get(@instance, :description),
|
||||||
server: Web.base_url(),
|
server: Web.base_url(),
|
||||||
textlimit: to_string(Keyword.get(@instance, :limit)),
|
textlimit: to_string(Keyword.get(@instance, :limit)),
|
||||||
closed: if(Keyword.get(@instance, :registrations_open), do: "0", else: "1")
|
closed: if(Keyword.get(@instance, :registrations_open), do: "0", else: "1"),
|
||||||
|
private: if(Keyword.get(@instance, :public, true), do: "0", else: "1"),
|
||||||
|
pleromafe: %{
|
||||||
|
theme: Keyword.get(@instance_fe, :theme),
|
||||||
|
background: Keyword.get(@instance_fe, :background),
|
||||||
|
logo: Keyword.get(@instance_fe, :logo),
|
||||||
|
redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
|
||||||
|
redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
|
||||||
|
chatDisabled: !Keyword.get(@instance_chat, :enabled),
|
||||||
|
showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
|
||||||
|
showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
|
||||||
|
scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
|
||||||
|
whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider),
|
||||||
|
whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue