projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c371c397ce966bf46f7f498f03a741d04996c82a..4381068ac34afa3fa488672f5716a777bbc7b427 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-391,6
+391,11
@@
config :pleroma, :mrf_keyword,
federated_timeline_removal: [],
replace: []
federated_timeline_removal: [],
replace: []
+config :pleroma, :mrf_hashtag,
+ sensitive: ["nsfw"],
+ reject: [],
+ federated_timeline_removal: []
+
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_activity_expiration, days: 365
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_activity_expiration, days: 365
@@
-404,6
+409,8
@@
config :pleroma, :mrf_object_age,
threshold: 604_800,
actions: [:delist, :strip_followers]
threshold: 604_800,
actions: [:delist, :strip_followers]
+config :pleroma, :mrf_follow_bot, follower_nickname: nil
+
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
@@
-611,10
+618,7
@@
config :ueberauth,
base_path: "/oauth",
providers: ueberauth_providers
base_path: "/oauth",
providers: ueberauth_providers
-config :pleroma,
- :auth,
- enforce_oauth_admin_scope_usage: true,
- oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-657,6
+661,8
@@
config :pleroma, :oauth2,
config :pleroma, :database, rum_enabled: false
config :pleroma, :database, rum_enabled: false
+config :pleroma, :features, improved_hashtag_timeline: :auto
+
config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
config :pleroma, :env, Mix.env()
config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
config :pleroma, :env, Mix.env()