discordrb 1.2.0 → 1.3.0

data/lib/discordrb/endpoints/endpoints.rb

@@ -1,16 +1,16 @@
-module Discordrb::Endpoints
-  BASE = "https://discordapp.com/"
-  APIBASE = BASE + "api"
-
-  #WEBSOCKET_HUB = "wss://discordapp.com/hub"
-  GATEWAY = APIBASE + "/gateway"
-
-  LOGIN = APIBASE + "/auth/login"
-  LOGOUT = APIBASE + "/auth/logout"
-
-  SERVERS = APIBASE + "/guilds"
-
-  CHANNELS = APIBASE + "/channels"
-
-  USERS = APIBASE + "/users"
-end
+module Discordrb::Endpoints
+  BASE = "https://discordapp.com/"
+  APIBASE = BASE + "api"
+
+  #WEBSOCKET_HUB = "wss://discordapp.com/hub"
+  GATEWAY = APIBASE + "/gateway"
+
+  LOGIN = APIBASE + "/auth/login"
+  LOGOUT = APIBASE + "/auth/logout"
+
+  SERVERS = APIBASE + "/guilds"
+
+  CHANNELS = APIBASE + "/channels"
+
+  USERS = APIBASE + "/users"
+end

data/lib/discordrb/events/channel-delete.rb

@@ -1,48 +1,48 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class ChannelDeleteEvent
-    attr_reader :type
-    attr_reader :topic
-    attr_reader :position
-    attr_reader :name
-    attr_reader :is_private
-    attr_reader :id
-    attr_reader :server
-
-    def initialize(data, bot)
-      @type = data['type']
-      @topic = data['topic']
-      @position = data['position']
-      @name = data['name']
-      @is_private = data['is_private']
-      @id = data['id'].to_i
-      @server = bot.server(data['guild_id'].to_i)
-    end
-  end
-
-  class ChannelDeleteEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ChannelDeleteEvent
-
-      return [
-        matches_all(@attributes[:type], event.type) do |a,e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == 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
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class ChannelDeleteEvent
+    attr_reader :type
+    attr_reader :topic
+    attr_reader :position
+    attr_reader :name
+    attr_reader :is_private
+    attr_reader :id
+    attr_reader :server
+
+    def initialize(data, bot)
+      @type = data['type']
+      @topic = data['topic']
+      @position = data['position']
+      @name = data['name']
+      @is_private = data['is_private']
+      @id = data['id'].to_i
+      @server = bot.server(data['guild_id'].to_i)
+    end
+  end
+
+  class ChannelDeleteEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ChannelDeleteEvent
+
+      return [
+        matches_all(@attributes[:type], event.type) do |a,e|
+          if a.is_a? String
+            a == e.name
+          else
+            a == 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
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/channel-update.rb

@@ -1,49 +1,49 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class ChannelUpdateEvent
-    attr_reader :type
-    attr_reader :topic
-    attr_reader :position
-    attr_reader :name
-    attr_reader :is_private
-    attr_reader :channel
-    attr_reader :server
-
-    def initialize(data, bot)
-      @type = data['type']
-      @topic = data['topic']
-      @position = data['position']
-      @name = data['name']
-      @is_private = data['is_private']
-      @server = bot.server(data['guild_id'].to_i)
-      return if !@server
-      @channel = bot.channel(data['id'].to_i)
-    end
-  end
-
-  class ChannelUpdateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ChannelUpdateEvent
-
-      return [
-        matches_all(@attributes[:type], event.type) do |a,e|
-          if a.is_a? String
-            a == e.name
-          else
-            a == 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
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class ChannelUpdateEvent
+    attr_reader :type
+    attr_reader :topic
+    attr_reader :position
+    attr_reader :name
+    attr_reader :is_private
+    attr_reader :channel
+    attr_reader :server
+
+    def initialize(data, bot)
+      @type = data['type']
+      @topic = data['topic']
+      @position = data['position']
+      @name = data['name']
+      @is_private = data['is_private']
+      @server = bot.server(data['guild_id'].to_i)
+      return if !@server
+      @channel = bot.channel(data['id'].to_i)
+    end
+  end
+
+  class ChannelUpdateEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ChannelUpdateEvent
+
+      return [
+        matches_all(@attributes[:type], event.type) do |a,e|
+          if a.is_a? String
+            a == e.name
+          else
+            a == 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
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/generic.rb

@@ -1,59 +1,59 @@
-require 'active_support/core_ext/module'
-
-module Discordrb::Events
-  class Negated
-    attr_reader :object
-    def initialize(object); @object = object; end
-  end
-
-  def self.matches_all(attributes, to_check, &block)
-    # "Zeroth" case: attributes is nil
-    return true unless attributes
-
-    # First case: there's a single negated attribute
-    if attributes.is_a? Negated
-      # The contained object might also be an array, so recursively call matches_all (and negate the result)
-      return !matches_all(attributes.object, to_check, &block)
-    end
-
-    # Second case: there's a single, not-negated attribute
-    unless attributes.is_a? Array
-      return yield(attributes, to_check)
-    end
-
-    # Third case: it's an array of attributes
-    attributes.reduce(false) do |result, element|
-      result || yield(element, to_check)
-    end
-  end
-
-  class EventHandler
-    def initialize(attributes, block)
-      @attributes = attributes
-      @block = block
-    end
-
-    def matches?(event)
-      raise "Attempted to call matches?() from a generic EventHandler"
-    end
-
-    def match(event)
-      @block.call(event) if matches? event
-    end
-
-    def matches_all(attributes, to_check, &block)
-      Discordrb::Events.matches_all(attributes, to_check, &block)
-    end
-  end
-
-  # Event handler that matches all events
-  class TrueEventHandler < EventHandler
-    def matches?(event)
-      true
-    end
-  end
-end
-
-def not!(object)
-  Discordrb::Events::Negated.new(object)
-end
+require 'active_support/core_ext/module'
+
+module Discordrb::Events
+  class Negated
+    attr_reader :object
+    def initialize(object); @object = object; end
+  end
+
+  def self.matches_all(attributes, to_check, &block)
+    # "Zeroth" case: attributes is nil
+    return true unless attributes
+
+    # First case: there's a single negated attribute
+    if attributes.is_a? Negated
+      # The contained object might also be an array, so recursively call matches_all (and negate the result)
+      return !matches_all(attributes.object, to_check, &block)
+    end
+
+    # Second case: there's a single, not-negated attribute
+    unless attributes.is_a? Array
+      return yield(attributes, to_check)
+    end
+
+    # Third case: it's an array of attributes
+    attributes.reduce(false) do |result, element|
+      result || yield(element, to_check)
+    end
+  end
+
+  class EventHandler
+    def initialize(attributes, block)
+      @attributes = attributes
+      @block = block
+    end
+
+    def matches?(event)
+      raise "Attempted to call matches?() from a generic EventHandler"
+    end
+
+    def match(event)
+      @block.call(event) if matches? event
+    end
+
+    def matches_all(attributes, to_check, &block)
+      Discordrb::Events.matches_all(attributes, to_check, &block)
+    end
+  end
+
+  # Event handler that matches all events
+  class TrueEventHandler < EventHandler
+    def matches?(event)
+      true
+    end
+  end
+end
+
+def not!(object)
+  Discordrb::Events::Negated.new(object)
+end

data/lib/discordrb/events/guild-member-update.rb

@@ -1,40 +1,40 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class GuildMemberUpdateEvent
-    attr_reader :user
-    attr_reader :roles
-    attr_reader :server
-
-    def initialize(data, bot)
-      @server = bot.server(data['guild_id'].to_i)
-      return if !@server
-      
-      user_id = data['user']['id'].to_i
-      @user = @server.members.find {|u| u.id == user_id}
-      @roles = []
-      data['roles'].each do |element|
-        role_id = element.to_i
-        @roles << @server.roles.find {|r| r.id == role_id}
-      end
-    end
-  end
-
-  class GuildMemberUpdateHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? GuildMemberUpdateEvent
-
-      return [
-        matches_all(@attributes[:name], event.name) do |a,e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class GuildMemberUpdateEvent
+    attr_reader :user
+    attr_reader :roles
+    attr_reader :server
+
+    def initialize(data, bot)
+      @server = bot.server(data['guild_id'].to_i)
+      return if !@server
+      
+      user_id = data['user']['id'].to_i
+      @user = @server.members.find {|u| u.id == user_id}
+      @roles = []
+      data['roles'].each do |element|
+        role_id = element.to_i
+        @roles << @server.roles.find {|r| r.id == role_id}
+      end
+    end
+  end
+
+  class GuildMemberUpdateHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? GuildMemberUpdateEvent
+
+      return [
+        matches_all(@attributes[:name], event.name) do |a,e|
+          if a.is_a? String
+            a == e.to_s
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/guild-role-create.rb

@@ -1,34 +1,34 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class GuildRoleCreateEvent
-    attr_reader :role
-    attr_reader :server
-
-    def initialize(data, bot)
-      @server = bot.server(data['guild_id'].to_i)
-      return if !@server
-      
-      role_id = data['role']['id'].to_i
-      @role = @server.roles.find {|r| r.id == role_id}
-    end
-  end
-
-  class GuildRoleCreateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? GuildRoleCreateEvent
-
-      return [
-        matches_all(@attributes[:name], event.name) do |a,e|
-          if a.is_a? String
-            a == e.to_s
-          else
-            a == e
-          end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class GuildRoleCreateEvent
+    attr_reader :role
+    attr_reader :server
+
+    def initialize(data, bot)
+      @server = bot.server(data['guild_id'].to_i)
+      return if !@server
+      
+      role_id = data['role']['id'].to_i
+      @role = @server.roles.find {|r| r.id == role_id}
+    end
+  end
+
+  class GuildRoleCreateEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? GuildRoleCreateEvent
+
+      return [
+        matches_all(@attributes[:name], event.name) do |a,e|
+          if a.is_a? String
+            a == e.to_s
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end