From 94aeffd22712d6f251d3669db8e650c8f6d9cdab Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 30 Dec 2021 19:41:30 +0000
Subject: [PATCH] Fix hashtag parsing at the end of lines

---
 lib/linkify/parser.ex | 10 ++++++++--
 test/linkify_test.exs | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/linkify/parser.ex b/lib/linkify/parser.ex
index f6df7a3..8a6296e 100644
--- a/lib/linkify/parser.ex
+++ b/lib/linkify/parser.ex
@@ -94,13 +94,19 @@ defmodule Linkify.Parser do
        ) do
     {buffer, user_acc} = link(buffer, opts, user_acc)
 
-    case Regex.run(@match_skipped_tag, text, capture: [:tag]) do
+    buffer =
+      case buffer do
+        [_, _, _] -> Enum.join(buffer)
+        _ -> buffer
+      end
+
+    case Regex.run(@match_skipped_tag, buffer, capture: [:tag]) do
       [tag] ->
         text = String.trim_leading(text, tag)
         do_parse({text, user_acc}, opts, {"", accumulate(acc, buffer, "<#{tag}"), :skip})
 
       nil ->
-        do_parse({text, user_acc}, opts, {"<", acc, {:open, 1}})
+        do_parse({text, user_acc}, opts, {"<", accumulate(acc, buffer, ""), {:open, 1}})
     end
   end
 
diff --git a/test/linkify_test.exs b/test/linkify_test.exs
index 5f01fdb..126e0ea 100644
--- a/test/linkify_test.exs
+++ b/test/linkify_test.exs
@@ -179,6 +179,32 @@ defmodule LinkifyTest do
 
       assert MapSet.to_list(tags) == ["#hello", "#world"]
 
+      text = "#justOne"
+
+      {result_text, %{tags: _tags}} =
+        Linkify.link_map(text, %{tags: MapSet.new()},
+          hashtag: true,
+          hashtag_handler: handler,
+          hashtag_prefix: "https://example.com/user/",
+          rel: false
+        )
+
+      assert result_text ==
+               "<a href=\"https://example.com/user/justOne\">#justOne</a>"
+
+      text = "#justOne."
+
+      {result_text, %{tags: _tags}} =
+        Linkify.link_map(text, %{tags: MapSet.new()},
+          hashtag: true,
+          hashtag_handler: handler,
+          hashtag_prefix: "https://example.com/user/",
+          rel: false
+        )
+
+      assert result_text ==
+               "<a href=\"https://example.com/user/justOne\">#justOne</a>."
+
       text = "#cofe <br><a href=\"https://pleroma.social/\">Source</a>"
 
       {_result_text, %{tags: tags}} =