X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fformatter_test.exs;h=cf8441cf68906e7919ab4f8d5eea8adb6d05f6f2;hb=365c34a7a96a9cbd5acb30eb6eedf195eeaff131;hp=3bff51527592882801175372cbcab1f91b68d137;hpb=26f66fb70ab1bd777a92daf4347aaa63b044d0af;p=akkoma

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 3bff51527..cf8441cf6 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.FormatterTest do
@@ -119,16 +119,29 @@ defmodule Pleroma.FormatterTest do
     end
   end
 
-  describe "add_user_links" do
+  describe "Formatter.linkify" do
+    test "correctly finds mentions that contain the domain name" do
+      _user = insert(:user, %{nickname: "lain"})
+      _remote_user = insert(:user, %{nickname: "lain@lain.com", local: false})
+
+      text = "hey @lain@lain.com what's up"
+
+      {_text, mentions, []} = Formatter.linkify(text)
+      [{username, user}] = mentions
+
+      assert username == "@lain@lain.com"
+      assert user.nickname == "lain@lain.com"
+    end
+
     test "gives a replacement for user links, using local nicknames in user links text" do
       text = "@gsimg According to @archa_eme_, that is @daggsy. Also hello @archaeme@archae.me"
       gsimg = insert(:user, %{nickname: "gsimg"})
 
       archaeme =
-        insert(:user, %{
+        insert(:user,
           nickname: "archa_eme_",
-          info: %User.Info{source_data: %{"url" => "https://archeme/@archa_eme_"}}
-        })
+          source_data: %{"url" => "https://archeme/@archa_eme_"}
+        )
 
       archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})