discordrb 1.5.4 → 1.6.0

data/lib/discordrb/events/bans.rb

@@ -0,0 +1,54 @@
+require 'discordrb/events/generic'
+
+module Discordrb::Events
+  # Raised when a user is banned
+  class UserBanEvent
+    # @return [User] the user that was banned
+    attr_reader :user
+
+    # @return [Server] the server from which the user was banned
+    attr_reader :server
+
+    # @!visibility private
+    def initialize(data, bot)
+      @user = bot.user(data['user']['id'].to_i)
+      @server = bot.server(data['guild_id'].to_i)
+      @bot = bot
+    end
+  end
+
+  # Event handler for {UserBanEvent}
+  class UserBanEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? UserBanEvent
+
+      [
+        matches_all(@attributes[:user], event.user) do |a, e|
+          if a.is_a? String
+            a == e.name
+          elsif a.is_a? Integer
+            a == e.id
+          elsif a == :bot
+            e.bot?
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:server], event.server) do |a, e|
+          if a.is_a? String
+            a == e.name
+          elsif a.is_a? Integer
+            a == e.id
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Raised when a user is unbanned from a server
+  class UserUnbanEvent < UserBanEvent; end
+  class UserUnbanEventHandler < UserBanEventHandler; end
+end

data/lib/discordrb/events/channel_create.rb

@@ -25,18 +25,18 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:type], event.type) do |a, e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/channel_delete.rb

@@ -25,18 +25,18 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:type], event.type) do |a, e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/channel_update.rb

@@ -27,18 +27,18 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:type], event.type) do |a, e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/guild_role_create.rb

@@ -23,11 +23,11 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/guild_role_delete.rb

@@ -24,11 +24,11 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/guild_role_update.rb

@@ -23,11 +23,11 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:name], event.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/guilds.rb

@@ -12,7 +12,6 @@ module Discordrb::Events
 
     def init_server(data, bot)
       @server = bot.server(data['id'].to_i)
-      return unless @server
     end
   end
 
@@ -24,13 +23,13 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:server], event.server) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Fixnum
+                 e.id
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/members.rb

@@ -39,11 +39,11 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:username], event.user.name) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/message.rb

@@ -95,4 +95,52 @@ module Discordrb::Events
 
   class PrivateMessageEvent < MessageEvent; end
   class PrivateMessageEventHandler < MessageEventHandler; end
+
+  # A subset of MessageEvent that only contains a message ID and a channel
+  class MessageIDEvent
+    # @return [Integer] the ID associated with this event
+    attr_reader :id
+
+    # @return [Channel] the channel in which this event occurred
+    attr_reader :channel
+
+    # @!visibility private
+    def initialize(data, bot)
+      @id = data['id'].to_i
+      @channel = bot.channel(data['channel_id'].to_i)
+      @bot = bot
+    end
+  end
+
+  # Event handler for {MessageIDEvent}
+  class MessageIDEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? MessageIDEvent
+
+      [
+        matches_all(@attributes[:id], event.id) do |a, e|
+          a.resolve_id == e.resolve_id
+        end,
+        matches_all(@attributes[:in], event.channel) do |a, e|
+          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? Integer
+            a == e.id
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Raised when a message is edited
+  class MessageEditEvent < MessageIDEvent; end
+  class MessageEditEventHandler < MessageIDEventHandler; end
+
+  # Raised when a message is deleted
+  class MessageDeleteEvent < MessageIDEvent; end
+  class MessageDeleteEventHandler < MessageIDEventHandler; end
 end

data/lib/discordrb/events/presence.rb

@@ -21,20 +21,20 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:from], event.user) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Fixnum
+                 e.id
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:status], event.status) do |a, e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end
@@ -47,11 +47,7 @@ module Discordrb::Events
     def initialize(data, bot)
       @user = bot.user(data['user']['id'].to_i)
 
-      if data['game']
-        @game = data['game']['name']
-      else
-        @game = nil
-      end
+      @game = data['game'] ? data['game']['name'] : nil
 
       @server = bot.server(data['guild_id'].to_i)
     end
@@ -65,20 +61,20 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:from], event.user) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Fixnum
+                 e.id
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:game], event.game) do |a, e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end

data/lib/discordrb/events/typing.rb

@@ -31,13 +31,13 @@ module Discordrb::Events
           end
         end,
         matches_all(@attributes[:from], event.user) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Fixnum
+                 e.id
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:after], event.timestamp) { |a, e| a > e },
         matches_all(@attributes[:before], event.timestamp) { |a, e| a < e }

data/lib/discordrb/events/voice_state_update.rb

@@ -30,50 +30,50 @@ module Discordrb::Events
 
       [
         matches_all(@attributes[:from], event.user) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Integer
+                 e.id
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:mute], event.mute) do |a, e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a?(TrueClass) || a.is_a?(FalseClass)
+                 e.to_s
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:deaf], event.deaf) do |a, e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a?(TrueClass) || a.is_a?(FalseClass)
+                 e.to_s
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:self_mute], event.self_mute) do |a, e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a?(TrueClass) || a.is_a?(FalseClass)
+                 e.to_s
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:self_deaf], event.self_deaf) do |a, e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
+          a == if a.is_a?(TrueClass) || a.is_a?(FalseClass)
+                 e.to_s
+               else
+                 e
+               end
         end,
         matches_all(@attributes[:channel], event.channel) do |a, e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
+          a == if a.is_a? String
+                 e.name
+               elsif a.is_a? Fixnum
+                 e.id
+               else
+                 e
+               end
         end
       ].reduce(true, &:&)
     end