diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 19:27:02 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 19:27:02 +0400 |
| commit | d3e85da0fd5a0022afdabe76bd5494217205f037 (patch) | |
| tree | 8a4d360d74b4c9cb183a68a40c135049f6dd5158 /config | |
| parent | c67506ba689633cd65f266610f2cd2a5da34912b (diff) | |
| parent | e93ae96e1323fae954c2ce482cbb1df9ed9441c6 (diff) | |
| download | pleroma-d3e85da0fd5a0022afdabe76bd5494217205f037.tar.gz pleroma-d3e85da0fd5a0022afdabe76bd5494217205f037.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 13 | ||||
| -rw-r--r-- | config/description.exs | 25 | ||||
| -rw-r--r-- | config/test.exs | 1 |
3 files changed, 38 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index b69044a2b..b93de52e1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -82,6 +82,10 @@ config :ex_aws, :s3, # region: "us-east-1", # may be required for Amazon AWS scheme: "https://" +config :pleroma, Pleroma.Uploaders.IPFS, + post_gateway_url: nil, + get_gateway_url: nil + config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], @@ -411,6 +415,13 @@ config :pleroma, :mrf_object_age, threshold: 604_800, actions: [:delist, :strip_followers] +config :pleroma, :mrf_nsfw_api, + url: "http://127.0.0.1:5000/", + threshold: 0.7, + mark_sensitive: true, + unlist: false, + reject: false + config :pleroma, :mrf_follow_bot, follower_nickname: nil config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}" @@ -579,7 +590,7 @@ config :pleroma, Oban, attachments_cleanup: 1, new_users_digest: 1, mute_expire: 5, - search_indexing: 10, + search_indexing: [limit: 10, paused: true], rich_media_expiration: 2 ], plugins: [Oban.Plugins.Pruner], diff --git a/config/description.exs b/config/description.exs index 58d52519b..a9c285421 100644 --- a/config/description.exs +++ b/config/description.exs @@ -138,6 +138,31 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: Pleroma.Uploaders.IPFS, + type: :group, + description: "IPFS uploader-related settings", + children: [ + %{ + key: :get_gateway_url, + type: :string, + description: "GET Gateway URL", + suggestions: [ + "https://ipfs.mydomain.com/{CID}", + "https://{CID}.ipfs.mydomain.com/" + ] + }, + %{ + key: :post_gateway_url, + type: :string, + description: "POST Gateway URL", + suggestions: [ + "http://localhost:5001/" + ] + } + ] + }, + %{ + group: :pleroma, key: Pleroma.Uploaders.S3, type: :group, description: "S3 uploader-related settings", diff --git a/config/test.exs b/config/test.exs index 9b4113dd5..3345bb3a9 100644 --- a/config/test.exs +++ b/config/test.exs @@ -153,6 +153,7 @@ config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock +config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock peer_module = if String.to_integer(System.otp_release()) >= 25 do |