discorb 0.17.1 → 0.19.0

data/lib/discorb/guild.rb

@@ -179,7 +179,7 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def leave!
+    def leave
       Async do
         @client.http.request(Route.new("/users/@me/guilds/#{@id}", "//users/@me/guilds/:guild_id", :delete)).wait
         @client.guilds.delete(@id)
@@ -226,9 +226,6 @@ module Discorb
             :get
           )
         ).wait
-      rescue Discorb::NotFoundError
-        return nil
-      else
         ScheduledEvent.new(@client, event)
       end
     end
@@ -343,9 +340,16 @@ module Discorb
     # @return [Async::Task<Discorb::CustomEmoji>] The emoji with the given id.
     #
     def fetch_emoji(id)
-      _resp, data = @client.http.request(Route.new("/guilds/#{@id}/emojis/#{id}",
-                                                   "//guilds/:guild_id/emojis/:emoji_id", :get)).wait
-      @emojis[e[:id]] = CustomEmoji.new(@client, self, data)
+      Async do
+        _resp, data = @client.http.request(
+          Route.new(
+            "/guilds/#{@id}/emojis/#{id}",
+            "//guilds/:guild_id/emojis/:emoji_id",
+            :get
+          )
+        ).wait
+        @emojis[e[:id]] = CustomEmoji.new(@client, self, data)
+      end
     end
 
     #
@@ -359,13 +363,17 @@ module Discorb
     # @return [Async::Task<Discorb::CustomEmoji>] The created emoji.
     #
     def create_emoji(name, image, roles: [])
-      _resp, data = @client.http.request(Route.new("/guilds/#{@id}/emojis", "//guilds/:guild_id/emojis", :post),
-                                         {
-                                           name: name,
-                                           image: image.to_s,
-                                           roles: roles.map { |r| Discorb::Utils.try(r, :id) },
-                                         }).wait
-      @emojis[data[:id]] = CustomEmoji.new(@client, self, data)
+      Async do
+        _resp, data = @client.http.request(
+          Route.new("/guilds/#{@id}/emojis", "//guilds/:guild_id/emojis", :post),
+          {
+            name: name,
+            image: image.to_s,
+            roles: roles.map { |r| Discorb::Utils.try(r, :id) },
+          }
+        ).wait
+        @emojis[data[:id]] = CustomEmoji.new(@client, self, data)
+      end
     end
 
     #
@@ -378,7 +386,7 @@ module Discorb
       Async do
         _resp, data = @client.http.request(Route.new("/guilds/#{@id}/webhooks", "//guilds/:guild_id/webhooks",
                                                      :get)).wait
-        data.map { |webhook| Webhook.new([@client, webhook]) }
+        data.map { |webhook| Webhook.from_data(@client, webhook) }
       end
     end
 
@@ -698,7 +706,7 @@ module Discorb
                                                        "//guilds/:guild_id/members", :get)).wait
           ret += data.map { |m| Member.new(@client, @id, m[:user], m) }
           after = data.last[:user][:id]
-          break if data.length != 1000
+          break if data.length != 100
         end
         ret
       end
@@ -1122,6 +1130,100 @@ module Discorb
       end
     end
 
+    #
+    # Fetch the automod rules in the guild.
+    # @async
+    #
+    # @return [Async::Task<Array<Discorb::AutoModRule>>] The automod rules.
+    #
+    def fetch_automod_rules
+      Async do
+        _resp, data = @client.http.request(
+          Route.new("/guilds/#{@id}/auto-moderation/rules", "//guilds/:guild_id/auto-moderation/rules", :get)
+        )
+        data.map { |d| AutoModRule.new(@client, d) }
+      end
+    end
+
+    alias fetch_automod_rule_list fetch_automod_rules
+
+    #
+    # Fetch the automod rule by ID.
+    #
+    # @param [#to_s] id The ID of the automod rule.
+    #
+    # @return [Async::Task<Array<Discord::AutoModRule>>] The automod rule.
+    #
+    def fetch_automod_rule(id)
+      Async do
+        _resp, data = @client.http.request(
+          Route.new(
+            "/guilds/#{@id}/auto-moderation/rules/#{id}",
+            "//guilds/:guild_id/auto-moderation/rules/:rule_id",
+            :get
+          )
+        ).wait
+        AutoModRule.new(@client, data)
+      end
+    end
+
+    #
+    # Create a new automod rule in the guild.
+    # @async
+    #
+    # @param [String] name The name of the rule.
+    # @param [Symbol] trigger_type The trigger type of the rule. See {Discorb::AutoModRule::TRIGGER_TYPES}.
+    # @param [Array<Discorb::AutoModRule::Action>] actions The actions of the rule.
+    # @param [Symbol] event_type The event type of the rule. See {Discorb::AutoModRule::EVENT_TYPES}.
+    # @param [Boolean] enabled Whether the rule is enabled or not.
+    # @param [Array<Discorb::Role>] exempt_roles The roles that are exempt from the rule.
+    # @param [Array<Discorb::Channel>] exempt_channels The channels that are exempt from the rule.
+    # @param [Array<String>] keyword_filter The keywords to filter.
+    # @param [Symbol] presets The preset of the rule. See {Discorb::AutoModRule::PRESET_TYPES}.
+    # @param [String] reason The reason for creating the rule.
+    #
+    # @return [Async::Task<Discorb::AutoModRule>] The automod rule.
+    #
+    def create_automod_rule(
+      name,
+      trigger_type,
+      actions,
+      event_type = :message_send,
+      enabled: false,
+      exempt_roles: [],
+      exempt_channels: [],
+      keyword_filter: nil,
+      presets: nil,
+      reason: nil
+    )
+      Async do
+        payload = {
+          name: name,
+          event_type: Discorb::AutoModRule::EVENT_TYPES.key(event_type),
+          trigger_type: Discorb::AutoModRule::TRIGGER_TYPES.key(trigger_type),
+          metadata: {
+            keyword_filter: keyword_filter,
+            presets: presets && Discorb::AutoModRule::PRESET_TYPES.key(presets),
+          },
+          actions: actions.map(&:to_hash),
+          enabled: enabled,
+          exempt_roles: exempt_roles.map(&:id),
+          exempt_channels: exempt_channels.map(&:id),
+        }
+
+        _resp, data = @client.http.request(
+          Route.new(
+            "/guilds/#{@id}/auto-moderation/rules",
+            "//guilds/:guild_id/auto-moderation/rules",
+            :post
+          ),
+          payload,
+          audit_log_reason: reason
+        )
+        Discorb::AutoModRule.new(@client, data)
+      end
+    end
+
     #
     # Represents a vanity invite.
     #
@@ -1279,7 +1381,7 @@ module Discorb
       #
       # @return [String] The url of the banner.
       #
-      def banner(guild_id, style: "banner")
+      def banner(guild_id, style: :banner)
         "#{Discorb::API_BASE_URL}/guilds/#{guild_id}/widget.png&style=#{style}"
       end
     end
@@ -1339,7 +1441,7 @@ module Discorb
       @nsfw_level = NSFW_LEVELS[data[:nsfw_level]]
       return unless is_create_event
 
-      @stickers = data[:stickers].nil? ? [] : data[:stickers].map { |s| Sticker::GuildSticker.new(self, s) }
+      @stickers = data[:stickers].nil? ? [] : data[:stickers].map { |s| Sticker::GuildSticker.new(@client, s) }
       @joined_at = Time.iso8601(data[:joined_at])
       @large = data[:large]
       @member_count = data[:member_count]
@@ -1407,7 +1509,24 @@ module Discorb
       @client = client
       @description = data[:description]
       @guild = guild
-      @channels = data[:channels].map { |c| WelcomeScreen::Channel.new(client, c, nil) }
+      @channels = data[:channels].map do |c|
+        WelcomeScreen::Channel.new(
+          client.channels[c[:channel_id]],
+          c,
+          c[:emoji_name] &&
+          if c[:emoji_id]
+            (client.emojis[c[:emoji_id]] ||
+             Discorb::PartialEmoji.new(
+               {
+                 name: c[:emoji_name],
+                 id: c[:emoji_id],
+               }
+             ))
+          else
+            Discorb::UnicodeEmoji.new(c[:emoji_name])
+          end
+        )
+      end
     end
 
     #

data/lib/discorb/guild_template.rb

@@ -19,7 +19,7 @@ module Discorb
     attr_reader :created_at
     # @return [Time] The time this template was last updated.
     attr_reader :updated_at
-    # @return [Discorb::Guild] The guild where the template was created.
+    # @return [Discorb::Snowflake] The ID of guild where the template was created.
     attr_reader :source_guild_id
     # @return [Discorb::GuildTemplate::TemplateGuild] The guild where the template was created.
     attr_reader :serialized_source_guild
@@ -93,14 +93,14 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete!
+    def delete
       Async do
         @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}",
                                        "//guilds/:guild_id/templates/:code", :delete)).wait
       end
     end
 
-    alias destroy! delete!
+    alias destroy delete
 
     #
     # Represents a guild in guild template.

data/lib/discorb/http.rb

@@ -27,7 +27,6 @@ module Discorb
     #
     # @param [Discorb::Route] path The path to the resource.
     # @param [String, Hash] body The body of the request. Defaults to an empty string.
-    # @param [Hash] headers The headers to send with the request.
     # @param [String] audit_log_reason The audit log reason to send with the request.
     # @param [Hash] kwargs The keyword arguments.
     #
@@ -36,18 +35,28 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def request(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
+    def request(path, body = "", audit_log_reason: nil, **kwargs)
       Async do |_task|
         @ratelimit_handler.wait(path)
         resp = if %i[post patch put].include? path.method
-                 http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason),
-                           **kwargs)
+            http.send(
+              path.method,
+              get_path(path),
+              get_body(body),
+              get_headers(body, audit_log_reason),
+              **kwargs,
+            )
           else
-            http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+            http.send(
+              path.method,
+              get_path(path),
+              get_headers(body, audit_log_reason),
+              **kwargs,
+            )
           end
         data = get_response_data(resp)
         @ratelimit_handler.save(path, resp)
-        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+        handle_response(resp, data, path, body, nil, audit_log_reason, kwargs)
       end
     end
 
@@ -58,7 +67,6 @@ module Discorb
     # @param [Discorb::Route] path The path to the resource.
     # @param [String, Hash] body The body of the request.
     # @param [Array<Discorb::Attachment>] files The files to upload.
-    # @param [Hash] headers The headers to send with the request.
     # @param [String] audit_log_reason The audit log reason to send with the request.
     # @param [Hash] kwargs The keyword arguments.
     #
@@ -67,14 +75,15 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def multipart_request(path, body, files, headers: nil, audit_log_reason: nil, **kwargs)
+    def multipart_request(path, body, files, audit_log_reason: nil, **kwargs)
       Async do |_task|
         @ratelimit_handler.wait(path)
         req = Net::HTTP.const_get(path.method.to_s.capitalize).new(
           get_path(path),
-          get_headers(headers, body, audit_log_reason),
+          get_headers(body, audit_log_reason),
           **kwargs,
         )
+        # @type var data: Array[untyped]
         data = [
           ["payload_json", get_body(body)],
         ]
@@ -83,10 +92,13 @@ module Discorb
 
           if file.created_by == :discord
             request_io = StringIO.new(
-              cdn_http.get(URI.parse(file.url).path, {
-                             "Content-Type" => nil,
-                             "User-Agent" => Discorb::USER_AGENT,
-                           }).body
+              cdn_http.get(
+                (URI.parse(file.url).path || raise("Could not parse url")),
+                {
+                  "Content-Type" => nil,
+                  "User-Agent" => Discorb::USER_AGENT,
+                }
+              ).body
             )
             data << ["files[#{i}]", request_io, { filename: file.filename, content_type: file.content_type }]
           else
@@ -97,10 +109,11 @@ module Discorb
         session = Net::HTTP.new("discord.com", 443)
         session.use_ssl = true
         resp = session.request(req)
-        files&.then { _1.filter(&:will_close).each { |f| f.io.close } }
-        data = get_response_data(resp)
+        resp_data = get_response_data(resp)
         @ratelimit_handler.save(path, resp)
-        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+        response = handle_response(resp, resp_data, path, body, files, audit_log_reason, kwargs)
+        files&.then { _1.filter(&:will_close).each { |f| f.io.close } }
+        response
       end
     end
 
@@ -110,12 +123,16 @@ module Discorb
 
     private
 
-    def handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+    def handle_response(resp, data, path, body, files, audit_log_reason, kwargs)
       case resp.code
       when "429"
         @client.logger.info("Rate limit exceeded for #{path.method} #{path.url}, waiting #{data[:retry_after]} seconds")
         sleep(data[:retry_after])
-        request(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
+        if files
+          multipart_request(path, body, files, audit_log_reason: audit_log_reason, **kwargs).wait
+        else
+          request(path, body, audit_log_reason: audit_log_reason, **kwargs).wait
+        end
       when "400"
         raise BadRequestError.new(resp, data)
       when "401"
@@ -129,14 +146,19 @@ module Discorb
       end
     end
 
-    def get_headers(headers, body = "", audit_log_reason = nil)
+    def get_headers(body = "", audit_log_reason = nil)
       ret = if body.nil? || body == ""
-              { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}" }
+          {
+            "User-Agent" => USER_AGENT,
+            "authorization" => "Bot #{@client.token}",
+          }
         else
-          { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}",
-            "content-type" => "application/json", }
+          {
+            "User-Agent" => USER_AGENT,
+            "authorization" => "Bot #{@client.token}",
+            "content-type" => "application/json",
+          }
         end
-      ret.merge!(headers) if !headers.nil? && headers.length.positive?
       ret["X-Audit-Log-Reason"] = audit_log_reason unless audit_log_reason.nil?
       ret
     end
@@ -153,7 +175,7 @@ module Discorb
 
     def get_path(path)
       full_path = if path.url.start_with?("https://")
-                    path.url
+          path.url
         else
           API_BASE_URL + path.url
         end
@@ -166,7 +188,7 @@ module Discorb
         data = JSON.parse(resp.body, symbolize_names: true)
       rescue JSON::ParserError, TypeError
         data = if resp.body.nil? || resp.body.empty?
-                 nil
+            {}
           else
             resp.body
           end

data/lib/discorb/integration.rb

@@ -72,7 +72,7 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete!(reason: nil)
+    def delete(reason: nil)
       Async do
         @client.http.request(
           Route.new("/guilds/#{@guild}/integrations/#{@id}", "//guilds/:guild_id/integrations/:integration_id",
@@ -81,7 +81,7 @@ module Discorb
       end
     end
 
-    alias destroy! delete!
+    alias destroy delete
 
     private
 

data/lib/discorb/intents.rb

@@ -23,6 +23,8 @@ module Discorb
       dm_typing: 1 << 14,
       message_content: 1 << 15,
       scheduled_events: 1 << 16,
+      automod_configuration: 1 << 20,
+      automod_execution: 1 << 21,
     }.freeze
 
     #
@@ -44,29 +46,34 @@ module Discorb
     # @param dm_typing [Boolean] Whether dm typing related events are enabled.
     # @param message_content [Boolean] Whether message content will be sent with events.
     # @param scheduled_events [Boolean] Whether events related scheduled events are enabled.
-    #
+    # @param automod_configuration [Boolean] Whether automod configuration related events are enabled.
+    # @param automod_execution [Boolean] Whether automod execution related events are enabled.
     # @note You must enable privileged intents to use `members` and/or `presences` intents.
     # @note Message Content Intent is not required to use `message_content` intents for now,
     #   this will be required in September 1, 2022. [Learn More](https://support-dev.discord.com/hc/en-us/articles/4404772028055).
     #   You should specify `message_content` intent for preventing unexpected changes in the future.
     #
-    def initialize(guilds: true,
-                   members: false,
-                   bans: true,
-                   emojis: true,
-                   integrations: true,
-                   webhooks: true,
-                   invites: true,
-                   voice_states: true,
-                   presences: false,
-                   messages: true,
-                   reactions: true,
-                   typing: true,
-                   dm_messages: true,
-                   dm_reactions: true,
-                   dm_typing: true,
-                   message_content: nil,
-                   scheduled_events: true)
+    def initialize(
+      guilds: true,
+      members: false,
+      bans: true,
+      emojis: true,
+      integrations: true,
+      webhooks: true,
+      invites: true,
+      voice_states: true,
+      presences: false,
+      messages: true,
+      reactions: true,
+      typing: true,
+      dm_messages: true,
+      dm_reactions: true,
+      dm_typing: true,
+      message_content: nil,
+      scheduled_events: true,
+      automod_configuration: true,
+      automod_execution: true
+    )
       @raw_value = {
         guilds: guilds,
         members: members,
@@ -85,6 +92,8 @@ module Discorb
         dm_typing: dm_typing,
         message_content: message_content,
         scheduled_events: scheduled_events,
+        automod_configuration: automod_configuration,
+        automod_execution: automod_execution,
       }
     end
 

data/lib/discorb/interaction/command.rb

@@ -83,21 +83,25 @@ module Discorb
               when 3, 4, 5, 10
                 option[:value]
               when 6
-                members[option[:value]] || guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
+                members[option[:value]] || guild && (guild.members[option[:value]] ||
+                                                     guild.fetch_member(option[:value]).wait)
               when 7
-                guild.channels[option[:value]] || guild.fetch_channels.wait.find do |channel|
-                  channel.id == option[:value]
+                if guild
+                  guild.channels[option[:value]] || guild.fetch_channels.wait.find do |channel|
+                    channel.id == option[:value]
+                  end
                 end
               when 8
-                guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+                guild && (guild.roles[option[:value]] ||
+                          guild.fetch_roles.wait.find { |role| role.id == option[:value] })
               when 9
                 members[option[:value]] ||
-                guild.members[option[:value]] ||
-                guild.roles[option[:value]] ||
-                guild.fetch_member(option[:value]).wait ||
-                guild.fetch_roles.wait.find do |role|
-                  role.id == option[:value]
-                end
+                guild && (guild.members[option[:value]] ||
+                          guild.roles[option[:value]] ||
+                          guild.fetch_member(option[:value]).wait ||
+                          guild.fetch_roles.wait.find do |role|
+                            role.id == option[:value]
+                          end)
               when 11
                 attachments[option[:value]]
               end