upgrades

Author: Droid00000

lib/discordrb/bot.rb

@@ -1216,7 +1216,7 @@ def update_guild_automod_rule(data)
       if rule
         rule.from_other(data)
       else
-        server&.cache_automod_rule(AutoModRule.new(data, self, server))
+        server&.cache_automod_rule(AutoModRule.new(data, server, self))
       end
     end
 

lib/discordrb/container.rb

@@ -685,7 +685,7 @@ def application_command_permissions_update(attributes = {}, &block)
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server A server to match against.
     # @option attributes [String, Regexp] :name A name to match against.
-    # @option attributes [String, Integer, AutoModRule] :automod_rule An automod rule to match against.
+    # @option attributes [String, Integer, AutoModRule] :id An automod rule to match against.
     # @option attributes [String, Integer, User, Member] :creator A creator to match against.
     # @option attributes [Symbol, Integer] :event_type An event type to match against.
     # @option attributes [Symbol, Integer] :trigger_type A trigger type to match against.
@@ -701,7 +701,7 @@ def automod_rule_create(attributes = {}, &block)
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server A server to match against.
     # @option attributes [String, Regexp] :name A name to match against.
-    # @option attributes [String, Integer, AutoModRule] :automod_rule An automod rule to match against.
+    # @option attributes [String, Integer, AutoModRule] :id An automod rule to match against.
     # @option attributes [String, Integer, User, Member] :creator A creator to match against.
     # @option attributes [Symbol, Integer] :event_type An event type to match against.
     # @option attributes [Symbol, Integer] :trigger_type A trigger type to match against.
@@ -717,7 +717,7 @@ def automod_rule_update(attributes = {}, &block)
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server A server to match against.
     # @option attributes [String, Regexp] :name A name to match against.
-    # @option attributes [String, Integer, AutoModRule] :automod_rule An automod rule to match against.
+    # @option attributes [String, Integer, AutoModRule] :id An automod rule to match against.
     # @option attributes [String, Integer, User, Member] :creator A creator to match against.
     # @option attributes [Symbol, Integer] :event_type An event type to match against.
     # @option attributes [Symbol, Integer] :trigger_type A trigger type to match against.

lib/discordrb/data/auto_moderation.rb

@@ -16,6 +16,9 @@ class AutoModRule
     # @return [String] the name of this automod rule.
     attr_reader :name
 
+    # @return [Server] the server this automod rule is form.
+    attr_reader :server
+
     # @return [Integer] the event type of this automod rule.
     # @see EVENT_TYPES
     attr_reader :event_type
@@ -37,11 +40,10 @@ class AutoModRule
     attr_reader :exempt_channels
 
     # @!visibility private
-    def initialize(data, bot, server = nil)
+    def initialize(data, server, bot)
       @bot = bot
       @server = server
       @id = data['id'].to_i
-      @server_id = data['guild_id'].to_i
       @creator_id = data['creator_id'].to_i
       from_other(data)
     end
@@ -51,11 +53,6 @@ def creator
       @bot.user(@creator_id)
     end
 
-    # @return [Server] the server this automod rule is associated with.
-    def server
-      @server ||= @bot.server(@server_id)
-    end
-
     # Check if something is exempt from this automod rule.
     # @param other [Role, Channel, Member] The thing to check for exemption.
     # @return [true, false] Whether the provided object is exempt or not.
@@ -121,8 +118,8 @@ def delete(reason: nil)
     end
 
     # Add one or more actions that will execute when this automod rule is triggered.
-    # @note Creating a new action for an existing type will overwrite the current one.
     # @yieldparam builder [ActionBuilder] builder subclass for creating automod actions.
+    # @note Creating a new action for an existing action type will overwrite the existing action.
     # @return [void]
     def create_actions
       yield (builder = ActionBuilder.new)
@@ -169,7 +166,7 @@ def from_other(new_data)
 
     # @!visibility private
     def update_data(new_data)
-      from_other(JSON.parse(API::Server.update_automod_rule(@bot.token, @server_id, @id,
+      from_other(JSON.parse(API::Server.update_automod_rule(@bot.token, @server.id, @id,
                                                             new_data[:name], new_data[:event_type],
                                                             new_data[:trigger], new_data[:actions],
                                                             new_data[:enabled], new_data[:exempt_roles],

lib/discordrb/data/server.rb

@@ -617,29 +617,31 @@ def max_emoji
     end
 
     # Get a single automod rule.
-    # @param id [Integer] The ID of the automod rule to look for.
-    # @param request [true, false] Whether the automod rule should be requested from Discord if it's not cached. Defaults to true.
+    # @param rule_id [Integer] The ID of the automod rule to look for.
+    # @param request [true, false] Whether the automod rule should be requested from Discord if it's not cached.
     # @return [AutoModRule, nil] the automod rule in question, or nil if it couldn't be found.
-    def automod_rule(id, request: true)
-      id = id.resolve_id
+    def automod_rule(rule_id, request: true)
+      id = rule_id.resolve_id
       return @automod_rules[id] if @automod_rules[id]
       return nil unless request
 
-      rule = AutoModRule.new(JSON.parse(API::Server.get_automod_rule(@bot.token, @id, id)), @bot, self)
+      rule = AutoModRule.new(JSON.parse(API::Server.get_automod_rule(@bot.token, @id, id)), self, @bot)
       @automod_rules[rule.resolve_id] = rule
     rescue StandardError
       nil
     end
 
     # Get a list of all the automod rules configured on the server.
+    # @param bypass_cache [true, false] Whether the cached automod rules
+    #   should be ignored and re-fetched via an HTTP request.
     # @return [Array<AutoModRule>] the configured automod rules on the server.
-    def automod_rules
-      return @automod_rules.values if @rules_chunked
+    def automod_rules(bypass_cache: false)
+      return @automod_rules.values if @rules_chunked && !bypass_cache
 
-      rules = API::Server.list_automod_rules(@bot.token, @id)
+      rules = JSON.parse(API::Server.list_automod_rules(@bot.token, @id))
 
-      JSON.parse(rules).each do |data|
-        element = AutoModRule.new(data, @bot, self)
+      rules.each do |data|
+        element = AutoModRule.new(data, self, @bot)
         @automod_rules[element.resolve_id] = element
       end
 
@@ -688,7 +690,7 @@ def create_automod_rule(name:, event_type:, trigger_type:, enabled: false, exemp
 
       response = API::Server.create_automod_rule(@bot.token, @id, name, event_type, trigger_type, metadata, builder.to_a, enabled,
                                                  exempt_roles.map(&:resolve_id), exempt_channels.map(&:resolve_id), reason)
-      rule = AutoModRule.new(JSON.parse(response), @bot, self)
+      rule = AutoModRule.new(JSON.parse(response), self, @bot)
       @automod_rules[rule.id] = rule
     end
 

lib/discordrb/events/auto_moderation.rb

@@ -30,7 +30,7 @@ class AutoModRuleDeleteEvent < AutoModRuleEvent
     def initialize(data, bot)
       @bot = bot
       @server = bot.server(data['guild_id'].to_i)
-      @automod_rule = Discordrb::AutoModRule.new(data, bot, @server)
+      @automod_rule = Discordrb::AutoModRule.new(data, @server, bot)
     end
   end
 
@@ -45,7 +45,7 @@ def matches?(event)
           a.resolve_id == e.resolve_id
         end,
 
-        matches_all(@attributes[:automod_rule], event.automod_rule) do |a, e|
+        matches_all(@attributes[:id], event.automod_rule) do |a, e|
           a.resolve_id == e.resolve_id
         end,