projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'poll-notification' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 23ada389b4fb8c0554bd1f65eec293abd4ff8685..828fe00857518594c69495ae44f705c9debd8b71 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-41,7
+41,7
@@
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
-
use Mix.
Config
+
import
Config
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
@@
-190,7
+190,6
@@
config :pleroma, :instance,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
- chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@
-391,6
+390,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
+408,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: [],
@@
-450,9
+456,11
@@
config :pleroma, :media_preview_proxy,
image_quality: 85,
min_content_length: 100 * 1024
image_quality: 85,
min_content_length: 100 * 1024
-config :pleroma, :chat, enabled: true
+config :pleroma, :shout,
+ enabled: true,
+ limit: 5_000
-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason
, "activity+json": Jason
config :phoenix, :json_library, Jason
config :phoenix, :json_library, Jason
@@
-552,6
+560,7
@@
config :pleroma, Oban,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
+ poll_notifications: 10,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,