discordrb 3.6.1 → 3.7.0

data/lib/discordrb/data/member.rb

@@ -13,7 +13,8 @@ module Discordrb
       started_home_actions: 1 << 5,
       completed_home_actions: 1 << 6,
       automod_quarantined_username: 1 << 7,
-      dm_settings_upsell_acknowledged: 1 << 9
+      dm_settings_upsell_acknowledged: 1 << 9,
+      automod_quarantined_server_tag: 1 << 10
     }.freeze
 
     # @return [Time] when this member joined the server.
@@ -228,7 +229,7 @@ module Discordrb
     def add_role(role, reason = nil)
       role_ids = role_id_array(role)
 
-      if role_ids.count.one?
+      if role_ids.one?
         API::Server.add_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
       else
         old_role_ids = resolve_role_ids
@@ -243,7 +244,7 @@ module Discordrb
     def remove_role(role, reason = nil)
       role_ids = role_id_array(role)
 
-      if role_ids.count.one?
+      if role_ids.one?
         API::Server.remove_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
       else
         old_role_ids = resolve_role_ids
@@ -284,6 +285,12 @@ module Discordrb
 
     alias_method :color, :colour
 
+    # Get the member's roles sorted by their order in the hierarchy.
+    # @return [Array<Role>] the roles the member has, ordered by hierarchy.
+    def sort_roles
+      roles.sort_by { |role| [role.position, role.id] }
+    end
+
     # Server deafens this member.
     # @param reason [String, nil] The reason for defeaning this member.
     def server_deafen(reason: nil)
@@ -377,6 +384,30 @@ module Discordrb
       update_member_data(flags: flags)
     end
 
+    # Set the server banner for the current bot.
+    # @param banner [File, nil] A file like object that responds to read, or `nil`.
+    def server_banner=(banner)
+      raise 'Can only set a banner for the current bot' unless current_bot?
+
+      update_current_member_data(banner: banner.respond_to?(:read) ? Discordrb.encode64(banner) : banner)
+    end
+
+    # Set the server avatar for the current bot.
+    # @param avatar [File, nil] A file like object that responds to read, or `nil`.
+    def server_avatar=(avatar)
+      raise 'Can only set an avatar for the current bot' unless current_bot?
+
+      update_current_member_data(avatar: avatar.respond_to?(:read) ? Discordrb.encode64(avatar) : avatar)
+    end
+
+    # Set the server bio for the current bot.
+    # @param bio [String, nil] The new server bio for the bot, or nil.
+    def server_bio=(bio)
+      raise 'Can only set a bio for the current bot' unless current_bot?
+
+      update_current_member_data(bio: bio)
+    end
+
     # Update this member's roles
     # @note For internal use only.
     # @!visibility private
@@ -430,7 +461,7 @@ module Discordrb
         @communication_disabled_until = timeout_until ? Time.parse(timeout_until) : nil
       end
 
-      if data.key('premium_since')
+      if data.key?('premium_since')
         @boosting_since = data['premium_since'] ? Time.parse(data['premium_since']) : nil
       end
 
@@ -483,7 +514,10 @@ module Discordrb
     def update_current_member_data(new_data)
       update_data(JSON.parse(API::Server.update_current_member(@bot.token, @server_id,
                                                                new_data.key?(:nick) ? new_data[:nick] : :undef,
-                                                               new_data[:reason])))
+                                                               new_data[:reason],
+                                                               new_data.key?(:bio) ? new_data[:bio] : :undef,
+                                                               new_data.key?(:banner) ? new_data[:banner] : :undef,
+                                                               new_data.key?(:avatar) ? new_data[:avatar] : :undef)))
     end
   end
 end

data/lib/discordrb/data/message.rb

@@ -92,9 +92,6 @@ module Discordrb
     # @return [Array<User>] the users that were mentioned in this message.
     attr_reader :mentions
 
-    # @return [Array<Role>] the roles that were mentioned in this message.
-    attr_reader :role_mentions
-
     # @return [Array<Attachment>] the files attached to this message.
     attr_reader :attachments
 
@@ -127,9 +124,6 @@ module Discordrb
     # @return [Integer] what the type of the message is
     attr_reader :type
 
-    # @return [Server, nil] the server in which this message was sent.
-    attr_reader :server
-
     # @return [Integer, nil] the webhook ID that sent this message, or `nil` if it wasn't sent through a webhook.
     attr_reader :webhook_id
 
@@ -151,9 +145,16 @@ module Discordrb
     # @return [Array<Snapshot>] the message snapshots included in this message.
     attr_reader :snapshots
 
+    # @return [RoleSubscriptionData, nil] the role subscription purchase or renewal that prompted this message.
+    attr_reader :role_subscription
+
+    # @return [Integer] a generally increasing integer that can be used to determine this message's position in a thread.
+    attr_reader :position
+
     # @!visibility private
     def initialize(data, bot)
       @bot = bot
+      @id = data['id'].to_i
       @content = data['content']
       @channel = bot.channel(data['channel_id'].to_i)
       @pinned = data['pinned']
@@ -161,14 +162,11 @@ module Discordrb
       @tts = data['tts']
       @nonce = data['nonce']
       @mention_everyone = data['mention_everyone']
+      @webhook_id = data['webhook_id']&.to_i
 
       @referenced_message = Message.new(data['referenced_message'], bot) if data['referenced_message']
       @message_reference = data['message_reference']
 
-      @server = @channel.server
-
-      @webhook_id = data['webhook_id']&.to_i
-
       if data['author']
         if @webhook_id
           # This is a webhook user! It would be pointless to try to resolve a member here, so we just create
@@ -188,7 +186,6 @@ module Discordrb
       @timestamp = Time.parse(data['timestamp']) if data['timestamp']
       @edited_timestamp = data['edited_timestamp'].nil? ? nil : Time.parse(data['edited_timestamp'])
       @edited = !@edited_timestamp.nil?
-      @id = data['id'].to_i
 
       @emoji = []
 
@@ -204,14 +201,7 @@ module Discordrb
         @mentions << bot.ensure_user(element)
       end
 
-      @role_mentions = []
-
-      # Role mentions can only happen on public servers so make sure we only parse them there
-      if @channel.text?
-        data['mention_roles']&.each do |element|
-          @role_mentions << @channel.server.role(element.to_i)
-        end
-      end
+      @mention_roles = data['mention_roles']&.map(&:to_i) || []
 
       @attachments = []
       @attachments = data['attachments'].map { |e| Attachment.new(e, self, @bot) } if data['attachments']
@@ -224,13 +214,17 @@ module Discordrb
 
       @flags = data['flags'] || 0
 
-      @thread = data['thread'] ? @bot.ensure_channel(data['thread'], @server) : nil
+      @thread = data['thread'] ? @bot.ensure_channel(data['thread']) : nil
 
       @pinned_at = data['pinned_at'] ? Time.parse(data['pinned_at']) : nil
 
       @call = data['call'] ? Call.new(data['call'], @bot) : nil
 
       @snapshots = data['message_snapshots']&.map { |snapshot| Snapshot.new(snapshot['message'], @bot) } || []
+
+      @role_subscription = RoleSubscriptionData.new(data['role_subscription_data'], self, @bot) if data['role_subscription_data']
+
+      @position = data['position'] || 0
     end
 
     # @return [Member, User] the user that sent this message. (Will be a {Member} most of the time, it should only be a
@@ -238,7 +232,7 @@ module Discordrb
     def author
       return @author if @author
 
-      if @channel.server
+      unless @channel.private?
         @author = @channel.server.member(@author_id)
         Discordrb::LOGGER.debug("Member with ID #{@author_id} not cached (possibly left the server).") if @author.nil?
       end
@@ -249,6 +243,25 @@ module Discordrb
     alias_method :user, :author
     alias_method :writer, :author
 
+    # @return [Server, nil] the server this message was sent in. If this message was sent in a PM channel, it will be nil.
+    # @raise [Discordrb::Errors::NoPermission] This can happen when receiving interactions for servers in which the bot is not
+    #   authorized with the `bot` scope.
+    def server
+      return if @channel.private?
+
+      @server ||= @channel.server
+    end
+
+    # Get the roles that were mentioned in this message.
+    # @return [Array<Role>] the roles that were mentioned in this message.
+    # @raise [Discordrb::Errors::NoPermission] This can happen when receiving interactions for servers in which the bot is not
+    #   authorized with the `bot` scope.
+    def role_mentions
+      return [] if @channel.private? || @mention_roles.empty?
+
+      @role_mentions ||= @mention_roles.map { |id| server.role(id) }
+    end
+
     # Replies to this message with the specified content.
     # @deprecated Please use {#respond}.
     # @param content [String] The content to send. Should not be longer than 2000 characters or it will result in an error.
@@ -297,12 +310,14 @@ module Discordrb
     end
 
     # Deletes this message.
+    # @return [nil]
     def delete(reason = nil)
       API::Channel.delete_message(@bot.token, @channel.id, @id, reason)
       nil
     end
 
     # Pins this message
+    # @return [nil]
     def pin(reason = nil)
       API::Channel.pin_message(@bot.token, @channel.id, @id, reason)
       @pinned = true
@@ -310,6 +325,7 @@ module Discordrb
     end
 
     # Unpins this message
+    # @return [nil]
     def unpin(reason = nil)
       API::Channel.unpin_message(@bot.token, @channel.id, @id, reason)
       @pinned = false
@@ -317,6 +333,7 @@ module Discordrb
     end
 
     # Crossposts a message in a news channel.
+    # @return [Message] the updated message object.
     def crosspost
       response = API::Channel.crosspost_message(@bot.token, @channel.id, @id)
       Message.new(JSON.parse(response), @bot)
@@ -405,6 +422,7 @@ module Discordrb
 
     # Reacts to a message.
     # @param reaction [String, #to_reaction] the unicode emoji or {Emoji}
+    # @return [nil]
     def create_reaction(reaction)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
       API::Channel.create_reaction(@bot.token, @channel.id, @id, reaction)
@@ -416,15 +434,17 @@ module Discordrb
     # Returns the list of users who reacted with a certain reaction.
     # @param reaction [String, #to_reaction] the unicode emoji or {Emoji}
     # @param limit [Integer] the limit of how many users to retrieve. `nil` will return all users
+    # @param type [Integer, Symbol] the type of reaction to get. See {Reaction::TYPES}
     # @example Get all the users that reacted with a thumbs up.
     #   thumbs_up_reactions = message.reacted_with("\u{1F44D}")
     # @return [Array<User>] the users who used this reaction
-    def reacted_with(reaction, limit: 100)
+    def reacted_with(reaction, limit: 100, type: :normal)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
       reaction = reaction.to_s if reaction.respond_to?(:to_s)
+      type = Reaction::TYPES[type] || type
 
       get_reactions = proc do |fetch_limit, after_id = nil|
-        resp = API::Channel.get_reactions(@bot.token, @channel.id, @id, reaction, nil, after_id, fetch_limit)
+        resp = API::Channel.get_reactions(@bot.token, @channel.id, @id, reaction, nil, after_id, fetch_limit, type)
         JSON.parse(resp).map { |d| User.new(d, @bot) }
       end
 
@@ -473,6 +493,13 @@ module Discordrb
       API::Channel.delete_all_reactions(@bot.token, @channel.id, @id)
     end
 
+    # Removes all reactions for a single emoji.
+    # @param reaction [String, #to_reaction] the reaction to remove.
+    def delete_all_reactions_for_emoji(reaction)
+      reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
+      API::Channel.delete_all_emoji_reactions(@bot.token, @channel.id, @id, reaction.to_s)
+    end
+
     # The inspect method is overwritten to give more useful output
     def inspect
       "<Message content=\"#{@content}\" id=#{@id} timestamp=#{@timestamp} author=#{@author} channel=#{@channel}>"
@@ -480,7 +507,7 @@ module Discordrb
 
     # @return [String] a URL that a user can use to navigate to this message in the client
     def link
-      "https://discord.com/channels/#{@server&.id || '@me'}/#{@channel.id}/#{@id}"
+      "https://discord.com/channels/#{server&.id || '@me'}/#{@channel.id}/#{@id}"
     end
 
     alias_method :jump_link, :link

data/lib/discordrb/data/overwrite.rb

@@ -65,9 +65,8 @@ module Discordrb
 
     # Comparison by attributes [:id, :type, :allow, :deny]
     def ==(other)
-      # rubocop:disable Lint/Void
-      false unless other.is_a? Discordrb::Overwrite
-      # rubocop:enable Lint/Void
+      return false unless other.is_a?(Discordrb::Overwrite)
+
       id == other.id &&
         type == other.type &&
         allow == other.allow &&

data/lib/discordrb/data/primary_server.rb

@@ -52,7 +52,7 @@ module Discordrb
     def ==(other)
       return false unless other.is_a?(PrimaryServer)
 
-      Discordrb.id_compare(other.server_id, @server_id)
+      Discordrb.id_compare?(other.server_id, @server_id)
     end
 
     alias_method :eql?, :==

data/lib/discordrb/data/profile.rb

@@ -19,8 +19,8 @@ module Discordrb
     alias_method :name=, :username=
 
     # Changes the bot's avatar.
-    # @param avatar [String, #read] A JPG file to be used as the avatar, either
-    #  something readable (e.g. File Object) or as a data URL.
+    # @param avatar [String, File, #read, nil] A file to be used as the avatar, either
+    #  something readable (e.g. File Object) or a data URI.
     def avatar=(avatar)
       if avatar.respond_to?(:read)
         update_profile_data(avatar: Discordrb.encode64(avatar))
@@ -29,38 +29,24 @@ module Discordrb
       end
     end
 
+    # Changes the bot's banner.
+    # @param banner [String, File, #read, nil] A file to be used as the banner, either
+    #  something readable (e.g. File Object) or a data URI.
+    def banner=(banner)
+      if banner.respond_to?(:read)
+        update_profile_data(banner: Discordrb.encode64(banner))
+      else
+        update_profile_data(banner: banner)
+      end
+    end
+
     # Updates the cached profile data with the new one.
     # @note For internal use only.
     # @!visibility private
     def update_data(new_data)
-      @username = new_data[:username] || @username
-      @avatar_id = new_data[:avatar_id] || @avatar_id
-    end
-
-    # Sets the user status setting to Online.
-    # @note Only usable on User accounts.
-    def online
-      update_profile_status_setting('online')
-    end
-
-    # Sets the user status setting to Idle.
-    # @note Only usable on User accounts.
-    def idle
-      update_profile_status_setting('idle')
-    end
-
-    # Sets the user status setting to Do Not Disturb.
-    # @note Only usable on User accounts.
-    def dnd
-      update_profile_status_setting('dnd')
-    end
-
-    alias_method(:busy, :dnd)
-
-    # Sets the user status setting to Invisible.
-    # @note Only usable on User accounts.
-    def invisible
-      update_profile_status_setting('invisible')
+      @username = new_data['username']
+      @avatar_id = new_data['avatar']
+      @banner_id = new_data['banner']
     end
 
     # The inspect method is overwritten to give more useful output
@@ -70,17 +56,12 @@ module Discordrb
 
     private
 
-    # Internal handler for updating the user's status setting
-    def update_profile_status_setting(status)
-      API::User.change_status_setting(@bot.token, status)
-    end
-
+    # @!visibility private
     def update_profile_data(new_data)
-      API::User.update_profile(@bot.token,
-                               nil, nil,
-                               new_data[:username] || @username,
-                               new_data.key?(:avatar) ? new_data[:avatar] : @avatar_id)
-      update_data(new_data)
+      update_data(JSON.parse(API::User.update_current_user(@bot.token,
+                                                           new_data[:username] || :undef,
+                                                           new_data.key?(:avatar) ? new_data[:avatar] : :undef,
+                                                           new_data.key?(:banner) ? new_data[:banner] : :undef)))
     end
   end
 end

data/lib/discordrb/data/reaction.rb

@@ -3,7 +3,13 @@
 module Discordrb
   # A reaction to a message.
   class Reaction
-    # @return [Integer] the amount of users who have reacted with this reaction
+    # Map of reaction types.
+    TYPES = {
+      normal: 0,
+      burst: 1
+    }.freeze
+
+    # @return [Integer] the total amount of users who have reacted with this reaction (including burst reactions)
     attr_reader :count
 
     # @return [true, false] whether the current bot or user used this reaction
@@ -16,12 +22,30 @@ module Discordrb
     # @return [String] the name or unicode representation of the emoji
     attr_reader :name
 
+    # @return [true, false] whether the current bot or user used this reaction as a burst reaction
+    attr_reader :me_burst
+    alias_method :me_burst?, :me_burst
+
+    # @return [Array<ColourRGB>] an array of colors used for animations in burst reactions
+    attr_reader :burst_colours
+    alias_method :burst_colors, :burst_colours
+
+    # @return [Integer] the total amount of users who have reacted with this reaction as a burst reaction
+    attr_reader :burst_count
+
+    # @return [Integer] the total amount of users who have reacted with this reaction as a normal reaction
+    attr_reader :normal_count
+
     # @!visibility private
     def initialize(data)
       @count = data['count']
       @me = data['me']
       @id = data['emoji']['id']&.to_i
       @name = data['emoji']['name']
+      @me_burst = data['me_burst']
+      @burst_colours = data['burst_colors'].map { |b| ColourRGB.new(b.delete('#')) }
+      @burst_count = data['count_details']['burst']
+      @normal_count = data['count_details']['normal']
     end
 
     # Converts this Reaction into a string that can be sent back to Discord in other reaction endpoints.

data/lib/discordrb/data/role_subscription.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Discordrb
+  # Metadata about a purchase or renewal for a role subscription.
+  class RoleSubscriptionData
+    # @return [String] the name of the tier the user is subscribed to.
+    attr_reader :tier_name
+
+    # @return [Integer] the ID of the SKU and listing the user is subscribed to.
+    attr_reader :listing_id
+
+    # @return [true, false] whether the subscription notification is for a renewal.
+    attr_reader :renewal
+    alias_method :renewal?, :renewal
+
+    # @return [Integer] the total number of months the user has been subscribed for.
+    attr_reader :total_months_subscribed
+
+    # @!visibility private
+    def initialize(data, message, bot)
+      @bot = bot
+      @message = message
+      @renewal = data['is_renewal']
+      @tier_name = data['tier_name']
+      @listing_id = data['role_subscription_listing_id']&.to_i
+      @total_months_subscribed = data['total_months_subscribed']
+    end
+
+    # Check if this role subscription is a new purchase.
+    # @return [true, false] if this role subscription is a new purchase.
+    def new?
+      @renewal == false
+    end
+
+    # Get the role associated with the notification for this subscription.
+    # @return [Role, nil] the role that's associated with this subscription.
+    def role
+      @message.server.roles.find { |role| role.tags&.subscription_listing_id == @listing_id }
+    end
+  end
+end

data/lib/discordrb/data/server.rb

@@ -68,6 +68,8 @@ module Discordrb
       @members = {}
       @voice_states = {}
       @emoji = {}
+      @channels = []
+      @channels_by_id = {}
 
       update_data(data)
 
@@ -328,8 +330,8 @@ module Discordrb
     # @return [String, nil] the widget URL to the server that displays the amount of online members in a
     #   stylish way. `nil` if the widget is not enabled.
     def widget_url
-      update_data if @embed_enabled.nil?
-      return unless @embed_enabled
+      update_data if @widget_enabled.nil?
+      return unless @widget_enabled
 
       API.widget_url(@id)
     end
@@ -343,8 +345,8 @@ module Discordrb
     # @return [String, nil] the widget banner URL to the server that displays the amount of online members,
     #   server icon and server name in a stylish way. `nil` if the widget is not enabled.
     def widget_banner_url(style)
-      update_data if @embed_enabled.nil?
-      return unless @embed_enabled
+      update_data if @widget_enabled.nil?
+      return unless @widget_enabled
 
       API.widget_url(@id, style)
     end

data/lib/discordrb/data.rb

@@ -46,3 +46,4 @@ require 'discordrb/data/primary_server'
 require 'discordrb/data/server_preview'
 require 'discordrb/data/call'
 require 'discordrb/data/snapshot'
+require 'discordrb/data/role_subscription'

data/lib/discordrb/events/interactions.rb

@@ -27,7 +27,13 @@ module Discordrb::Events
     # @!attribute [r] user
     #   @return [User]
     #   @see Interaction#user
-    delegate :type, :server, :server_id, :channel, :channel_id, :user, to: :interaction
+    # @!attribute [r] user_locale
+    #   @return [String]
+    #   @see Interaction#user_locale
+    # @!attribute [r] context
+    #   @return [Integer]
+    #   @see Interaction#context
+    delegate :type, :server, :server_id, :channel, :channel_id, :user, :user_locale, :context, to: :interaction
 
     # @!visibility private
     def initialize(data, bot)

data/lib/discordrb/events/message.rb

@@ -287,11 +287,40 @@ module Discordrb::Events
     end
   end
 
-  # @see Discordrb::EventContainer#mention
-  class MentionEvent < MessageEvent; end
+  # Event raised when the current bot is mentioned in a message.
+  class MentionEvent < MessageEvent
+    # @return [true, false] whether this mention event was raised
+    #   due to a mention of the bot's auto-generated server role.
+    attr_reader :role_mention
+    alias_method :role_mention?, :role_mention
+
+    # @!visibility private
+    def initialize(message, bot, role_mention)
+      super(message, bot)
+
+      @role_mention = role_mention
+    end
+  end
 
   # Event handler for {MentionEvent}
-  class MentionEventHandler < MessageEventHandler; end
+  class MentionEventHandler < MessageEventHandler
+    # @!visibility private
+    def matches?(event)
+      return false unless super
+      return false unless event.is_a?(MentionEvent)
+
+      [
+        matches_all(@attributes[:role_mention], event.role_mention) do |a, e|
+          case a
+          when TrueClass
+            e == true
+          when FalseClass
+            e == false
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
 
   # @see Discordrb::EventContainer#pm
   class PrivateMessageEvent < MessageEvent; end

data/lib/discordrb/events/reactions.rb

@@ -14,6 +14,17 @@ module Discordrb::Events
     # @!visibility private
     attr_reader :message_id
 
+    # @return [true, false] whether the reaction is a burst reaction.
+    attr_reader :burst
+    alias_method :burst?, :burst
+
+    # @return [Integer] the type of the reaction. 0 for normal, 1 for burst.
+    attr_reader :type
+
+    # @return [Array<ColourRGB>] an array of colors used for animations in burst reactions.
+    attr_reader :burst_colours
+    alias_method :burst_colors, :burst_colours
+
     # @!visibility private
     def initialize(data, bot)
       @bot = bot
@@ -22,6 +33,9 @@ module Discordrb::Events
       @user_id = data['user_id'].to_i
       @message_id = data['message_id'].to_i
       @channel_id = data['channel_id'].to_i
+      @burst = data['burst']
+      @type = data['type']
+      @burst_colours = data['burst_colors']&.map { |b| Discordrb::ColourRGB.new(b.delete('#')) } || []
     end
 
     # @return [User, Member] the user that reacted to this message, or member if a server exists.
@@ -90,6 +104,14 @@ module Discordrb::Events
           else
             a == e
           end
+        end,
+        matches_all(@attributes[:type], event.type) do |a, e|
+          case a
+          when Integer
+            a == e
+          when Symbol, String
+            Discordrb::Reaction::TYPES[a.to_sym] == e
+          end
         end
       ].reduce(true, &:&)
     end
@@ -157,4 +179,40 @@ module Discordrb::Events
       ].reduce(true, &:&)
     end
   end
+
+  # Event raised when all instances of a single reaction are removed from a message.
+  class ReactionRemoveEmojiEvent < ReactionRemoveAllEvent
+    # @return [Emoji] the emoji that was removed.
+    attr_reader :emoji
+
+    # @!visibility private
+    def initialize(data, bot)
+      super
+
+      @emoji = Discordrb::Emoji.new(data['emoji'], bot)
+    end
+  end
+
+  # Event handler for {ReactionRemoveEmojiEvent}.
+  class ReactionRemoveEmojiEventHandler < ReactionRemoveAllEventHandler
+    # @!visibility private
+    def matches?(event)
+      # Check for the proper event type.
+      return false unless super
+      return false unless event.is_a?(ReactionRemoveEmojiEvent)
+
+      [
+        matches_all(@attributes[:emoji], event.emoji) do |a, e|
+          case a
+          when Integer
+            e.id == a
+          when String
+            e.name == a || e.name == a.delete(':') || e.id == a.resolve_id
+          else
+            e == a
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
 end