From e8b0adab2aecc233a090f98c569931871f977ba4 Mon Sep 17 00:00:00 2001
From: makc
Date: Thu, 29 Jul 2021 12:01:52 +0200
Subject: better hashtags

https://juick.com/rm/2997070#7
---
 src/main/java/com/juick/service/TagServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com/juick')

diff --git a/src/main/java/com/juick/service/TagServiceImpl.java b/src/main/java/com/juick/service/TagServiceImpl.java
index 93edcccc..0bd6bb0c 100644
--- a/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/src/main/java/com/juick/service/TagServiceImpl.java
@@ -221,7 +221,7 @@ public class TagServiceImpl extends BaseJdbcService implements TagService {
     public Pair<String, List<Tag>> fromString(final String txt) {
         String firstLine = txt.split("\\n", 2)[0];
         Supplier<Stream<String>> tagsStream = () -> Arrays.stream(firstLine.split("\\ "))
-                .takeWhile(t -> !t.equals("*") && t.startsWith("*"));
+                .takeWhile(t -> t.matches("\\*[^\\s]+|#[^\\s]*[^\\d][^\\s]*"));
         int tagsLength = tagsStream.get().collect(Collectors.joining(" ")).length();
         String body = txt.substring(tagsLength);
         List<Tag> tags = tagsStream.get().map(t -> getTag(t.substring(1), true))
-- 
cgit v1.2.3