From ed39bd8d68515aef638cc885817a3e83343edaae Mon Sep 17 00:00:00 2001
From: xiaoACE <94223505+xiaoACE6716@users.noreply.github.com>
Date: Mon, 15 Apr 2024 23:01:33 +0800
Subject: [PATCH] Add Message related contents to VoiceChannel (#71)

* Add Message related contents to VoiceChannel

* Bring getTextChannelMessage back
---
 pom.xml                                       |   9 +-
 .../java/snw/kookbc/impl/HttpAPIImpl.java     |  31 +++++
 src/main/java/snw/kookbc/impl/UnsafeImpl.java |   8 ++
 .../impl/entity/builder/EntityBuilder.java    |   4 +-
 .../impl/entity/builder/MessageBuilder.java   |  20 +--
 .../channel/NonCategoryChannelImpl.java       |  68 +++++++++-
 .../impl/entity/channel/TextChannelImpl.java  |  64 +--------
 .../impl/entity/channel/VoiceChannelImpl.java |   6 +-
 .../internal/UserClickButtonListener.java     |   2 +-
 .../impl/message/ChannelMessageImpl.java      | 124 ++++++++++++++++++
 .../impl/message/TextChannelMessageImpl.java  | 104 +--------------
 .../impl/message/VoiceChannelMessageImpl.java |  23 ++++
 .../snw/kookbc/impl/network/ListenerImpl.java |   3 +-
 ...ChannelMessageDeleteEventDeserializer.java |   2 +-
 .../ChannelMessageEventDeserializer.java      |  10 +-
 .../UserClickButtonEventDeserializer.java     |   3 +-
 .../kookbc/impl/storage/EntityStorage.java    |   1 +
 17 files changed, 294 insertions(+), 188 deletions(-)
 create mode 100644 src/main/java/snw/kookbc/impl/message/ChannelMessageImpl.java
 create mode 100644 src/main/java/snw/kookbc/impl/message/VoiceChannelMessageImpl.java

diff --git a/pom.xml b/pom.xml
index 81b84109..5214729a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,10 +189,15 @@
     </repositories>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.github.SNWCreations</groupId>-->
+<!--            <artifactId>JKook</artifactId>-->
+<!--            <version>${jkook.version}</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.github.SNWCreations</groupId>
+            <groupId>com.github.xiaoACE6716</groupId>
             <artifactId>JKook</artifactId>
-            <version>${jkook.version}</version>
+            <version>95ce364469</version>
         </dependency>
 
         <!--
diff --git a/src/main/java/snw/kookbc/impl/HttpAPIImpl.java b/src/main/java/snw/kookbc/impl/HttpAPIImpl.java
index b36d3722..c1145ea4 100644
--- a/src/main/java/snw/kookbc/impl/HttpAPIImpl.java
+++ b/src/main/java/snw/kookbc/impl/HttpAPIImpl.java
@@ -31,12 +31,15 @@
 import snw.jkook.entity.User;
 import snw.jkook.entity.channel.Category;
 import snw.jkook.entity.channel.Channel;
+import snw.jkook.entity.channel.NonCategoryChannel;
 import snw.jkook.entity.channel.TextChannel;
+import snw.jkook.message.ChannelMessage;
 import snw.jkook.message.PrivateMessage;
 import snw.jkook.message.TextChannelMessage;
 import snw.jkook.message.component.BaseComponent;
 import snw.jkook.util.PageIterator;
 import snw.jkook.util.Validate;
+import snw.kookbc.impl.message.ChannelMessageImpl;
 import snw.kookbc.impl.message.PrivateMessageImpl;
 import snw.kookbc.impl.message.TextChannelMessageImpl;
 import snw.kookbc.impl.network.HttpAPIRoute;
@@ -251,6 +254,34 @@ public TextChannelMessage getTextChannelMessage(String id) throws NoSuchElementE
         return new TextChannelMessageImpl(client, id, sender, component, timeStamp, quote, channel);
     }
 
+    @Override
+    public ChannelMessage getChannelMessage(String id) throws NoSuchElementException {
+        final JsonObject object;
+        try {
+            object = client.getNetworkClient()
+                    .get(HttpAPIRoute.CHANNEL_MESSAGE_INFO.toFullURL() + "?msg_id=" + id);
+        } catch (BadResponseException e) {
+            if (e.getCode() == 40000) {
+                throw (NoSuchElementException) // force casting is required because Throwable#initCause return Throwable
+                        new NoSuchElementException("No message object with provided ID " + id + " found")
+                                .initCause(e);
+            }
+            throw e;
+        }
+        JsonObject rawSender = get(object, "author").getAsJsonObject();
+        User sender = client.getStorage().getUser(get(rawSender, "id").getAsString(), rawSender);
+        final BaseComponent component = client.getMessageBuilder().buildComponent(object);
+        long timeStamp = get(object, "create_at").getAsLong();
+        ChannelMessage quote = null;
+        if (has(object, "quote")) {
+            final JsonObject rawQuote = get(object, "quote").getAsJsonObject();
+            final String quoteId = get(rawQuote, "id").getAsString();
+            quote = getChannelMessage(quoteId);
+        }
+        final NonCategoryChannel channel = (NonCategoryChannel) getChannel(get(object, "channel_id").getAsString());
+        return new ChannelMessageImpl(client, id, sender, component, timeStamp, quote, channel);
+    }
+
     @Override
     public PrivateMessage getPrivateMessage(User user, String id) throws NoSuchElementException {
         final String chatCode = get(client.getNetworkClient()
diff --git a/src/main/java/snw/kookbc/impl/UnsafeImpl.java b/src/main/java/snw/kookbc/impl/UnsafeImpl.java
index cae97c44..6c03b050 100644
--- a/src/main/java/snw/kookbc/impl/UnsafeImpl.java
+++ b/src/main/java/snw/kookbc/impl/UnsafeImpl.java
@@ -21,10 +21,12 @@
 import snw.jkook.Unsafe;
 import snw.jkook.entity.CustomEmoji;
 import snw.jkook.entity.Game;
+import snw.jkook.message.ChannelMessage;
 import snw.jkook.message.PrivateMessage;
 import snw.jkook.message.TextChannelMessage;
 import snw.kookbc.impl.entity.CustomEmojiImpl;
 import snw.kookbc.impl.entity.GameImpl;
+import snw.kookbc.impl.message.ChannelMessageImpl;
 import snw.kookbc.impl.message.PrivateMessageImpl;
 import snw.kookbc.impl.message.TextChannelMessageImpl;
 
@@ -38,11 +40,17 @@ public UnsafeImpl(KBCClient client) {
         this.client = client;
     }
 
+
     @Override
     public TextChannelMessage getTextChannelMessage(String id) {
         return new TextChannelMessageImpl(client, id, null, null, -1, null, null);
     }
 
+    @Override
+    public ChannelMessage getChannelMessage(String id) {
+        return new ChannelMessageImpl(client, id, null, null, -1, null, null);
+    }
+
     @Override
     public PrivateMessage getPrivateMessage(String id) {
         return new PrivateMessageImpl(client, id, null, null, -1, null);
diff --git a/src/main/java/snw/kookbc/impl/entity/builder/EntityBuilder.java b/src/main/java/snw/kookbc/impl/entity/builder/EntityBuilder.java
index 5a560cff..69a440c5 100644
--- a/src/main/java/snw/kookbc/impl/entity/builder/EntityBuilder.java
+++ b/src/main/java/snw/kookbc/impl/entity/builder/EntityBuilder.java
@@ -143,6 +143,7 @@ public Channel buildChannel(JsonObject object) {
                         topic
                 );
             } else if (type == 2) { // VoiceChannel
+                int chatLimitTime = get(object, "slow_mode").getAsInt();
                 boolean hasPassword = object.has("has_password") && get(object, "has_password").getAsBoolean();
                 int size = get(object, "limit_amount").getAsInt();
                 int quality = get(object, "voice_quality").getAsInt();
@@ -159,7 +160,8 @@ public Channel buildChannel(JsonObject object) {
                         level,
                         hasPassword,
                         size,
-                        quality
+                        quality,
+                        chatLimitTime
                 );
             }
         }
diff --git a/src/main/java/snw/kookbc/impl/entity/builder/MessageBuilder.java b/src/main/java/snw/kookbc/impl/entity/builder/MessageBuilder.java
index bce5aba5..1d0babaa 100644
--- a/src/main/java/snw/kookbc/impl/entity/builder/MessageBuilder.java
+++ b/src/main/java/snw/kookbc/impl/entity/builder/MessageBuilder.java
@@ -21,7 +21,10 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import snw.jkook.entity.User;
+import snw.jkook.entity.channel.Channel;
+import snw.jkook.entity.channel.NonCategoryChannel;
 import snw.jkook.entity.channel.TextChannel;
+import snw.jkook.message.ChannelMessage;
 import snw.jkook.message.Message;
 import snw.jkook.message.PrivateMessage;
 import snw.jkook.message.TextChannelMessage;
@@ -35,6 +38,7 @@
 import snw.jkook.message.component.card.Theme;
 import snw.jkook.message.component.card.module.FileModule;
 import snw.kookbc.impl.KBCClient;
+import snw.kookbc.impl.message.ChannelMessageImpl;
 import snw.kookbc.impl.message.PrivateMessageImpl;
 import snw.kookbc.impl.message.QuoteImpl;
 import snw.kookbc.impl.message.TextChannelMessageImpl;
@@ -115,12 +119,12 @@ public PrivateMessage buildPrivateMessage(JsonObject object) {
         return new PrivateMessageImpl(client, id, author, buildComponent(object), timeStamp, quoteObject);
     }
 
-    public TextChannelMessage buildTextChannelMessage(JsonObject object) {
+    public ChannelMessage buildChannelMessage(JsonObject object) {
         String id = get(object, "msg_id").getAsString();
         final JsonObject extra = get(object, "extra").getAsJsonObject();
         JsonObject authorObj = get(extra, "author").getAsJsonObject();
         User author = client.getStorage().getUser(get(authorObj, "id").getAsString(), authorObj);
-        TextChannel channel = (TextChannel) client.getStorage().getChannel(get(object, "target_id").getAsString());
+        Channel channel = client.getStorage().getChannel(get(object, "target_id").getAsString());
         long timeStamp = get(object, "msg_timestamp").getAsLong();
         final JsonObject quote;
         JsonObject quote1;
@@ -131,22 +135,22 @@ public TextChannelMessage buildTextChannelMessage(JsonObject object) {
         }
         quote = quote1;
         if (quote == null) {
-            return new TextChannelMessageImpl(client, id, author, buildComponent(object), timeStamp, null, channel);
+            return new ChannelMessageImpl(client, id, author, buildComponent(object), timeStamp, null, (NonCategoryChannel) channel);
         }
         final String quoteId = get(quote, "rong_id").getAsString();
         Message quoteObject;
-        Message quoteFromCache = client.getStorage().getMessage(quoteId);
-        if (quoteFromCache != null) {
-            quoteObject = quoteFromCache; // prevent resource leak
+        Message quoteFormCache = client.getStorage().getMessage(quoteId);
+        if (quoteFormCache != null) {
+            quoteObject = quoteFormCache;
         } else {
             try {
-                quoteObject = client.getCore().getHttpAPI().getTextChannelMessage(quoteId);
+                quoteObject = client.getCore().getHttpAPI().getChannelMessage(quoteId);
             } catch (NoSuchElementException e) {
                 quoteObject = buildQuote(quote);
             }
         }
 
-        return new TextChannelMessageImpl(client, id, author, buildComponent(object), timeStamp, quoteObject, channel);
+        return new ChannelMessageImpl(client, id, author, buildComponent(object), timeStamp, quoteObject, (NonCategoryChannel) channel);
     }
 
     public Message buildQuote(JsonObject object) {
diff --git a/src/main/java/snw/kookbc/impl/entity/channel/NonCategoryChannelImpl.java b/src/main/java/snw/kookbc/impl/entity/channel/NonCategoryChannelImpl.java
index 4e024f04..595ecd1d 100644
--- a/src/main/java/snw/kookbc/impl/entity/channel/NonCategoryChannelImpl.java
+++ b/src/main/java/snw/kookbc/impl/entity/channel/NonCategoryChannelImpl.java
@@ -25,9 +25,15 @@
 import snw.jkook.entity.User;
 import snw.jkook.entity.channel.Category;
 import snw.jkook.entity.channel.NonCategoryChannel;
+import snw.jkook.message.ChannelMessage;
+import snw.jkook.message.Message;
+import snw.jkook.message.component.BaseComponent;
+import snw.jkook.message.component.MarkdownComponent;
 import snw.jkook.util.PageIterator;
 import snw.kookbc.impl.KBCClient;
+import snw.kookbc.impl.entity.builder.MessageBuilder;
 import snw.kookbc.impl.network.HttpAPIRoute;
+import snw.kookbc.impl.network.exceptions.BadResponseException;
 import snw.kookbc.impl.pageiter.ChannelInvitationIterator;
 import snw.kookbc.util.MapBuilder;
 
@@ -39,9 +45,11 @@
 
 public abstract class NonCategoryChannelImpl extends ChannelImpl implements NonCategoryChannel {
     private Category parent;
+    private int chatLimitTime;
 
-    protected NonCategoryChannelImpl(KBCClient client, String id, User master, Guild guild, boolean permSync, Category parent, String name, Collection<RolePermissionOverwrite> rpo, Collection<UserPermissionOverwrite> upo, int level) {
+    protected NonCategoryChannelImpl(KBCClient client, String id, User master, Guild guild, boolean permSync, Category parent, String name, Collection<RolePermissionOverwrite> rpo, Collection<UserPermissionOverwrite> upo, int level, int chatLimitTime) {
         super(client, id, master, guild, permSync, name, rpo, upo, level);
+        this.chatLimitTime = chatLimitTime;
         this.parent = parent;
     }
 
@@ -81,6 +89,64 @@ public PageIterator<Set<Invitation>> getInvitations() {
         return new ChannelInvitationIterator(client, this);
     }
 
+
+    @Override
+    public String sendComponent(String message) {
+        return sendComponent(new MarkdownComponent(message));
+    }
+
+    @Override
+    public String sendComponent(String message, @Nullable ChannelMessage quote, @Nullable User tempTarget) {
+        return sendComponent(new MarkdownComponent(message), quote, tempTarget);
+    }
+
+    @Override
+    public String sendComponent(BaseComponent baseComponent) {
+        return sendComponent(baseComponent, null, null);
+    }
+
+    @Override
+    public String sendComponent(BaseComponent component, @Nullable ChannelMessage quote, @Nullable User tempTarget) {
+        Object[] result = MessageBuilder.serialize(component);
+        Map<String, Object> body = new MapBuilder()
+                .put("target_id", getId())
+                .put("type", result[0])
+                .put("content", result[1])
+                .putIfNotNull("quote", quote, Message::getId)
+                .putIfNotNull("temp_target_id", tempTarget, User::getId)
+                .build();
+        try {
+            return client.getNetworkClient().post(HttpAPIRoute.CHANNEL_MESSAGE_SEND.toFullURL(), body).get("msg_id").getAsString();
+        } catch (BadResponseException e) {
+            if ("资源不存在".equals(e.getRawMessage())) {
+                // 2023/1/17: special case for the resources that aren't created by Bots.
+                // Thanks: Edint386@Github
+                throw new IllegalArgumentException("Unable to send component. Is the resource created by Bot?", e);
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    @Override
+    public int getChatLimitTime() {
+        return chatLimitTime;
+    }
+
+    @Override
+    public void setChatLimitTime(int chatLimitTime) {
+        Map<String, Object> body = new MapBuilder()
+                .put("channel_id", getId())
+                .put("slow_mode", chatLimitTime)
+                .build();
+        client.getNetworkClient().post(HttpAPIRoute.CHANNEL_UPDATE.toFullURL(), body);
+        setChatLimitTime0(chatLimitTime);
+    }
+
+    public void setChatLimitTime0(int chatLimitTime) {
+        this.chatLimitTime = chatLimitTime;
+    }
+
     @Override
     public synchronized void update(JsonObject data) {
         super.update(data);
diff --git a/src/main/java/snw/kookbc/impl/entity/channel/TextChannelImpl.java b/src/main/java/snw/kookbc/impl/entity/channel/TextChannelImpl.java
index 6fd01171..959f1e72 100644
--- a/src/main/java/snw/kookbc/impl/entity/channel/TextChannelImpl.java
+++ b/src/main/java/snw/kookbc/impl/entity/channel/TextChannelImpl.java
@@ -24,16 +24,11 @@
 import snw.jkook.entity.User;
 import snw.jkook.entity.channel.Category;
 import snw.jkook.entity.channel.TextChannel;
-import snw.jkook.message.Message;
 import snw.jkook.message.TextChannelMessage;
-import snw.jkook.message.component.BaseComponent;
-import snw.jkook.message.component.MarkdownComponent;
 import snw.jkook.util.PageIterator;
 import snw.jkook.util.Validate;
 import snw.kookbc.impl.KBCClient;
-import snw.kookbc.impl.entity.builder.MessageBuilder;
 import snw.kookbc.impl.network.HttpAPIRoute;
-import snw.kookbc.impl.network.exceptions.BadResponseException;
 import snw.kookbc.impl.pageiter.TextChannelMessageIterator;
 import snw.kookbc.util.MapBuilder;
 
@@ -48,7 +43,7 @@ public class TextChannelImpl extends NonCategoryChannelImpl implements TextChann
     private String topic;
 
     public TextChannelImpl(KBCClient client, String id, User master, Guild guild, boolean permSync, Category parent, String name, Collection<RolePermissionOverwrite> rpo, Collection<UserPermissionOverwrite> upo, int level, int chatLimitTime, String topic) {
-        super(client, id, master, guild, permSync, parent, name, rpo, upo, level);
+        super(client, id, master, guild, permSync, parent, name, rpo, upo, level, chatLimitTime);
         this.chatLimitTime = chatLimitTime;
         this.topic = topic;
     }
@@ -78,63 +73,6 @@ public PageIterator<Collection<TextChannelMessage>> getMessages(@Nullable String
         return new TextChannelMessageIterator(client, this, refer, isPin, queryMode);
     }
 
-    @Override
-    public String sendComponent(String message) {
-        return sendComponent(new MarkdownComponent(message));
-    }
-
-    @Override
-    public String sendComponent(String message, @Nullable TextChannelMessage quote, @Nullable User tempTarget) {
-        return sendComponent(new MarkdownComponent(message), quote, tempTarget);
-    }
-
-    @Override
-    public String sendComponent(BaseComponent baseComponent) {
-        return sendComponent(baseComponent, null, null);
-    }
-
-    @Override
-    public String sendComponent(BaseComponent component, @Nullable TextChannelMessage quote, @Nullable User tempTarget) {
-        Object[] result = MessageBuilder.serialize(component);
-        Map<String, Object> body = new MapBuilder()
-                .put("target_id", getId())
-                .put("type", result[0])
-                .put("content", result[1])
-                .putIfNotNull("quote", quote, Message::getId)
-                .putIfNotNull("temp_target_id", tempTarget, User::getId)
-                .build();
-        try {
-            return client.getNetworkClient().post(HttpAPIRoute.CHANNEL_MESSAGE_SEND.toFullURL(), body).get("msg_id").getAsString();
-        } catch (BadResponseException e) {
-            if ("资源不存在".equals(e.getRawMessage())) {
-                // 2023/1/17: special case for the resources that aren't created by Bots.
-                // Thanks: Edint386@Github
-                throw new IllegalArgumentException("Unable to send component. Is the resource created by Bot?", e);
-            } else {
-                throw e;
-            }
-        }
-    }
-
-    @Override
-    public int getChatLimitTime() {
-        return chatLimitTime;
-    }
-
-    @Override
-    public void setChatLimitTime(int chatLimitTime) {
-        Map<String, Object> body = new MapBuilder()
-                .put("channel_id", getId())
-                .put("slow_mode", chatLimitTime)
-                .build();
-        client.getNetworkClient().post(HttpAPIRoute.CHANNEL_UPDATE.toFullURL(), body);
-        setChatLimitTime0(chatLimitTime);
-    }
-
-    public void setChatLimitTime0(int chatLimitTime) {
-        this.chatLimitTime = chatLimitTime;
-    }
-
     @Override
     public void update(JsonObject data) {
         synchronized (this) {
diff --git a/src/main/java/snw/kookbc/impl/entity/channel/VoiceChannelImpl.java b/src/main/java/snw/kookbc/impl/entity/channel/VoiceChannelImpl.java
index 419fae35..f561f2db 100644
--- a/src/main/java/snw/kookbc/impl/entity/channel/VoiceChannelImpl.java
+++ b/src/main/java/snw/kookbc/impl/entity/channel/VoiceChannelImpl.java
@@ -39,12 +39,14 @@ public class VoiceChannelImpl extends NonCategoryChannelImpl implements VoiceCha
     private boolean passwordProtected;
     private int maxSize;
     private int quality;
+    private int chatLimitTime;
 
-    public VoiceChannelImpl(KBCClient client, String id, User master, Guild guild, boolean permSync, Category parent, String name, Collection<RolePermissionOverwrite> rpo, Collection<UserPermissionOverwrite> upo, int level, boolean passwordProtected, int maxSize, int quality) {
-        super(client, id, master, guild, permSync, parent, name, rpo, upo, level);
+    public VoiceChannelImpl(KBCClient client, String id, User master, Guild guild, boolean permSync, Category parent, String name, Collection<RolePermissionOverwrite> rpo, Collection<UserPermissionOverwrite> upo, int level, boolean passwordProtected, int maxSize, int quality, int chatLimitTime) {
+        super(client, id, master, guild, permSync, parent, name, rpo, upo, level, chatLimitTime);
         this.passwordProtected = passwordProtected;
         this.maxSize = maxSize;
         this.quality = quality;
+        this.chatLimitTime = chatLimitTime;
     }
 
     @Override
diff --git a/src/main/java/snw/kookbc/impl/event/internal/UserClickButtonListener.java b/src/main/java/snw/kookbc/impl/event/internal/UserClickButtonListener.java
index c92770c7..9250b274 100644
--- a/src/main/java/snw/kookbc/impl/event/internal/UserClickButtonListener.java
+++ b/src/main/java/snw/kookbc/impl/event/internal/UserClickButtonListener.java
@@ -118,7 +118,7 @@ public void event(UserClickButtonEvent event) {
             Message message = this.client.getCore().getUnsafe().getPrivateMessage(event.getMessageId());
             message.setComponent(finalComponent);
         } else if (messageType.equals("CM")) {
-            Message message = this.client.getCore().getUnsafe().getTextChannelMessage(event.getMessageId());
+            Message message = this.client.getCore().getUnsafe().getChannelMessage(event.getMessageId());
             message.setComponent(finalComponent);
         }
 
diff --git a/src/main/java/snw/kookbc/impl/message/ChannelMessageImpl.java b/src/main/java/snw/kookbc/impl/message/ChannelMessageImpl.java
new file mode 100644
index 00000000..8bd9157d
--- /dev/null
+++ b/src/main/java/snw/kookbc/impl/message/ChannelMessageImpl.java
@@ -0,0 +1,124 @@
+package snw.kookbc.impl.message;
+
+import snw.jkook.entity.CustomEmoji;
+import snw.jkook.entity.User;
+import snw.jkook.entity.channel.NonCategoryChannel;
+import snw.jkook.message.ChannelMessage;
+import snw.jkook.message.Message;
+import snw.jkook.message.component.BaseComponent;
+import snw.jkook.message.component.MarkdownComponent;
+import snw.kookbc.impl.KBCClient;
+import snw.kookbc.impl.entity.builder.MessageBuilder;
+import snw.kookbc.impl.network.HttpAPIRoute;
+import snw.kookbc.util.MapBuilder;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class ChannelMessageImpl extends MessageImpl implements ChannelMessage {
+
+    private final NonCategoryChannel channel;
+
+    public ChannelMessageImpl(KBCClient client, String id, User user, BaseComponent component, long timeStamp, Message quote, NonCategoryChannel channel) {
+        super(client, id, user, component, timeStamp, quote);
+        this.channel = channel;
+    }
+
+    @Override
+    public void sendReaction(CustomEmoji emoji) {
+        Map<String, Object> body = new MapBuilder()
+                .put("msg_id", getId())
+                .put("emoji", emoji.getId())
+                .build();
+        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_ADD.toFullURL(), body);
+    }
+
+    @Override
+    public void removeReaction(CustomEmoji emoji) {
+        Map<String, Object> body = new MapBuilder()
+                .put("msg_id", getId())
+                .put("emoji", emoji.getId())
+                .build();
+        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_REMOVE.toFullURL(), body);
+    }
+
+    @Override
+    public void removeReaction(CustomEmoji emoji, User user) {
+        Map<String, Object> body = new MapBuilder()
+                .put("msg_id", getId())
+                .put("emoji", emoji.getId())
+                .put("user_id", user.getId())
+                .build();
+        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_REMOVE.toFullURL(), body);
+    }
+
+    @Override
+    public NonCategoryChannel getChannel() {
+        return channel;
+    }
+
+    @Override
+    public String replyTemp(String message) {
+        return replyTemp(new MarkdownComponent(message));
+    }
+
+    @Override
+    public String sendToSourceTemp(String message) {
+        return sendToSourceTemp(new MarkdownComponent(message));
+    }
+
+    @Override
+    public String replyTemp(BaseComponent component) {
+        return getChannel().sendComponent(component, this, getSender());
+    }
+
+    @Override
+    public String sendToSourceTemp(BaseComponent component) {
+        return getChannel().sendComponent(component, null, getSender());
+    }
+
+    @Override
+    public void setComponentTemp(User user, BaseComponent component) {
+        checkCompatibleComponentType(component);
+        Object content = MessageBuilder.serialize(component)[1];
+        Map<String, Object> body = new MapBuilder()
+                .put("msg_id", getId())
+                .put("content", content)
+                .put("temp_target_id", user.getId())
+                .build();
+        client.getNetworkClient().post(
+                HttpAPIRoute.CHANNEL_MESSAGE_UPDATE.toFullURL(),
+                body
+        );
+    }
+
+    @Override
+    public void setComponentTemp(User user, String s) {
+        setComponentTemp(user, new MarkdownComponent(s));
+    }
+
+    @Override
+    public String reply(String message) {
+        return reply(new MarkdownComponent(message));
+    }
+
+    @Override
+    public String sendToSource(String message) {
+        return sendToSource(new MarkdownComponent(message));
+    }
+
+    @Override
+    public String reply(BaseComponent component) {
+        return getChannel().sendComponent(component, this, null);
+    }
+
+    @Override
+    public String sendToSource(BaseComponent component) {
+        return getChannel().sendComponent(component, null, null);
+    }
+
+    @Override
+    public void delete() {
+        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_DELETE.toFullURL(), Collections.singletonMap("msg_id", getId()));
+    }
+}
diff --git a/src/main/java/snw/kookbc/impl/message/TextChannelMessageImpl.java b/src/main/java/snw/kookbc/impl/message/TextChannelMessageImpl.java
index e8203a33..4f47bd13 100644
--- a/src/main/java/snw/kookbc/impl/message/TextChannelMessageImpl.java
+++ b/src/main/java/snw/kookbc/impl/message/TextChannelMessageImpl.java
@@ -18,124 +18,24 @@
 
 package snw.kookbc.impl.message;
 
-import snw.jkook.entity.CustomEmoji;
 import snw.jkook.entity.User;
 import snw.jkook.entity.channel.TextChannel;
 import snw.jkook.message.Message;
 import snw.jkook.message.TextChannelMessage;
 import snw.jkook.message.component.BaseComponent;
-import snw.jkook.message.component.MarkdownComponent;
 import snw.kookbc.impl.KBCClient;
-import snw.kookbc.impl.entity.builder.MessageBuilder;
-import snw.kookbc.impl.network.HttpAPIRoute;
-import snw.kookbc.util.MapBuilder;
 
-import java.util.Collections;
-import java.util.Map;
-
-public class TextChannelMessageImpl extends MessageImpl implements TextChannelMessage {
+public class TextChannelMessageImpl extends ChannelMessageImpl implements TextChannelMessage {
     private final TextChannel channel;
 
     public TextChannelMessageImpl(KBCClient client, String id, User user, BaseComponent component, long timeStamp, Message quote, TextChannel channel) {
-        super(client, id, user, component, timeStamp, quote);
+        super(client, id, user, component, timeStamp, quote, channel);
         this.channel = channel;
     }
 
-    @Override
-    public void sendReaction(CustomEmoji emoji) {
-        Map<String, Object> body = new MapBuilder()
-                .put("msg_id", getId())
-                .put("emoji", emoji.getId())
-                .build();
-        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_ADD.toFullURL(), body);
-    }
-
-    @Override
-    public void removeReaction(CustomEmoji emoji) {
-        Map<String, Object> body = new MapBuilder()
-                .put("msg_id", getId())
-                .put("emoji", emoji.getId())
-                .build();
-        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_REMOVE.toFullURL(), body);
-    }
-
-    @Override
-    public void removeReaction(CustomEmoji emoji, User user) {
-        Map<String, Object> body = new MapBuilder()
-                .put("msg_id", getId())
-                .put("emoji", emoji.getId())
-                .put("user_id", user.getId())
-                .build();
-        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_REACTION_REMOVE.toFullURL(), body);
-    }
-
     @Override
     public TextChannel getChannel() {
         return channel;
     }
 
-    @Override
-    public String replyTemp(String message) {
-        return replyTemp(new MarkdownComponent(message));
-    }
-
-    @Override
-    public String sendToSourceTemp(String message) {
-        return sendToSourceTemp(new MarkdownComponent(message));
-    }
-
-    @Override
-    public String replyTemp(BaseComponent component) {
-        return getChannel().sendComponent(component, this, getSender());
-    }
-
-    @Override
-    public String sendToSourceTemp(BaseComponent component) {
-        return getChannel().sendComponent(component, null, getSender());
-    }
-
-    @Override
-    public void setComponentTemp(User user, BaseComponent component) {
-        checkCompatibleComponentType(component);
-        Object content = MessageBuilder.serialize(component)[1];
-        Map<String, Object> body = new MapBuilder()
-                .put("msg_id", getId())
-                .put("content", content)
-                .put("temp_target_id", user.getId())
-                .build();
-        client.getNetworkClient().post(
-                HttpAPIRoute.CHANNEL_MESSAGE_UPDATE.toFullURL(),
-                body
-        );
-    }
-
-    @Override
-    public void setComponentTemp(User user, String s) {
-        setComponentTemp(user, new MarkdownComponent(s));
-    }
-
-    @Override
-    public String reply(String message) {
-        return reply(new MarkdownComponent(message));
-    }
-
-    @Override
-    public String sendToSource(String message) {
-        return sendToSource(new MarkdownComponent(message));
-    }
-
-    @Override
-    public String reply(BaseComponent component) {
-        return getChannel().sendComponent(component, this, null);
-    }
-
-    @Override
-    public String sendToSource(BaseComponent component) {
-        return getChannel().sendComponent(component, null, null);
-    }
-
-    @Override
-    public void delete() {
-        client.getNetworkClient().postContent(HttpAPIRoute.CHANNEL_MESSAGE_DELETE.toFullURL(), Collections.singletonMap("msg_id", getId()));
-    }
 }
diff --git a/src/main/java/snw/kookbc/impl/message/VoiceChannelMessageImpl.java b/src/main/java/snw/kookbc/impl/message/VoiceChannelMessageImpl.java
new file mode 100644
index 00000000..d77df9c4
--- /dev/null
+++ b/src/main/java/snw/kookbc/impl/message/VoiceChannelMessageImpl.java
@@ -0,0 +1,23 @@
+package snw.kookbc.impl.message;
+
+import snw.jkook.entity.User;
+import snw.jkook.entity.channel.VoiceChannel;
+import snw.jkook.message.Message;
+import snw.jkook.message.VoiceChannelMessage;
+import snw.jkook.message.component.BaseComponent;
+import snw.kookbc.impl.KBCClient;
+
+public class VoiceChannelMessageImpl extends ChannelMessageImpl implements VoiceChannelMessage {
+
+    private final VoiceChannel channel;
+
+    public VoiceChannelMessageImpl(KBCClient client, String id, User user, BaseComponent component, long timeStamp, Message quote, VoiceChannel channel) {
+        super(client, id, user, component, timeStamp, quote, channel);
+        this.channel = channel;
+    }
+
+    @Override
+    public VoiceChannel getChannel() {
+        return channel;
+    }
+}
diff --git a/src/main/java/snw/kookbc/impl/network/ListenerImpl.java b/src/main/java/snw/kookbc/impl/network/ListenerImpl.java
index 505e7ee0..ec5848f7 100644
--- a/src/main/java/snw/kookbc/impl/network/ListenerImpl.java
+++ b/src/main/java/snw/kookbc/impl/network/ListenerImpl.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonObject;
 import snw.jkook.command.CommandException;
 import snw.jkook.entity.User;
+import snw.jkook.entity.channel.NonCategoryChannel;
 import snw.jkook.entity.channel.TextChannel;
 import snw.jkook.event.Event;
 import snw.jkook.event.channel.ChannelMessageEvent;
@@ -193,7 +194,7 @@ protected boolean executeCommand(Event event) {
         // region extract data
         User sender;
         Message msg;
-        TextChannel channel = null;
+        NonCategoryChannel channel = null;
         BaseComponent baseComponent; // raw
         TextComponent component = null;
         if (event instanceof ChannelMessageEvent) {
diff --git a/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageDeleteEventDeserializer.java b/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageDeleteEventDeserializer.java
index 908ebc72..c16173c6 100644
--- a/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageDeleteEventDeserializer.java
+++ b/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageDeleteEventDeserializer.java
@@ -40,7 +40,7 @@ public ChannelMessageDeleteEventDeserializer(KBCClient client) {
     protected ChannelMessageDeleteEvent deserialize(JsonObject object, Type type, JsonDeserializationContext ctx, long timeStamp, JsonObject body) throws JsonParseException {
         return new ChannelMessageDeleteEvent(
                 timeStamp,
-                (TextChannel) client.getStorage().getChannel(get(body, "channel_id").getAsString()), // if this error, we can regard it as internal error
+                client.getStorage().getChannel(get(body, "channel_id").getAsString()), // if this error, we can regard it as internal error
                 get(body, "msg_id").getAsString()
         );
     }
diff --git a/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageEventDeserializer.java b/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageEventDeserializer.java
index 14f3a203..a51ea2c2 100644
--- a/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageEventDeserializer.java
+++ b/src/main/java/snw/kookbc/impl/serializer/event/channel/ChannelMessageEventDeserializer.java
@@ -22,7 +22,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import snw.jkook.event.channel.ChannelMessageEvent;
-import snw.jkook.message.TextChannelMessage;
+import snw.jkook.message.ChannelMessage;
 import snw.kookbc.impl.KBCClient;
 import snw.kookbc.impl.serializer.event.BaseEventDeserializer;
 
@@ -36,11 +36,11 @@ public ChannelMessageEventDeserializer(KBCClient client) {
 
     @Override
     protected ChannelMessageEvent deserialize(JsonObject object, Type type, JsonDeserializationContext ctx) throws JsonParseException {
-        TextChannelMessage textChannelMessage = client.getMessageBuilder().buildTextChannelMessage(object);
+        ChannelMessage ChannelMessage = client.getMessageBuilder().buildChannelMessage(object);
         return new ChannelMessageEvent(
-                textChannelMessage.getTimeStamp(),
-                textChannelMessage.getChannel(),
-                textChannelMessage
+                ChannelMessage.getTimeStamp(),
+                ChannelMessage.getChannel(),
+                ChannelMessage
         );
     }
 
diff --git a/src/main/java/snw/kookbc/impl/serializer/event/user/UserClickButtonEventDeserializer.java b/src/main/java/snw/kookbc/impl/serializer/event/user/UserClickButtonEventDeserializer.java
index c3d96110..2f24c325 100644
--- a/src/main/java/snw/kookbc/impl/serializer/event/user/UserClickButtonEventDeserializer.java
+++ b/src/main/java/snw/kookbc/impl/serializer/event/user/UserClickButtonEventDeserializer.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import snw.jkook.entity.channel.NonCategoryChannel;
 import snw.jkook.entity.channel.TextChannel;
 import snw.jkook.event.user.UserClickButtonEvent;
 import snw.kookbc.impl.KBCClient;
@@ -47,7 +48,7 @@ protected UserClickButtonEvent deserialize(JsonObject object, Type type, JsonDes
                 Objects.equals(
                         get(body, "user_id").getAsString(),
                         get(body, "target_id").getAsString()
-                ) ? null : (TextChannel) client.getStorage().getChannel(get(body, "target_id").getAsString())
+                ) ? null : (NonCategoryChannel) client.getStorage().getChannel(get(body, "target_id").getAsString())
         );
     }
 
diff --git a/src/main/java/snw/kookbc/impl/storage/EntityStorage.java b/src/main/java/snw/kookbc/impl/storage/EntityStorage.java
index 3a6ce804..f80eeaee 100644
--- a/src/main/java/snw/kookbc/impl/storage/EntityStorage.java
+++ b/src/main/java/snw/kookbc/impl/storage/EntityStorage.java
@@ -25,6 +25,7 @@
 import com.google.gson.JsonObject;
 import snw.jkook.entity.*;
 import snw.jkook.entity.channel.Channel;
+import snw.jkook.entity.channel.TextChannel;
 import snw.jkook.message.Message;
 import snw.kookbc.impl.KBCClient;
 import snw.kookbc.impl.entity.CustomEmojiImpl;