diff options
| author | feld <feld@feld.me> | 2020-10-27 22:55:31 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-27 22:55:31 +0000 |
| commit | 1204aaa2e35983f7361d61ee7906ccf3d09d84e4 (patch) | |
| tree | b7ece4fbca3ec8f309a3c58cf27087a20546b31c /config | |
| parent | d8d4bd15d064e44d9900b91696a1ca2c373fcfc8 (diff) | |
| parent | 03a318af9ac1cc86e1201d6f55babd06c0b5ecd9 (diff) | |
| download | pleroma-1204aaa2e35983f7361d61ee7906ccf3d09d84e4.tar.gz pleroma-1204aaa2e35983f7361d61ee7906ccf3d09d84e4.zip | |
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index bd611fd42..c52ee8f82 100644 --- a/config/config.exs +++ b/config/config.exs @@ -234,6 +234,7 @@ config :pleroma, :instance, "text/bbcode" ], autofollowed_nicknames: [], + autofollowing_nicknames: [], max_pinned_statuses: 1, attachment_links: false, max_report_comment_size: 1000, diff --git a/config/description.exs b/config/description.exs index 55363c45a..0bfa9979f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -832,6 +832,12 @@ config :pleroma, :config_description, [ "Set to nicknames of (local) users that every new user should automatically follow" }, %{ + key: :autofollowing_nicknames, + type: {:list, :string}, + description: + "Set to nicknames of (local) users that automatically follows every newly registered user" + }, + %{ key: :attachment_links, type: :boolean, description: "Enable to automatically add attachment link text to statuses" |