commit: 343d9ae88849adf7ffe99133604d5d21214ff1d9 parent c8e910442ba546e43a09e23a489ea662b2b26281 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Fri, 1 Mar 2019 23:26:36 +0100 mix.deps: Change Linkify to my branchDiffstat:
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex @@ -16,7 +16,9 @@ defmodule Pleroma.Formatter do 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, + phone: false, + extra_prefixes: Pleroma.Config.get([:uri_schemes, :valid_schemes]) ] end diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex @@ -20,7 +20,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do validate_tld = Config.get([Pleroma.Formatter, :validate_tld]) page_url - |> Linkify.Parser.url?(validate_tld: validate_tld) + |> Linkify.Parser.url?(scheme: true, validate_tld: validate_tld) |> parse_uri(page_url) end diff --git a/mix.exs b/mix.exs @@ -157,7 +157,7 @@ defmodule Pleroma.Mixfile do {:floki, "~> 0.27"}, {:timex, "~> 3.6"}, {:ueberauth, "~> 0.4"}, - {:linkify, "~> 0.5.1"}, + {:linkify, git: "https://hacktivis.me/git/auto_linker.git", branch: "lanodan/master"}, {:http_signatures, "~> 0.1.0"}, {:telemetry, "~> 0.3"}, {:poolboy, "~> 1.5"}, diff --git a/mix.lock b/mix.lock @@ -67,7 +67,7 @@ "jose": {:hex, :jose, "1.11.1", "59da64010c69aad6cde2f5b9248b896b84472e99bd18f246085b7b9fe435dcdb", [:mix, :rebar3], [], "hexpm", "078f6c9fb3cd2f4cfafc972c814261a7d1e8d2b3685c0a76eb87e158efff1ac5"}, "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"}, "libring": {:hex, :libring, "1.4.0", "41246ba2f3fbc76b3971f6bce83119dfec1eee17e977a48d8a9cfaaf58c2a8d6", [:mix], [], "hexpm"}, - "linkify": {:hex, :linkify, "0.5.1", "6dc415cbc948b2f6ecec7cb226aab7ba9d3a1815bb501ae33e042334d707ecee", [:mix], [], "hexpm", "a3128c7e22fada4aa7214009501d8131e1fa3faf2f0a68b33dba379dc84ff944"}, + "linkify": {:git, "https://hacktivis.me/git/auto_linker.git", "31c7d7ae9e11250b3f7944acee61b19168dac70c", [branch: "lanodan/master"]}, "majic": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", "289cda1b6d0d70ccb2ba508a2b0bd24638db2880", [ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"]}, "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"}, diff --git a/test/pleroma/web/common_api/utils_test.exs b/test/pleroma/web/common_api/utils_test.exs @@ -155,7 +155,8 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do {:ok, user} = UserBuilder.insert(%{nickname: "user__test", ap_id: "http://foo.com/user__test"}) - text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*" + text = + "**hello world**\n\n*another @user__test and @user__test http://google.com paragraph*" {output, _, _} = Utils.format_input(text, "text/markdown") @@ -164,7 +165,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do user.id }" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> and <span class="h-card"><a class="u-url mention" data-user="#{ user.id - }" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>) + }" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com">http://google.com</a> paragraph</em></p>) end end diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs @@ -347,7 +347,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do test "update fields", %{conn: conn} do fields = [ %{"name" => "<a href=\"http://google.com\">foo</a>", "value" => "<script>bar</script>"}, - %{"name" => "link.io", "value" => "cofe.io"} + %{"name" => "link.io", "value" => "http://cofe.io"} ] account_data = @@ -359,7 +359,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do %{"name" => "<a href=\"http://google.com\">foo</a>", "value" => "bar"}, %{ "name" => "link.io", - "value" => ~S(<a href="http://cofe.io" rel="ugc">cofe.io</a>) + "value" => ~S(<a href="http://cofe.io" rel="ugc">http://cofe.io</a>) } ] @@ -368,7 +368,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do "name" => "<a href=\"http://google.com\">foo</a>", "value" => "<script>bar</script>" }, - %{"name" => "link.io", "value" => "cofe.io"} + %{"name" => "link.io", "value" => "http://cofe.io"} ] end @@ -467,7 +467,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do fields = [ %{"name" => "foo", "value" => "bar"}, - %{"name" => "link", "value" => "cofe.io"} + %{"name" => "link", "value" => "http://cofe.io"} ] assert %{"error" => "Invalid request"} ==