Добавить рейтинг и типы материалов в каналах

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java

@@ -309,15 +309,42 @@ final class ChannelsReadSupport {
 
     static int[] loadStats(Connection c, String bch, int blockNumber, byte[] blockHash) throws SQLException {
         String sql = "SELECT likes_count,replies_count FROM message_stats WHERE to_bch_name=? AND to_block_number=? AND to_block_hash=? LIMIT 1";
+        int likesCount = 0;
+        int repliesCount = 0;
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, bch);
             ps.setInt(2, blockNumber);
             ps.setBytes(3, blockHash);
             try (ResultSet rs = ps.executeQuery()) {
-                if (!rs.next()) return new int[] {0, 0};
-                return new int[] {rs.getInt("likes_count"), rs.getInt("replies_count")};
+                if (rs.next()) {
+                    likesCount = rs.getInt("likes_count");
+                    repliesCount = rs.getInt("replies_count");
+                }
             }
         }
+        String ratingsSql = """
+            SELECT COUNT(*)
+            FROM blocks
+            WHERE msg_type = ?
+              AND msg_sub_type = ?
+              AND to_bch_name = ?
+              AND to_block_number = ?
+              AND to_block_hash = ?
+            """;
+        int ratingsCount = 0;
+        try (PreparedStatement ps = c.prepareStatement(ratingsSql)) {
+            ps.setInt(1, MSG_TYPE_TEXT);
+            ps.setInt(2, MsgSubType.TEXT_RATING);
+            ps.setString(3, bch);
+            ps.setInt(4, blockNumber);
+            ps.setBytes(5, blockHash);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    ratingsCount = rs.getInt(1);
+                }
+            }
+        }
+        return new int[] {likesCount, repliesCount, ratingsCount};
     }
 
     static String detectChannelDescription(Connection c, String ownerBch, int rootNumber) throws SQLException {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetChannelMessages_Handler.java

@@ -167,6 +167,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
                 int[] stats = ChannelsReadSupport.loadStats(c, ownerBch, post.blockNumber, post.blockHash);
                 item.setLikesCount(stats[0]);
                 item.setRepliesCount(stats[1]);
+                item.setRatingsCount(stats[2]);
                 item.setLikedByMe(ChannelsReadSupport.isLikedByLogin(c, viewerLogin, post.bchName, post.blockNumber, post.blockHash));
 
                 items.add(item);

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetMessageThread_Handler.java

@@ -17,6 +17,7 @@ import shine.db.DbController;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.Comparator;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
@@ -89,7 +90,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
 
     private List<Net_GetMessageThread_Response.MessageNodeTree> loadChildren(Connection c, PostRow parent, int depthDown, int childLimit, String viewerLogin) throws Exception {
         if (depthDown <= 0) return List.of();
-        List<PostRow> replies = findReplies(c, parent.bchName, parent.blockNumber, parent.blockHash, childLimit);
+        List<PostRow> replies = findRepliesAndRatings(c, parent.bchName, parent.blockNumber, parent.blockHash, childLimit);
         List<Net_GetMessageThread_Response.MessageNodeTree> out = new ArrayList<>();
         for (PostRow row : replies) {
             Net_GetMessageThread_Response.MessageNodeTree t = new Net_GetMessageThread_Response.MessageNodeTree();
@@ -100,24 +101,29 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
         return out;
     }
 
-    private List<PostRow> findReplies(Connection c, String toBchName, int toBlockNumber, byte[] toBlockHash, int limit) throws Exception {
+    private List<PostRow> findRepliesAndRatings(Connection c, String toBchName, int toBlockNumber, byte[] toBlockHash, int limit) throws Exception {
         String sql = """
             SELECT login,bch_name,block_number,block_hash,block_bytes,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
             FROM blocks
-            WHERE msg_type=1 AND msg_sub_type=?
+            WHERE msg_type=1 AND msg_sub_type IN (?, ?)
               AND to_bch_name=? AND to_block_number=? AND to_block_hash=?
-            ORDER BY block_number ASC
-            LIMIT ?
             """;
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setInt(1, MsgSubType.TEXT_REPLY);
-            ps.setString(2, toBchName);
-            ps.setInt(3, toBlockNumber);
-            ps.setBytes(4, toBlockHash);
-            ps.setInt(5, limit);
+            ps.setInt(2, MsgSubType.TEXT_RATING);
+            ps.setString(3, toBchName);
+            ps.setInt(4, toBlockNumber);
+            ps.setBytes(5, toBlockHash);
             try (ResultSet rs = ps.executeQuery()) {
                 List<PostRow> out = new ArrayList<>();
                 while (rs.next()) out.add(mapRow(rs));
+                out.sort(Comparator
+                        .comparingLong((PostRow row) -> ChannelsReadSupport.parseTextAndTime(row.blockBytes).createdAtMs)
+                        .thenComparing(row -> String.valueOf(row.bchName))
+                        .thenComparingInt(row -> row.blockNumber));
+                if (out.size() > limit) {
+                    return new ArrayList<>(out.subList(0, limit));
+                }
                 return out;
             }
         }
@@ -233,6 +239,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
         int[] stats = ChannelsReadSupport.loadStats(c, row.bchName, row.blockNumber, row.blockHash);
         node.setLikesCount(stats[0]);
         node.setRepliesCount(stats[1]);
+        node.setRatingsCount(stats[2]);
         node.setLikedByMe(ChannelsReadSupport.isLikedByLogin(c, viewerLogin, row.bchName, row.blockNumber, row.blockHash));
         if (row.lineCode != null && row.lineCode >= 0) {
             Net_GetMessageThread_Response.ChannelInfo ci = new Net_GetMessageThread_Response.ChannelInfo();

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetChannelMessages_Response.java

@@ -132,6 +132,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         private int likesCount;
         private boolean likedByMe;
         private int repliesCount;
+        private int ratingsCount;
         private int versionsTotal;
         private List<VersionItem> versions = new ArrayList<>();
 
@@ -173,6 +174,9 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         public int getRepliesCount() { return repliesCount; }
         public void setRepliesCount(int repliesCount) { this.repliesCount = repliesCount; }
 
+        public int getRatingsCount() { return ratingsCount; }
+        public void setRatingsCount(int ratingsCount) { this.ratingsCount = ratingsCount; }
+
         public int getVersionsTotal() { return versionsTotal; }
         public void setVersionsTotal(int versionsTotal) { this.versionsTotal = versionsTotal; }