From fdef6b03b20654d4c90349916a9a15c6569c677a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 1 Mar 2019 16:41:08 +0300
Subject: Tags: do not read from ugnich index

---
 src/main/java/com/juick/service/MessagesServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/juick/service/MessagesServiceImpl.java b/src/main/java/com/juick/service/MessagesServiceImpl.java
index 01e96d6e..58108cdd 100644
--- a/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -365,13 +365,15 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                         + "messages.ts,"
                         + "messages.readonly, messages.privacy, messages.replies,"
                         + "messages.attach, COUNT(DISTINCT favorites.user_id) as likes, messages.hidden,"
-                        + "txt.tags, txt.repliesby, txt.txt, '' as q, messages.updated as updated, 0 as to_uid, "
+                        + "GROUP_CONCAT(tags.name SEPARATOR ' '), txt.repliesby, txt.txt, '' as q, messages.updated as updated, 0 as to_uid, "
                         + "NULL as to_name, txt.updated_at, '' as user_uri, '' as to_uri, '' as reply_uri, 0 as html FROM messages "
                         + "INNER JOIN users ON messages.user_id = users.id "
                         + "INNER JOIN messages_txt AS txt "
                         + "ON messages.message_id = txt.message_id "
                         + "LEFT JOIN favorites "
                         + "ON messages.message_id = favorites.message_id AND favorites.like_id=1 "
+                        + "LEFT JOIN messages_tags ON messages_tags.message_id=txt.message_id "
+                        + "LEFT JOIN tags ON tags.tag_id=messages_tags.tag_id "
                         + "WHERE messages.message_id = ? "
                         + "GROUP BY mid, rid, replyto, uid, nick, banned, messages.ts, readonly, "
                         + "privacy, replies, attach, tags, repliesby, q, updated_at, user_uri, to_uri, reply_uri, html",
@@ -873,7 +875,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                             + "messages.ts,"
                             + "messages.readonly,messages.privacy, messages.replies-COUNT(DISTINCT banned.reply_id) as replies,"
                             + "messages.attach,COUNT(DISTINCT favorites.user_id) AS likes,messages.hidden,"
-                            + "messages_txt.tags,messages_txt.repliesby, messages_txt.txt, '' as q, "
+                            + "GROUP_CONCAT(tags.name SEPARATOR ' '), messages_txt.repliesby, messages_txt.txt, '' as q, "
                             + "messages.updated, 0 as to_uid, NULL as to_name, messages_txt.updated_at, '' as m_user_uri, "
                             + "'' as to_uri, '' as msg_reply_uri, 0 as html "
                             + "FROM (messages INNER JOIN messages_txt "
@@ -883,6 +885,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                             + "ON messages.message_id = favorites.message_id AND favorites.like_id=1 "
                             + "LEFT JOIN banned "
                             + "ON messages.message_id = banned.message_id "
+                            + "LEFT JOIN messages_tags ON messages_tags.message_id=messages_txt.message_id "
+                            + "LEFT JOIN tags ON tags.tag_id=messages_tags.tag_id "
                             + "WHERE messages.message_id IN (:ids) GROUP BY "
                             + "messages.message_id, rid, replyto, messages.user_id, users.nick, usr_banned, messages.ts, "
                             + "messages.readonly, messages.privacy, messages.attach, messages.hidden, messages_txt.tags, "
-- 
cgit v1.2.3