discordrb 1.1.3 → 1.2.0

data/lib/discordrb/events/lifetime.rb

@@ -1,9 +1,9 @@
-require 'discordrb/events/generic'
-
-module Discordrb::Events
-  class ReadyEvent; end
-  class ReadyEventHandler < TrueEventHandler; end
-
-  class DisconnectEvent; end
-  class DisconnectEventHandler < TrueEventHandler; end
-end
+require 'discordrb/events/generic'
+
+module Discordrb::Events
+  class ReadyEvent; end
+  class ReadyEventHandler < TrueEventHandler; end
+
+  class DisconnectEvent; end
+  class DisconnectEventHandler < TrueEventHandler; end
+end

data/lib/discordrb/events/message.rb

@@ -1,59 +1,59 @@
-require 'discordrb/events/generic'
-
-module Discordrb::Events
-  class MessageEvent
-    attr_reader :message
-
-    delegate :author, :channel, :content, :timestamp, to: :message
-
-    def initialize(message, bot)
-      @bot = bot
-      @message = message
-    end
-
-    def send_message(content); @message.channel.send_message(content); end
-
-    alias_method :user, :author
-    alias_method :text, :content
-    alias_method :send, :send_message
-    alias_method :respond, :send_message
-  end
-
-  class MessageEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? MessageEvent
-
-      return [
-        matches_all(@attributes[:starting_with], event.content) { |a,e| e.start_with? a },
-        matches_all(@attributes[:ending_with], event.content) { |a,e| e.end_with? a },
-        matches_all(@attributes[:containing], event.content) { |a,e| e.include? a },
-        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.gsub('#', '') == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
-        end,
-        matches_all(@attributes[:from], event.author) do |a,e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
-        end,
-        matches_all(@attributes[:with_text], event.content) { |a,e| e == a },
-        matches_all(@attributes[:after], event.timestamp) { |a,e| a > e },
-        matches_all(@attributes[:before], event.timestamp) { |a,e| a < e }
-      ].reduce(true, &:&)
-    end
-  end
-
-  class MentionEvent < MessageEvent; end
-  class MentionEventHandler < MessageEventHandler; end
-end
+require 'discordrb/events/generic'
+
+module Discordrb::Events
+  class MessageEvent
+    attr_reader :message
+
+    delegate :author, :channel, :content, :timestamp, to: :message
+
+    def initialize(message, bot)
+      @bot = bot
+      @message = message
+    end
+
+    def send_message(content); @message.channel.send_message(content); end
+
+    alias_method :user, :author
+    alias_method :text, :content
+    alias_method :send, :send_message
+    alias_method :respond, :send_message
+  end
+
+  class MessageEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? MessageEvent
+
+      return [
+        matches_all(@attributes[:starting_with], event.content) { |a,e| e.start_with? a },
+        matches_all(@attributes[:ending_with], event.content) { |a,e| e.end_with? a },
+        matches_all(@attributes[:containing], event.content) { |a,e| e.include? a },
+        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.gsub('#', '') == e.name
+          elsif a.is_a? Fixnum
+            a == e.id
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:from], event.author) do |a,e|
+          if a.is_a? String
+            a == e.name
+          elsif a.is_a? Fixnum
+            a == e.id
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:with_text], event.content) { |a,e| e == a },
+        matches_all(@attributes[:after], event.timestamp) { |a,e| a > e },
+        matches_all(@attributes[:before], event.timestamp) { |a,e| a < e }
+      ].reduce(true, &:&)
+    end
+  end
+
+  class MentionEvent < MessageEvent; end
+  class MentionEventHandler < MessageEventHandler; end
+end

data/lib/discordrb/events/presence.rb

@@ -1,40 +1,40 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class PresenceEvent
-    attr_reader :server, :user, :status
-
-    def initialize(data, bot)
-      @user = Discordrb::User.new(data['user'], bot)
-      @status = data['status'].to_sym
-      @server = bot.server(data['guild_id'])
-    end
-  end
-
-  class PresenceEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? PresenceEvent
-
-      return [
-        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
-        end,
-        matches_all(@attributes[:status], event.status) 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 PresenceEvent
+    attr_reader :server, :user, :status
+
+    def initialize(data, bot)
+      @user = Discordrb::User.new(data['user'], bot)
+      @status = data['status'].to_sym
+      @server = bot.server(data['guild_id'])
+    end
+  end
+
+  class PresenceEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? PresenceEvent
+
+      return [
+        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
+        end,
+        matches_all(@attributes[:status], event.status) 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/typing.rb

@@ -1,45 +1,45 @@
-require 'discordrb/events/generic'
-
-module Discordrb::Events
-  class TypingEvent
-    attr_reader :channel, :user, :timestamp
-
-    def initialize(data, bot)
-      @user_id = data['user_id']
-      @user = bot.user(@user_id)
-      @channel_id = data['channel_id']
-      @channel = bot.channel(@channel_id)
-      @timestamp = Time.at(data['timestamp'].to_i)
-    end
-  end
-
-  class TypingEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? TypingEvent
-
-      return [
-        matches_all(@attributes[:in], event.channel) do |a,e|
-          if a.is_a? String
-            a.gsub('#', '') == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          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
-        end,
-        matches_all(@attributes[:after], event.timestamp) { |a,e| a > e },
-        matches_all(@attributes[:before], event.timestamp) { |a,e| a < e }
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+
+module Discordrb::Events
+  class TypingEvent
+    attr_reader :channel, :user, :timestamp
+
+    def initialize(data, bot)
+      @user_id = data['user_id']
+      @user = bot.user(@user_id)
+      @channel_id = data['channel_id']
+      @channel = bot.channel(@channel_id)
+      @timestamp = Time.at(data['timestamp'].to_i)
+    end
+  end
+
+  class TypingEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? TypingEvent
+
+      return [
+        matches_all(@attributes[:in], event.channel) do |a,e|
+          if a.is_a? String
+            a.gsub('#', '') == e.name
+          elsif a.is_a? Fixnum
+            a == e.id
+          else
+            a == e
+          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
+        end,
+        matches_all(@attributes[:after], event.timestamp) { |a,e| a > e },
+        matches_all(@attributes[:before], event.timestamp) { |a,e| a < e }
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/voice-state-update.rb

@@ -0,0 +1,89 @@
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class VoiceStateUpdateEvent
+    attr_reader :user
+    attr_reader :token
+    attr_reader :suppress
+    attr_reader :session_id
+    attr_reader :self_mute
+    attr_reader :self_deaf
+    attr_reader :mute
+    attr_reader :deaf
+    attr_reader :server
+    attr_reader :channel
+
+    def initialize(data, bot)
+      @token = data['token']
+      @suppress = data['suppress']
+      @session_id = data['session_id']
+      @self_mute = data['self_mute']
+      @self_deaf = data['self_deaf']
+      @mute = data['mute']
+      @deaf = data['deaf']
+      @server = bot.server(data['guild_id'].to_i)
+      return if !@server
+      if data['channel_id']
+        @channel = bot.channel(data['channel_id'].to_i)
+      end
+      @user = bot.user(data['user_id'].to_i)
+    end
+  end
+
+  class VoiceStateUpdateEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? VoiceStateUpdateEvent
+
+      return [
+        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
+        end,
+        matches_all(@attributes[:mute], event.mute) do |a,e|
+          if a.is_a? Boolean
+            a == e.to_s
+          else
+            a == 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          
+        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
+        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          
+        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
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/exceptions.rb

@@ -1,10 +1,10 @@
-module Discordrb
-  # Raised when authentication data is invalid or incorrect.
-  class InvalidAuthenticationException < RuntimeError; end
-
-  # Raised when a HTTP status code indicates a failure
-  class HTTPStatusException < RuntimeError
-    attr :status
-    def initialize(status); @status = status; end
-  end
-end
+module Discordrb
+  # Raised when authentication data is invalid or incorrect.
+  class InvalidAuthenticationException < RuntimeError; end
+
+  # Raised when a HTTP status code indicates a failure
+  class HTTPStatusException < RuntimeError
+    attr :status
+    def initialize(status); @status = status; end
+  end
+end

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
-module Discordrb
-  VERSION = "1.1.3"
-end
+module Discordrb
+  VERSION = "1.2.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -102,11 +102,19 @@ files:
 - lib/discordrb/bot.rb
 - lib/discordrb/data.rb
 - lib/discordrb/endpoints/endpoints.rb
+- lib/discordrb/events/channel-create.rb
+- lib/discordrb/events/channel-delete.rb
+- lib/discordrb/events/channel-update.rb
 - lib/discordrb/events/generic.rb
+- lib/discordrb/events/guild-member-update.rb
+- lib/discordrb/events/guild-role-create.rb
+- lib/discordrb/events/guild-role-delete.rb
+- lib/discordrb/events/guild-role-update.rb
 - lib/discordrb/events/lifetime.rb
 - lib/discordrb/events/message.rb
 - lib/discordrb/events/presence.rb
 - lib/discordrb/events/typing.rb
+- lib/discordrb/events/voice-state-update.rb
 - lib/discordrb/exceptions.rb
 - lib/discordrb/version.rb
 homepage: https://github.com/meew0/discordrb