discordrb 3.1.1 → 3.2.0

data/lib/discordrb/events/generic.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/module'
-
 # Events used by discordrb
 module Discordrb::Events
   # A negated object, used to not match something in event parameters.
@@ -55,6 +53,24 @@ module Discordrb::Events
   class Event
     # @return [Bot] the bot used to initialize this event.
     attr_reader :bot
+
+    class << self
+      protected
+
+      # Delegates a list of methods to a particular object. This is essentially a reimplementation of ActiveSupport's
+      # `#delegate`, but without the overhead provided by the rest. Used in subclasses of `Event` to delegate properties
+      # on events to properties on data objects.
+      # @param methods [Array<Symbol>] The methods to delegate.
+      # @param hash [Hash<Symbol => Symbol>] A hash with one `:to` key and the value the method to be delegated to.
+      def delegate(*methods, hash)
+        methods.each do |e|
+          define_method(e) do
+            object = __send__(hash[:to])
+            object.__send__(e)
+          end
+        end
+      end
+    end
   end
 
   # Generic event handler that can be extended

data/lib/discordrb/events/guilds.rb

@@ -32,7 +32,7 @@ module Discordrb::Events
         matches_all(@attributes[:server], event.server) do |a, e|
           a == if a.is_a? String
                  e.name
-               elsif a.is_a? Fixnum
+               elsif a.is_a? Integer
                  e.id
                else
                  e
@@ -59,7 +59,7 @@ module Discordrb::Events
   # Server is deleted
   # @see Discordrb::EventContainer#server_delete
   class ServerDeleteEvent < ServerEvent
-    # Overide init_server to account for the deleted server
+    # Override init_server to account for the deleted server
     def init_server(data, bot)
       @server = Discordrb::Server.new(data, bot, false)
     end
@@ -67,4 +67,119 @@ module Discordrb::Events
 
   # Event handler for {ServerDeleteEvent}
   class ServerDeleteEventHandler < ServerEventHandler; end
+
+  # Emoji is created/deleted/updated
+  class ServerEmojiChangeEvent < ServerEvent
+    # @return [Server] the server in question.
+    attr_reader :server
+
+    # @return [Array<Emoji>] array of emojis.
+    attr_reader :emoji
+
+    def initialize(server, data, bot)
+      @bot = bot
+      @server = server
+      process_emoji(data)
+    end
+
+    def process_emoji(data)
+      @emoji = data['emojis'].map do |e|
+        @server.emoji[e['id']]
+      end
+    end
+  end
+
+  # Generic event helper for when an emoji is either created or deleted
+  class ServerEmojiCDEvent < ServerEvent
+    # @return [Server] the server in question.
+    attr_reader :server
+
+    # @return [Emoji] the emoji data.
+    attr_reader :emoji
+
+    def initialize(server, emoji, bot)
+      @bot = bot
+      @emoji = emoji
+      @server = server
+    end
+  end
+
+  # Emoji is created
+  class ServerEmojiCreateEvent < ServerEmojiCDEvent; end
+
+  # Emoji is deleted
+  class ServerEmojiDeleteEvent < ServerEmojiCDEvent; end
+
+  # Emoji is updated
+  class ServerEmojiUpdateEvent < ServerEvent
+    # @return [Server] the server in question.
+    attr_reader :server
+
+    # @return [Emoji, nil] the emoji data before the event.
+    attr_reader :old_emoji
+
+    # @return [Emoji, nil] the updated emoji data.
+    attr_reader :emoji
+
+    def initialize(server, old_emoji, emoji, bot)
+      @bot = bot
+      @old_emoji = old_emoji
+      @emoji = emoji
+      @server = server
+    end
+  end
+
+  # Event handler for {ServerEmojiChangeEvent}
+  class ServerEmojiChangeEventHandler < ServerEventHandler; end
+
+  # Generic handler for emoji create and delete
+  class ServerEmojiCDEventHandler < ServerEventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ServerEmojiCDEvent
+
+      [
+        matches_all(@attributes[:server], event.server) do |a, e|
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Integer
+                 e.id
+               else
+                 e
+               end
+        end,
+        matches_all(@attributes[:id], event.emoji.id) { |a, e| a.resolve_id == e.resolve_id },
+        matches_all(@attributes[:name], event.emoji.name) { |a, e| a == e }
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Event handler for {ServerEmojiCreateEvent}
+  class ServerEmojiCreateEventHandler < ServerEmojiCDEventHandler; end
+
+  # Event handler for {ServerEmojiDeleteEvent}
+  class ServerEmojiDeleteEventHandler < ServerEmojiCDEventHandler; end
+
+  # Event handler for {ServerEmojiUpdateEvent}
+  class ServerEmojiUpdateEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ServerEmojiUpdateEvent
+
+      [
+        matches_all(@attributes[:server], event.server) do |a, e|
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Integer
+                 e.id
+               else
+                 e
+               end
+        end,
+        matches_all(@attributes[:id], event.old_emoji.id) { |a, e| a.resolve_id == e.resolve_id },
+        matches_all(@attributes[:old_name], event.old_emoji.name) { |a, e| a == e },
+        matches_all(@attributes[:name], event.emoji.name) { |a, e| a == e }
+      ].reduce(true, &:&)
+    end
+  end
 end

data/lib/discordrb/events/message.rb

@@ -14,14 +14,14 @@ module Discordrb::Events
     # @param content [String] The message to send to the channel
     # @return [Discordrb::Message] the message that was sent
     def send_message(content)
-      @channel.send_message(content)
+      channel.send_message(content)
     end
 
     # Sends a temporary message to the channel this message was sent in, right now.
     # @param content [String] The content to send. Should not be longer than 2000 characters or it will result in an error.
     # @param timeout [Float] The amount of time in seconds after which the message sent will be deleted.
     def send_temporary_message(content, timeout)
-      @channel.send_temporary_message(content, timeout)
+      channel.send_temporary_message(content, timeout)
     end
 
     # Adds a string to be sent after the event has finished execution. Avoids problems with rate limiting because only
@@ -62,6 +62,7 @@ module Discordrb::Events
   # Event raised when a text message is sent to a channel
   class MessageEvent < Event
     include Respondable
+
     # @return [Message] the message which triggered this event.
     attr_reader :message
 
@@ -72,7 +73,7 @@ module Discordrb::Events
     attr_reader :file
 
     # @!attribute [r] author
-    #   @return [Member] who sent this message.
+    #   @return [Member, User] who sent this message.
     #   @see Message#author
     # @!attribute [r] channel
     #   @return [Channel] the channel in which this message was sent.
@@ -178,7 +179,7 @@ module Discordrb::Events
           if a.is_a? String
             # Make sure to remove the "#" from channel names in case it was specified
             a.delete('#') == e.name
-          elsif a.is_a? Fixnum
+          elsif a.is_a? Integer
             a == e.id
           else
             a == e
@@ -187,7 +188,7 @@ module Discordrb::Events
         matches_all(@attributes[:from], event.author) do |a, e|
           if a.is_a? String
             a == e.name
-          elsif a.is_a? Fixnum
+          elsif a.is_a? Integer
             a == e.id
           elsif a == :bot
             e.current_bot?
@@ -234,6 +235,7 @@ module Discordrb::Events
   # A subset of MessageEvent that only contains a message ID and a channel
   class MessageIDEvent < Event
     include Respondable
+
     # @return [Integer] the ID associated with this event
     attr_reader :id
 

data/lib/discordrb/events/presence.rb

@@ -34,7 +34,7 @@ module Discordrb::Events
         matches_all(@attributes[:from], event.user) do |a, e|
           a == if a.is_a? String
                  e.name
-               elsif a.is_a? Fixnum
+               elsif a.is_a? Integer
                  e.id
                else
                  e
@@ -89,25 +89,17 @@ module Discordrb::Events
         matches_all(@attributes[:from], event.user) do |a, e|
           a == if a.is_a? String
                  e.name
-               elsif a.is_a? Fixnum
+               elsif a.is_a? Integer
                  e.id
                else
                  e
                end
         end,
         matches_all(@attributes[:game], event.game) do |a, e|
-          a == if a.is_a? String
-                 e.name
-               else
-                 e
-               end
+          a == e
         end,
         matches_all(@attributes[:type], event.type) do |a, e|
-          a == if a.is_a? Integer
-                 e.type
-               else
-                 e
-               end
+          a == e
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/raw.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'discordrb/events/generic'
+
+# Event classes and handlers
+module Discordrb::Events
+  # Event raised when any dispatch is received
+  class RawEvent < Event
+    # @return [Symbol] the type of this dispatch.
+    attr_reader :type
+    alias_method :t, :type
+
+    # @return [Hash] the data of this dispatch.
+    attr_reader :data
+    alias_method :d, :data
+
+    def initialize(type, data, bot)
+      @type = type
+      @data = data
+      @bot = bot
+    end
+  end
+
+  # Event handler for {RawEvent}
+  class RawEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? RawEvent
+
+      [
+        matches_all(@attributes[:type] || @attributes[:t], event.type) do |a, e|
+          if a.is_a? Regexp
+            # 24: update to matches?
+            match = a.match(e)
+            match ? (e == match[0]) : false
+          else
+            e.to_s.casecmp(a.to_s).zero?
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Event raised when an unknown dispatch is received
+  class UnknownEvent < RawEvent; end
+
+  # Event handler for {UnknownEvent}
+  class UnknownEventHandler < RawEventHandler; end
+end

data/lib/discordrb/events/reactions.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  # Generic superclass for events about adding and removing reactions
+  class ReactionEvent
+    include Respondable
+
+    # @return [Emoji] the emoji that was reacted with.
+    attr_reader :emoji
+
+    def initialize(data, bot)
+      @bot = bot
+
+      @emoji = Discordrb::Emoji.new(data['emoji'], bot, nil)
+      @user_id = data['user_id'].to_i
+      @message_id = data['message_id'].to_i
+      @channel_id = data['channel_id'].to_i
+    end
+
+    # @return [User] the user that reacted to this message.
+    def user
+      # Cache the user so we don't do requests all the time
+      @user ||= @bot.user(@user_id)
+    end
+
+    # @return [Message] the message that was reacted to.
+    def message
+      @message ||= channel.load_message(@message_id)
+    end
+
+    # @return [Channel] the channel that was reacted in.
+    def channel
+      @channel ||= @bot.channel(@channel_id)
+    end
+  end
+
+  # Generic superclass for event handlers pertaining to adding and removing reactions
+  class ReactionEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ReactionEvent
+
+      [
+        matches_all(@attributes[:emoji], event.emoji) do |a, e|
+          if a.is_a? Integer
+            e.id == a
+          elsif a.is_a? String
+            e.name == a || e.name == a.delete(':') || e.id == a.resolve_id
+          else
+            e == a
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Event raised when somebody reacts to a message
+  class ReactionAddEvent < ReactionEvent; end
+
+  # Event handler for {ReactionAddEvent}
+  class ReactionAddEventHandler < ReactionEventHandler; end
+
+  # Event raised when somebody removes a reaction to a message
+  class ReactionRemoveEvent < ReactionEvent; end
+
+  # Event handler for {ReactionRemoveEvent}
+  class ReactionRemoveEventHandler < ReactionEventHandler; end
+
+  # Event raised when somebody removes all reactions from a message
+  class ReactionRemoveAllEvent
+    include Respondable
+
+    def initialize(data, bot)
+      @bot = bot
+
+      @message_id = data['message_id'].to_i
+      @channel_id = data['channel_id'].to_i
+    end
+
+    # @return [Channel] the channel where the removal occurred.
+    def channel
+      @channel ||= @bot.channel(@channel_id)
+    end
+
+    # @return [Message] the message all reactions were removed from.
+    def message
+      @message ||= channel.load_message(@message_id)
+    end
+  end
+
+  # Event handler for {ReactionRemoveAllEvent}
+  class ReactionRemoveAllEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ReactionRemoveAllEvent
+
+      # No attributes yet as there is no property available on the event that doesn't involve doing a resolution request
+      [].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/typing.rb

@@ -5,6 +5,8 @@ require 'discordrb/events/generic'
 module Discordrb::Events
   # Event raised when a user starts typing
   class TypingEvent < Event
+    include Respondable
+
     # @return [Channel] the channel on which a user started typing.
     attr_reader :channel
 
@@ -45,7 +47,7 @@ module Discordrb::Events
         matches_all(@attributes[:in], event.channel) do |a, e|
           if a.is_a? String
             a.delete('#') == e.name
-          elsif a.is_a? Fixnum
+          elsif a.is_a? Integer
             a == e.id
           else
             a == e
@@ -54,7 +56,7 @@ module Discordrb::Events
         matches_all(@attributes[:from], event.user) do |a, e|
           a == if a.is_a? String
                  e.name
-               elsif a.is_a? Fixnum
+               elsif a.is_a? Integer
                  e.id
                else
                  e

data/lib/discordrb/events/voice_state_update.rb

@@ -8,7 +8,10 @@ module Discordrb::Events
   class VoiceStateUpdateEvent < Event
     attr_reader :user, :token, :suppress, :session_id, :self_mute, :self_deaf, :mute, :deaf, :server, :channel
 
-    def initialize(data, bot)
+    # @return [Channel, nil] the old channel this user was on, or nil if the user is newly joining voice.
+    attr_reader :old_channel
+
+    def initialize(data, old_channel_id, bot)
       @bot = bot
 
       @token = data['token']
@@ -22,6 +25,7 @@ module Discordrb::Events
       return unless @server
 
       @channel = bot.channel(data['channel_id'].to_i) if data['channel_id']
+      @old_channel = bot.channel(old_channel_id) if old_channel_id
       @user = bot.user(data['user_id'].to_i)
     end
   end
@@ -71,9 +75,20 @@ module Discordrb::Events
                end
         end,
         matches_all(@attributes[:channel], event.channel) do |a, e|
+          next unless e # Don't bother if the channel is nil
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Integer
+                 e.id
+               else
+                 e
+               end
+        end,
+        matches_all(@attributes[:old_channel], event.old_channel) do |a, e|
+          next unless e # Don't bother if the channel is nil
           a == if a.is_a? String
                  e.name
-               elsif a.is_a? Fixnum
+               elsif a.is_a? Integer
                  e.id
                else
                  e