discorb 0.13.0 → 0.13.4

data/lib/discorb/channel.rb

@@ -166,8 +166,7 @@ module Discorb
 
     #
     # Deletes the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] reason The reason of deleting the channel.
     #
@@ -175,7 +174,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete(base_url.wait.to_s, audit_log_reason: reason).wait
+        @client.http.request(Route.new(base_url.wait.to_s, "//webhooks/:webhook_id/:token", :delete), audit_log_reason: reason).wait
         @deleted = true
         self
       end
@@ -186,8 +185,7 @@ module Discorb
 
     #
     # Moves the channel to another position.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Integer] position The position to move the channel.
     # @param [Boolean] lock_permissions Whether to lock the permissions of the channel.
@@ -196,14 +194,14 @@ module Discorb
     #
     # @return [Async::Task<self>] The moved channel.
     #
-    def move(position, lock_permissions: false, parent: :unset, reason: nil)
+    def move(position, lock_permissions: false, parent: Discorb::Unset, reason: nil)
       Async do
         payload = {
           position: position,
         }
         payload[:lock_permissions] = lock_permissions
-        payload[:parent_id] = parent&.id if parent != :unset
-        @client.http.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
+        payload[:parent_id] = parent&.id if parent != Discorb::Unset
+        @client.http.request(Route.new("/guilds/#{@guild_id}/channels", "//guilds/:guild_id/channels", :patch), payload, audit_log_reason: reason).wait
       end
     end
 
@@ -256,8 +254,7 @@ module Discorb
 
     #
     # Edits the channel.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The name of the channel.
@@ -275,27 +272,27 @@ module Discorb
     #
     # @return [Async::Task<self>] The edited channel.
     #
-    def edit(name: :unset, position: :unset, category: :unset, parent: :unset,
-             topic: :unset, nsfw: :unset, announce: :unset,
-             rate_limit_per_user: :unset, slowmode: :unset, default_auto_archive_duration: :unset,
-             archive_in: :unset, reason: nil)
+    def edit(name: Discorb::Unset, position: Discorb::Unset, category: Discorb::Unset, parent: Discorb::Unset,
+             topic: Discorb::Unset, nsfw: Discorb::Unset, announce: Discorb::Unset,
+             rate_limit_per_user: Discorb::Unset, slowmode: Discorb::Unset, default_auto_archive_duration: Discorb::Unset,
+             archive_in: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:announce] = announce ? 5 : 0 if announce != :unset
-        payload[:position] = position if position != :unset
-        payload[:topic] = topic || "" if topic != :unset
-        payload[:nsfw] = nsfw if nsfw != :unset
+        payload[:name] = name if name != Discorb::Unset
+        payload[:announce] = announce ? 5 : 0 if announce != Discorb::Unset
+        payload[:position] = position if position != Discorb::Unset
+        payload[:topic] = topic || "" if topic != Discorb::Unset
+        payload[:nsfw] = nsfw if nsfw != Discorb::Unset
 
-        slowmode = rate_limit_per_user if slowmode == :unset
-        payload[:rate_limit_per_user] = slowmode || 0 if slowmode != :unset
-        parent = category if parent == :unset
-        payload[:parent_id] = parent&.id if parent != :unset
+        slowmode = rate_limit_per_user if slowmode == Discorb::Unset
+        payload[:rate_limit_per_user] = slowmode || 0 if slowmode != Discorb::Unset
+        parent = category if parent == Discorb::Unset
+        payload[:parent_id] = parent&.id if parent != Discorb::Unset
 
         default_auto_archive_duration ||= archive_in
-        payload[:default_auto_archive_duration] = default_auto_archive_duration if default_auto_archive_duration != :unset
+        payload[:default_auto_archive_duration] = default_auto_archive_duration if default_auto_archive_duration != Discorb::Unset
 
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -304,8 +301,7 @@ module Discorb
 
     #
     # Create webhook in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] name The name of the webhook.
     # @param [Discorb::Image] avatar The avatar of the webhook.
@@ -317,33 +313,33 @@ module Discorb
         payload = {}
         payload[:name] = name
         payload[:avatar] = avatar.to_s if avatar
-        _resp, data = @client.http.post("/channels/#{@id}/webhooks", payload).wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/webhooks", "//channels/:channel_id/webhooks", :post), payload).wait
         Webhook.new([@client, data])
       end
     end
 
     #
     # Fetch webhooks in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<Array<Discorb::Webhook>>] The webhooks in the channel.
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/webhooks").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/webhooks", "//channels/:channel_id/webhooks", :get)).wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
 
     #
     # Bulk delete messages in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Message] messages The messages to delete.
     # @param [Boolean] force Whether to ignore the validation for message (14 days limit).
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete_messages!(*messages, force: false)
       Async do
         messages = messages.first if messages.length == 1 && messages.first.is_a?(Array)
@@ -358,7 +354,7 @@ module Discorb
 
         message_ids = messages.map { |m| Discorb::Utils.try(m, :id).to_s }
 
-        @client.http.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
+        @client.http.request(Route.new("/channels/#{@id}/messages/bulk-delete", "//channels/:channel_id/messages/bulk-delete", :post), { messages: message_ids }).wait
       end
     end
 
@@ -367,12 +363,13 @@ module Discorb
 
     #
     # Set the channel's permission overwrite.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Role, Discorb::Member] target The target of the overwrite.
     # @param [String] reason The reason of setting the overwrite.
-    # @param [Symbol => Boolean] perms The permission overwrites to replace.
+    # @param [{Symbol => Boolean}] perms The permission overwrites to replace.
+    #
+    # @return [Async::Task<void>] The task.
     #
     def set_permissions(target, reason: nil, **perms)
       Async do
@@ -387,7 +384,7 @@ module Discorb
           deny: deny_value,
           type: target.is_a?(Member) ? 1 : 0,
         }
-        @client.http.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/permissions/#{target.id}", "//channels/:channel_id/permissions/:target_id", :put), payload, audit_log_reason: reason).wait
       end
     end
 
@@ -398,15 +395,16 @@ module Discorb
 
     #
     # Delete the channel's permission overwrite.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Role, Discorb::Member] target The target of the overwrite.
     # @param [String] reason The reason of deleting the overwrite.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete_permissions(target, reason: nil)
       Async do
-        @client.http.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/permissions/#{target.id}", "//channels/:channel_id/permissions/:target_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -416,22 +414,20 @@ module Discorb
 
     #
     # Fetch the channel's invites.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<Array<Discorb::Invite>>] The invites in the channel.
     #
     def fetch_invites
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/invites").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/invites", "//channels/:channel_id/invites", :get)).wait
         data.map { |invite| Invite.new(@client, invite) }
       end
     end
 
     #
     # Create an invite in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Integer] max_age The max age of the invite.
     # @param [Integer] max_uses The max uses of the invite.
@@ -444,7 +440,7 @@ module Discorb
     #
     def create_invite(max_age: nil, max_uses: nil, temporary: false, unique: false, reason: nil)
       Async do
-        _resp, data = @client.http.post("/channels/#{@id}/invites", {
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/invites", "//channels/:channel_id/invites", :post), {
           max_age: max_age,
           max_uses: max_uses,
           temporary: temporary,
@@ -456,36 +452,37 @@ module Discorb
 
     #
     # Follow the existing announcement channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::NewsChannel] target The channel to follow.
     # @param [String] reason The reason of following the channel.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def follow_from(target, reason: nil)
       Async do
-        @client.http.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{target.id}/followers", "//channels/:channel_id/followers", :post), { webhook_channel_id: @id }, audit_log_reason: reason).wait
       end
     end
 
     #
     # Follow the existing announcement channel from self.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::TextChannel] target The channel to follow to.
     # @param [String] reason The reason of following the channel.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def follow_to(target, reason: nil)
       Async do
-        @client.http.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/followers", "//channels/:channel_id/followers", :post), { webhook_channel_id: target.id }, audit_log_reason: reason).wait
       end
     end
 
     #
     # Start thread in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] name The name of the thread.
     # @param [Discorb::Message] message The message to start the thread.
@@ -500,17 +497,15 @@ module Discorb
     def start_thread(name, message: nil, auto_archive_duration: 1440, public: true, rate_limit_per_user: nil, slowmode: nil, reason: nil)
       Async do
         _resp, data = if message.nil?
-            @client.http.post(
-              "/channels/#{@id}/threads", {
-                name: name,
-                auto_archive_duration: auto_archive_duration,
-                type: public ? 11 : 10,
-                rate_limit_per_user: rate_limit_per_user || slowmode,
-              },
-              audit_log_reason: reason,
-            ).wait
+            @client.http.request(Route.new("/channels/#{@id}/threads", "//channels/:channel_id/threads", :post), {
+              name: name,
+              auto_archive_duration: auto_archive_duration,
+              type: public ? 11 : 10,
+              rate_limit_per_user: rate_limit_per_user || slowmode,
+            },
+                                 audit_log_reason: reason).wait
           else
-            @client.http.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
+            @client.http.request(Route.new("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", "//channels/:channel_id/messages/:message_id/threads", :post), {
               name: name, auto_archive_duration: auto_archive_duration,
             }, audit_log_reason: reason).wait
           end
@@ -522,36 +517,33 @@ module Discorb
 
     #
     # Fetch archived threads in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<Array<Discorb::ThreadChannel>>] The archived threads in the channel.
     #
     def fetch_archived_public_threads
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/public").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/threads/archived/public", "//channels/:channel_id/threads/archived/public", :get)).wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
 
     #
     # Fetch archived private threads in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<Array<Discorb::ThreadChannel>>] The archived private threads in the channel.
     #
     def fetch_archived_private_threads
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/private").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/threads/archived/private", "//channels/:channel_id/threads/archived/private", :get)).wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
 
     #
     # Fetch joined archived private threads in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Integer] limit The limit of threads to fetch.
     # @param [Time] before <description>
@@ -564,7 +556,7 @@ module Discorb
           before = 0
           threads = []
           loop do
-            _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
+            _resp, data = @client.http.request(Route.new("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}", "//channels/:channel_id/users/@me/threads/archived/private", :get)).wait
             threads += data[:threads].map { |thread| Channel.make_channel(@client, thread) }
             before = data[:threads][-1][:id]
 
@@ -572,7 +564,7 @@ module Discorb
           end
           threads
         else
-          _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
+          _resp, data = @client.http.request(Route.new("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}", "//channels/:channel_id/users/@me/threads/archived/private", :get)).wait
           data.map { |thread| Channel.make_channel(@client, thread) }
         end
       end
@@ -609,13 +601,17 @@ module Discorb
     # @return [nil] If the user limit is not set.
     attr_reader :user_limit
 
+    # @!attribute [r] members
+    #   @return [Array<Discorb::Member>] The members in the voice channel.
+    # @!attribute [r] voice_states
+    #   @return [Array<Discorb::VoiceState>] The voice states associated with the voice channel.
+
     include Connectable
 
     @channel_type = 2
     #
     # Edit the voice channel.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The name of the voice channel.
@@ -627,22 +623,30 @@ module Discorb
     #
     # @return [Async::Task<self>] The edited voice channel.
     #
-    def edit(name: :unset, position: :unset, bitrate: :unset, user_limit: :unset, rtc_region: :unset, reason: nil)
+    def edit(name: Discorb::Unset, position: Discorb::Unset, bitrate: Discorb::Unset, user_limit: Discorb::Unset, rtc_region: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:position] = position if position != :unset
-        payload[:bitrate] = bitrate if bitrate != :unset
-        payload[:user_limit] = user_limit if user_limit != :unset
-        payload[:rtc_region] = rtc_region if rtc_region != :unset
+        payload[:name] = name if name != Discorb::Unset
+        payload[:position] = position if position != Discorb::Unset
+        payload[:bitrate] = bitrate if bitrate != Discorb::Unset
+        payload[:user_limit] = user_limit if user_limit != Discorb::Unset
+        payload[:rtc_region] = rtc_region if rtc_region != Discorb::Unset
 
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
 
     alias modify edit
 
+    def voice_states
+      guild.voice_states.select { |state| state.channel&.id == @id }
+    end
+
+    def members
+      voice_states.map(&:member)
+    end
+
     private
 
     def _set_data(data)
@@ -683,8 +687,7 @@ module Discorb
 
     #
     # Edit the stage channel.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The name of the stage channel.
@@ -695,14 +698,14 @@ module Discorb
     #
     # @return [Async::Task<self>] The edited stage channel.
     #
-    def edit(name: :unset, position: :unset, bitrate: :unset, rtc_region: :unset, reason: nil)
+    def edit(name: Discorb::Unset, position: Discorb::Unset, bitrate: Discorb::Unset, rtc_region: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:position] = position if position != :unset
-        payload[:bitrate] = bitrate if bitrate != :unset
-        payload[:rtc_region] = rtc_region if rtc_region != :unset
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        payload[:name] = name if name != Discorb::Unset
+        payload[:position] = position if position != Discorb::Unset
+        payload[:bitrate] = bitrate if bitrate != Discorb::Unset
+        payload[:rtc_region] = rtc_region if rtc_region != Discorb::Unset
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -711,8 +714,7 @@ module Discorb
 
     #
     # Start a stage instance.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] topic The topic of the stage instance.
     # @param [Boolean] public Whether the stage instance is public or not.
@@ -722,22 +724,21 @@ module Discorb
     #
     def start(topic, public: false, reason: nil)
       Async do
-        _resp, data = @client.http.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
+        _resp, data = @client.http.request(Route.new("/stage-instances", "//stage-instances", :post), { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
         StageInstance.new(@client, data)
       end
     end
 
     #
     # Fetch a current stage instance.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<StageInstance>] The current stage instance.
     # @return [Async::Task<nil>] If there is no current stage instance.
     #
     def fetch_stage_instance
       Async do
-        _resp, data = @client.http.get("/stage-instances/#{@id}").wait
+        _resp, data = @client.http.request(Route.new("/stage-instances/#{@id}", "//stage-instances/:stage_instance_id", :get)).wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -745,6 +746,22 @@ module Discorb
       end
     end
 
+    def voice_states
+      guild.voice_states.select { |state| state.channel&.id == @id }
+    end
+
+    def members
+      voice_states.map(&:member)
+    end
+
+    def speakers
+      voice_states.filter { |state| !state.suppress? }.map(&:member)
+    end
+
+    def audiences
+      voice_states.filter { |state| state.suppress? }.map(&:member)
+    end
+
     private
 
     def _set_data(data)
@@ -792,6 +809,18 @@ module Discorb
     # @!attribute [r] parent
     #   @macro client_cache
     #   @return [Discorb::GuildChannel] The parent channel of the thread.
+    # @!attribute [r] me
+    #   @return [Discorb::ThreadChannel::Member] The bot's member in the thread.
+    #   @return [nil] If the bot is not in the thread.
+    # @!attribute [r] joined?
+    #   @return [Boolean] Whether the bot is in the thread or not.
+    # @!attribute [r] guild
+    #   @macro client_cache
+    #   @return [Discorb::Guild] The guild of the thread.
+    # @!attribute [r] owner
+    #   @macro client_cache
+    #   @macro members_intent
+    #   @return [Discorb::Member] The owner of the thread.
 
     include Messageable
     @channel_type = nil
@@ -807,8 +836,7 @@ module Discorb
 
     #
     # Edit the thread.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The name of the thread.
@@ -825,15 +853,15 @@ module Discorb
     # @see #unarchive
     # @see #unlock
     #
-    def edit(name: :unset, archived: :unset, auto_archive_duration: :unset, archive_in: :unset, locked: :unset, reason: nil)
+    def edit(name: Discorb::Unset, archived: Discorb::Unset, auto_archive_duration: Discorb::Unset, archive_in: Discorb::Unset, locked: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:archived] = archived if archived != :unset
+        payload[:name] = name if name != Discorb::Unset
+        payload[:archived] = archived if archived != Discorb::Unset
         auto_archive_duration ||= archive_in
-        payload[:auto_archive_duration] = auto_archive_duration if auto_archive_duration != :unset
-        payload[:locked] = locked if locked != :unset
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        payload[:auto_archive_duration] = auto_archive_duration if auto_archive_duration != Discorb::Unset
+        payload[:locked] = locked if locked != Discorb::Unset
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -897,7 +925,7 @@ module Discorb
     end
 
     def joined?
-      @members[@client.user.id]
+      !!me
     end
 
     def guild
@@ -912,33 +940,52 @@ module Discorb
       "#<#{self.class} \"##{@name}\" id=#{@id}>"
     end
 
+    #
+    # Add a member to the thread.
+    #
+    # @param [Discorb::Member, :me] member The member to add. If `:me` is given, the bot will be added.
+    #
+    # @return [Async::Task<void>] The task.
+    #
     def add_member(member = :me)
       Async do
         if member == :me
-          @client.http.post("/channels/#{@id}/thread-members/@me").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/@me", "//channels/:channel_id/thread-members/@me", :post)).wait
         else
-          @client.http.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}", "//channels/:channel_id/thread-members/:user_id", :post)).wait
         end
       end
     end
 
     alias join add_member
 
+    #
+    # Remove a member from the thread.
+    #
+    # @param [Discorb::Member, :me] member The member to remove. If `:me` is given, the bot will be removed.
+    #
+    # @return [Async::Task<void>] The task.
+    #
     def remove_member(member = :me)
       Async do
         if member == :me
-          @client.http.delete("/channels/#{@id}/thread-members/@me").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/@me", "//channels/:channel_id/thread-members/@me", :delete)).wait
         else
-          @client.http.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}", "//channels/:channel_id/thread-members/:user_id", :delete)).wait
         end
       end
     end
 
     alias leave remove_member
 
+    #
+    # Fetch members in the thread.
+    #
+    # @return [Array<Discorb::ThreadChannel::Member>] The members in the thread.
+    #
     def fetch_members
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/thread-members").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/thread-members", "//channels/:channel_id/thread-members", :get)).wait
         data.map { |d| @members[d[:id]] = Member.new(@client, d) }
       end
     end
@@ -959,6 +1006,9 @@ module Discorb
       attr_reader :channel_type
     end
 
+    #
+    # Repre
+    #
     class Member < DiscordModel
       attr_reader :joined_at
 
@@ -1010,24 +1060,26 @@ module Discorb
   end
 
   class CategoryChannel < GuildChannel
-    attr_reader :channels
-
     @channel_type = 4
 
+    def channels
+      @client.channels.values.filter { |channel| channel.parent == self }
+    end
+
     def text_channels
-      @channels.filter { |c| c.is_a? TextChannel }
+      channels.filter { |c| c.is_a? TextChannel }
     end
 
     def voice_channels
-      @channels.filter { |c| c.is_a? VoiceChannel }
+      channels.filter { |c| c.is_a? VoiceChannel }
     end
 
     def news_channel
-      @channels.filter { |c| c.is_a? NewsChannel }
+      channels.filter { |c| c.is_a? NewsChannel }
     end
 
     def stage_channels
-      @channels.filter { |c| c.is_a? StageChannel }
+      channels.filter { |c| c.is_a? StageChannel }
     end
 
     def create_text_channel(*args, **kwargs)
@@ -1045,13 +1097,6 @@ module Discorb
     def create_stage_channel(*args, **kwargs)
       guild.create_stage_channel(*args, parent: self, **kwargs)
     end
-
-    private
-
-    def _set_data(data)
-      @channels = @client.channels.values.filter { |channel| channel.parent == self }
-      super
-    end
   end
 
   class DMChannel < Channel