alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
This commit is contained in:
feld 2020-02-05 20:32:45 +00:00
parent 49e80a1537 3909b5b7b3
commit b21e59da5f
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.exs
View File

@ -509,7 +509,6 @@
config :auto_linker, config :auto_linker,
opts: [ opts: [
scheme: true,
extra: true, extra: true,
# TODO: Set to :no_scheme when it works properly # TODO: Set to :no_scheme when it works properly
validate_tld: true, validate_tld: true,

5
config/description.exs
View File

@ -2180,11 +2180,6 @@
type: :boolean, type: :boolean,
description: "Set to `false` to remove target='_blank' attribute" 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, key: :truncate,
type: [:integer, false], type: [:integer, false],

3
lib/pleroma/formatter.ex
View File

@ -13,7 +13,8 @@ defmodule Pleroma.Formatter do
@auto_linker_config hashtag: true, @auto_linker_config hashtag: true,
hashtag_handler: &Pleroma.Formatter.hashtag_handler/4, hashtag_handler: &Pleroma.Formatter.hashtag_handler/4,
mention: true, 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 def escape_mention_handler("@" <> nickname = mention, buffer, _, _) do
case User.get_cached_by_nickname(nickname) do case User.get_cached_by_nickname(nickname) do