diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-04-29 12:19:10 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-04-29 12:19:10 -0500 |
| commit | e7ac15905e04ba33b0dd0ed32ab42cdea5dab8f9 (patch) | |
| tree | 5cc9585793e2e020d75f90b99ebb91a71d56ee6b /config | |
| parent | b6a69b5efda5f75ad716252c69ae658a4e885b0a (diff) | |
| parent | 115673bce773f91630c3bd4fd2d0023f92bee163 (diff) | |
| download | pleroma-e7ac15905e04ba33b0dd0ed32ab42cdea5dab8f9.tar.gz pleroma-e7ac15905e04ba33b0dd0ed32ab42cdea5dab8f9.zip | |
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 8d1e17b42..4381068ac 100644 --- a/config/config.exs +++ b/config/config.exs @@ -409,6 +409,8 @@ config :pleroma, :mrf_object_age, threshold: 604_800, actions: [:delist, :strip_followers] +config :pleroma, :mrf_follow_bot, follower_nickname: nil + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], diff --git a/config/description.exs b/config/description.exs index 41e5e4056..bb1f43305 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2944,6 +2944,23 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :mrf_follow_bot, + tab: :mrf, + related_policy: "Pleroma.Web.ActivityPub.MRF.FollowBotPolicy", + label: "MRF FollowBot Policy", + type: :group, + description: "Automatically follows newly discovered accounts.", + children: [ + %{ + key: :follower_nickname, + type: :string, + description: "The name of the bot account to use for following newly discovered users.", + suggestions: ["followbot"] + } + ] + }, + %{ + group: :pleroma, key: :modules, type: :group, description: "Custom Runtime Modules", |