diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-05 21:13:56 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-05 21:13:56 +0400 |
| commit | 3909b5b7b34bbf879fd7809eef6ec0ae286c2ef2 (patch) | |
| tree | 8ad9ab479b4429280848d6b66a0dcc0072ae2e04 | |
| parent | c27d1d65bfd60effdb45359697141c136e156177 (diff) | |
| download | pleroma-3909b5b7b34bbf879fd7809eef6ec0ae286c2ef2.tar.gz | |
Remove AutoLinker `scheme` option from the config
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 5 | ||||
| -rw-r--r-- | lib/pleroma/formatter.ex | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index c57ef1bf7..d01dd8d74 100644 --- a/config/config.exs +++ b/config/config.exs @@ -508,7 +508,6 @@ config :pleroma, :fetch_initial_posts, config :auto_linker, opts: [ - scheme: true, extra: true, # TODO: Set to :no_scheme when it works properly validate_tld: true, diff --git a/config/description.exs b/config/description.exs index 5f3c58b08..a0cb03e48 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2172,11 +2172,6 @@ config :pleroma, :config_description, [ description: "Set to `false` to remove target='_blank' attribute" }, %{ - key: :scheme, - type: :boolean, - description: "Set to `true` to link urls with schema http://google.com" - }, - %{ key: :truncate, type: [:integer, false], description: diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 19b9af46c..90895374d 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -13,7 +13,8 @@ defmodule Pleroma.Formatter do @auto_linker_config hashtag: true, hashtag_handler: &Pleroma.Formatter.hashtag_handler/4, mention: true, - mention_handler: &Pleroma.Formatter.mention_handler/4 + mention_handler: &Pleroma.Formatter.mention_handler/4, + scheme: true def escape_mention_handler("@" <> nickname = mention, buffer, _, _) do case User.get_cached_by_nickname(nickname) do |