Merge branch 'remove-linker-scheme-option' into 'develop'

Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176

diff --git a/config/config.exs b/config/config.exs
index 60c9825570281f9b0efe116db11dc6074fccd5ce..34716cf37fd32268cb83055b4714be0ce5a1f732 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -509,7 +509,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 1ffb66287484209c41a9e09a5a83318c9673fa38..a4d1a74a7abaaae9fb6b7fae921c3210788eb45c 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -2180,11 +2180,6 @@ config :pleroma, :config_description, [
         type: :boolean,
         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],

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 19b9af46cc3bb48613c3e5e52b1d9f32f591c041..90895374daa9509ab52766671b0814bb851c9b08 100644 (file)
--- 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