discordrb 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569e1f420904120c2bcc90a4d3210dcd6e2bbb33
-  data.tar.gz: 4aa9f7b948e80d2b510981089df082fe3b25e536
+  metadata.gz: d3394dc24297810feb875acf67f18bc2faaf2e4e
+  data.tar.gz: d99fd2f8d5ea8fed3627d225c8b0ac46f9a62fe9
 SHA512:
-  metadata.gz: 4ccdf4a5c16ea40690f0bcd522c7532bf71a857bd006a7b332484409ae1ecdb68380673250c5d96850be92ede58381af76f4d5154f26ff59e0dcdc8b2e51990c
-  data.tar.gz: 5cd3c4927f10709b9605f242da79d9cc881d3cd466eab30b3996d5827fb6dae2619e2f6a160fa22ca8750a614d6926389dccbffa5d1b40908319633423400d34
+  metadata.gz: 5775f0196014a3a7a4633cd855a93dbd963f1b4c54a54380151dfad7c4eda2023e3846e489cb3b9803e2ce1a7477812cc2d6aa6066275fa330fbb458e26a252b
+  data.tar.gz: 72dfb6f70176919bd345ad7414cdff3ad1ce420bdc43f2ef6ca1af02cc829957e50b39049b2cffbe7211e2282dde6ffe67c00e3114251a962a41d77ac6478cfb

data/lib/discordrb/data.rb

@@ -142,6 +142,10 @@ module Discordrb
   class Channel
     attr_reader :name, :server, :type, :id, :is_private, :recipient, :topic, :position, :permission_overwrites
 
+    def private?
+      @is_private
+    end
+
     def initialize(data, bot, server = nil)
       @bot = bot
 

data/lib/discordrb/events/channel_create.rb

@@ -4,13 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Raised when a channel is created
   class ChannelCreateEvent
-    attr_reader :type
-    attr_reader :topic
-    attr_reader :position
-    attr_reader :name
-    attr_reader :is_private
-    attr_reader :id
-    attr_reader :server
+    attr_reader :type, :topic, :position, :name, :is_private, :id, :server
 
     def initialize(data, bot)
       @type = data['type']

data/lib/discordrb/events/channel_delete.rb

@@ -4,13 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Raised when a channel is deleted
   class ChannelDeleteEvent
-    attr_reader :type
-    attr_reader :topic
-    attr_reader :position
-    attr_reader :name
-    attr_reader :is_private
-    attr_reader :id
-    attr_reader :server
+    attr_reader :type, :topic, :position, :name, :is_private, :id, :server
 
     def initialize(data, bot)
       @type = data['type']

data/lib/discordrb/events/channel_update.rb

@@ -4,13 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Raised when a channel is updated (e.g. topic changes)
   class ChannelUpdateEvent
-    attr_reader :type
-    attr_reader :topic
-    attr_reader :position
-    attr_reader :name
-    attr_reader :is_private
-    attr_reader :channel
-    attr_reader :server
+    attr_reader :type, :topic, :position, :name, :is_private, :channel, :server
 
     def initialize(data, bot)
       @type = data['type']

data/lib/discordrb/events/generic.rb

@@ -13,7 +13,7 @@ module Discordrb::Events
 
   def self.matches_all(attributes, to_check, &block)
     # "Zeroth" case: attributes is nil
-    return true unless attributes
+    return true if attributes.nil?
 
     # First case: there's a single negated attribute
     if attributes.is_a? Negated

data/lib/discordrb/events/guild_role_create.rb

@@ -4,8 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Raised when a role is created on a server
   class GuildRoleCreateEvent
-    attr_reader :role
-    attr_reader :server
+    attr_reader :role, :server
 
     def initialize(data, bot)
       @server = bot.server(data['guild_id'].to_i)

data/lib/discordrb/events/guild_role_delete.rb

@@ -4,8 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Raised when a role is deleted from a server
   class GuildRoleDeleteEvent
-    attr_reader :id
-    attr_reader :server
+    attr_reader :id, :server
 
     def initialize(data, bot)
       # The role should already be deleted from the server's list

data/lib/discordrb/events/guild_role_update.rb

@@ -4,8 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Event raised when a role updates on a server
   class GuildRoleUpdateEvent
-    attr_reader :role
-    attr_reader :server
+    attr_reader :role, :server
 
     def initialize(data, bot)
       @server = bot.server(data['guild_id'].to_i)

data/lib/discordrb/events/members.rb

@@ -4,9 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Generic subclass for server member events (add/update/delete)
   class GuildMemberEvent
-    attr_reader :user
-    attr_reader :roles
-    attr_reader :server
+    attr_reader :user, :roles, :server
 
     def initialize(data, bot)
       @server = bot.server(data['guild_id'].to_i)

data/lib/discordrb/events/message.rb

@@ -30,9 +30,27 @@ module Discordrb::Events
       return false unless event.is_a? MessageEvent
 
       [
-        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[:starting_with] || @attributes[:start_with], event.content) do |a, e|
+          if a.is_a? String
+            e.start_with? a
+          elsif a.is_a? Regexp
+            (e =~ a) == 0
+          end
+        end,
+        matches_all(@attributes[:ending_with] || @attributes[:end_with], event.content) do |a, e|
+          if a.is_a? String
+            e.end_with? a
+          elsif a.is_a? Regexp
+            a.match(e) ? e.end_with?(a.match(e)[-1]) : false
+          end
+        end,
+        matches_all(@attributes[:containing] || @attributes[:contains], event.content) do |a, e|
+          if a.is_a? String
+            e.include? a
+          elsif a.is_a? Regexp
+            (e =~ a)
+          end
+        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
@@ -52,9 +70,16 @@ module Discordrb::Events
             a == e
           end
         end,
-        matches_all(@attributes[:with_text], event.content) { |a, e| e == a },
+        matches_all(@attributes[:with_text] || @attributes[:content], event.content) do |a, e|
+          if a.is_a? String
+            e == a
+          elsif a.is_a? Regexp
+            a.match(e) ? (e == (a.match(e)[0])) : false
+          end
+        end,
         matches_all(@attributes[:after], event.timestamp) { |a, e| a > e },
-        matches_all(@attributes[:before], event.timestamp) { |a, e| a < e }
+        matches_all(@attributes[:before], event.timestamp) { |a, e| a < e },
+        matches_all(@attributes[:private], event.channel.private?) { |a, e| !e == !a }
       ].reduce(true, &:&)
     end
   end

data/lib/discordrb/events/voice_state_update.rb

@@ -4,16 +4,7 @@ require 'discordrb/data'
 module Discordrb::Events
   # Event raised when a user's voice state updates
   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
+    attr_reader :user, :token, :suppress, :session_id, :self_mute, :self_deaf, :mute, :deaf, :server, :channel
 
     def initialize(data, bot)
       @token = data['token']

data/lib/discordrb/version.rb

@@ -1,4 +1,4 @@
 # Discordrb and all its functionality, in this case only the version.
 module Discordrb
-  VERSION = '1.3.9'
+  VERSION = '1.3.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -99,7 +99,7 @@ files:
 - discordrb.gemspec
 - examples/commands.rb
 - examples/ping.rb
-- examples/pm.rb
+- examples/pm_send.rb
 - lib/discordrb.rb
 - lib/discordrb/api.rb
 - lib/discordrb/await.rb