summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-07-13 15:45:25 +0000
committerfeld <feld@feld.me>2020-07-13 15:45:25 +0000
commit5d215fd81f529b639db9096ca71d4e7f0a6ed386 (patch)
tree3a05328918c89dcd76142c4d8f50bf6af371de62 /config
parent8f9ee694ed47709231ffc852d2e82a06468cba06 (diff)
parent4347d2de5eb609bbfa1a206a5de5df925d3a0696 (diff)
downloadpleroma-5d215fd81f529b639db9096ca71d4e7f0a6ed386.tar.gz
pleroma-5d215fd81f529b639db9096ca71d4e7f0a6ed386.zip
Merge branch 'config-behaviours-runtime' into 'develop'
Config/Docs: Expand behaviour suggestions modules at runtime Closes #1941 See merge request pleroma/pleroma!2755
Diffstat (limited to 'config')
-rw-r--r--config/description.exs14
1 files changed, 3 insertions, 11 deletions
diff --git a/config/description.exs b/config/description.exs
index 3b78a6613..84dcdb87e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -23,18 +23,14 @@ config :pleroma, :config_description, [
key: :uploader,
type: :module,
description: "Module which will be used for uploads",
- suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.S3]
+ suggestions: {:list_behaviour_implementations, Pleroma.Uploaders.Uploader}
},
%{
key: :filters,
type: {:list, :module},
description:
"List of filter modules for uploads. Module names are shortened (removed leading `Pleroma.Upload.Filter.` part), but on adding custom module you need to use full name.",
- suggestions:
- Generator.list_modules_in_dir(
- "lib/pleroma/upload/filter",
- "Elixir.Pleroma.Upload.Filter."
- )
+ suggestions: {:list_behaviour_implementations, Pleroma.Upload.Filter}
},
%{
key: :link_name,
@@ -1405,11 +1401,7 @@ config :pleroma, :config_description, [
type: [:module, {:list, :module}],
description:
"A list of MRF policies enabled. Module names are shortened (removed leading `Pleroma.Web.ActivityPub.MRF.` part), but on adding custom module you need to use full name.",
- suggestions:
- Generator.list_modules_in_dir(
- "lib/pleroma/web/activity_pub/mrf",
- "Elixir.Pleroma.Web.ActivityPub.MRF."
- )
+ suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF}
},
%{
key: :transparency,