pleroma

commit: b21e59da5f69505d276ddfa6b00c67a838dcc149
parent: 49e80a15377fe460d7ac644601609700fffea632
Author: feld <feld@feld.me>
Date:   Wed,  5 Feb 2020 20:32:45 +0000

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

Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
Diffstat:
M
config/config.exs
1
-
M
config/description.exs
5
-----
M
lib/pleroma/formatter.ex
3
++-

3 files changed, 2 insertions(+), 7 deletions(-)
diff --git 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
@@ -2181,11 +2181,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
@@ -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