1 files changed, 21 insertions, 12 deletions

diff --git a/src/main/java/com/juick/http/www/NewMessage.java b/src/main/java/com/juick/http/www/NewMessage.java
index d3178c59..c8eb6ede 100644
--- a/src/main/java/com/juick/http/www/NewMessage.java
+++ b/src/main/java/com/juick/http/www/NewMessage.java
@@ -17,13 +17,10 @@
  */
 package com.juick.http.www;
 
+import com.alibaba.fastjson.JSONArray;
 import com.juick.JuickApplication;
 import com.juick.Tag;
-import com.juick.server.CrosspostQueries;
-import com.juick.server.MessagesQueries;
-import com.juick.server.SubscriptionsQueries;
-import com.juick.server.TagQueries;
-import com.juick.server.UserQueries;
+import com.juick.server.*;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
 import com.juick.xmpp.Stream;
@@ -161,13 +158,25 @@ public class NewMessage {
         List<com.juick.Tag> tags = new ArrayList<>();
         String tagsArr[] = new String[1];
         if (tagsStr != null && !tagsStr.isEmpty()) {
-            tagsArr = tagsStr.split("[ \\,]");
-            for (int i = 0; i < tagsArr.length; i++) {
-                if (tagsArr[i].startsWith("*")) {
-                    tagsArr[i] = tagsArr[i].substring(1);
+            if (tagsStr.startsWith("[")) {
+                // new json tags format with auto-completion
+                JSONArray parse = (JSONArray)JSONArray.parse(tagsStr);
+                ArrayList<String> tagsList = new ArrayList<>();
+                for(int i=0; i<parse.size(); i++) {
+                    if (parse.get(i) instanceof String) {
+                        tagsList.add(parse.getString(i));
+                    }
                 }
-                if (tagsArr[i].length() > 64) {
-                    tagsArr[i] = tagsArr[i].substring(0, 64);
+                tagsArr = tagsList.toArray(new String[tagsList.size()]);
+            } else {
+                tagsArr = tagsStr.split("[ \\,]");
+                for (int i = 0; i < tagsArr.length; i++) {
+                    if (tagsArr[i].startsWith("*")) {
+                        tagsArr[i] = tagsArr[i].substring(1);
+                    }
+                    if (tagsArr[i].length() > 64) {
+                        tagsArr[i] = tagsArr[i].substring(0, 64);
+                    }
                 }
             }
             tags = TagQueries.getTags(sql, tagsArr, true);
@@ -289,7 +298,7 @@ public class NewMessage {
                 out.println("<p><a href=\"https://www.facebook.com/sharer/sharer.php?u=" + url + "\" onclick=\"return openSocialWindow(this)\" class=\"ico32-fb sharenew\">Отправить в Facebook</a></p>");
             }
             out.println("<p><a href=\"https://plus.google.com/share?url=" + url + "\" onclick=\"return openSocialWindow(this)\" class=\"ico32-gp sharenew\">Отправить в Google+</a></p>");
-            out.println("<p>Ссылка на сообщение: <a href=\"http://juick.com/" + mid + "\">http://juick.com/" + mid + "</a></p>");
+            out.println("<p>Ссылка на сообщение: <a href=\"http://"+ Endpoints.wwwJuickCom+"/" + mid + "\">http://"+Endpoints.wwwJuickCom+"/" + mid + "</a></p>");
             out.println("</section>");
 
             PageTemplates.pageFooter(request, out, visitor, false);