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:
commit
b21e59da5f
3 changed files with 2 additions and 7 deletions
|
@ -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,
|
||||
|
|
|
@ -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],
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue