projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-tags' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 8d2fdd40d7ba10de9abdd44c3160a2ae5994cb33..df6ea09ae4c894dfa0d85fc5d43c5763a44b6716 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-50,6
+50,15
@@
config :pleroma, :uri_schemes,
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
+ http: [
+ dispatch: [
+ {:_,
+ [
+ {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+ {:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
+ ]}
+ ]
+ ],
protocol: "https",
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
signing_salt: "CqaoopA2",
protocol: "https",
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
signing_salt: "CqaoopA2",
@@
-65,6
+74,7
@@
config :logger, :console,
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
+ "application/jrd+json" => ["jrd+json"],
"application/activity+json" => ["activity+json"],
"application/ld+json" => ["activity+json"]
}
"application/activity+json" => ["activity+json"],
"application/ld+json" => ["activity+json"]
}
@@
-126,7
+136,10
@@
config :pleroma, :fe,
formatting_options_enabled: false,
collapse_message_with_subject: false,
hide_post_stats: false,
formatting_options_enabled: false,
collapse_message_with_subject: false,
hide_post_stats: false,
- hide_user_stats: false
+ hide_user_stats: false,
+ scope_copy: true,
+ subject_line_behavior: "email",
+ always_show_subject_input: true
config :pleroma, :activitypub,
accept_blocks: true,
config :pleroma, :activitypub,
accept_blocks: true,