discordrb 1.3.11 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b3f567d892b4bd53571b18829ba7b762302d68
-  data.tar.gz: 1e97d316460fc288a8af594a907fa8f35e2efa72
+  metadata.gz: 8344efadd31dd87ad79b62b72a82d6be04de185b
+  data.tar.gz: 9b7794426e79e82d8a86ccc24a394ea7747cb3bb
 SHA512:
-  metadata.gz: bfbcdcb900f9d8de5b19fd473f9219b1635ab2aa71f2f8c434773f19edc6dc9d5f6c0ab802eb4b5cd994769e3b8fc464410aa25ab23a037e65bfee8eef7652ea
-  data.tar.gz: 6b1da574ffeb5541aabe8cf50702a107ad34138761a1a3c67ae3eb8f2419feaa179d0c6dd06c5337059a5e64e0108616a648b7f519f05accef2a6feed56d585e
+  metadata.gz: 7809cfda57d26b2ef71751162356f35a31b908c392fce6c556466c4bf779df17b22aba0bacd2702f7bf209650a88f3e7fb7232d3505322f5cb78bf81fd099c9d
+  data.tar.gz: 98a4c66c5882c5b651d9a044edeaa0b6f18713200b7332be26c26662e3268ee58253a2cefe802f5bf652ac30e7ed9b4d0a5d62689aeb0996af392d9e6340d557

data/lib/discordrb/bot.rb

@@ -28,6 +28,7 @@ module Discordrb
     include Discordrb::Events
 
     attr_reader :bot_user, :token, :users, :servers
+    attr_accessor :should_parse_self
 
     def initialize(email, password, debug = false)
       # Make sure people replace the login details in the example files...
@@ -37,6 +38,7 @@ module Discordrb
       end
 
       @debug = debug
+      @should_parse_self = false
 
       @email = email
       @password = password
@@ -271,6 +273,12 @@ module Discordrb
       register_event(AwaitEvent, attributes, block)
     end
 
+    def pm(attributes = {}, &block)
+      register_event(PrivateMessageEvent, attributes, block)
+    end
+
+    alias_method :private_message, :pm
+
     def remove_handler(handler)
       clazz = event_class(handler.class)
       @event_handlers[clazz].delete(handler)
@@ -581,6 +589,9 @@ module Discordrb
         create_message(data)
 
         message = Message.new(data, self)
+
+        return if message.from_bot? && !should_parse_self
+
         event = MessageEvent.new(message, self)
         raise_event(event)
 
@@ -588,6 +599,11 @@ module Discordrb
           event = MentionEvent.new(message, self)
           raise_event(event)
         end
+
+        if message.channel.private?
+          event = PrivateMessageEvent.new(message, self)
+          raise_event(event)
+        end
       when 'TYPING_START'
         start_typing(data)
 

data/lib/discordrb/data.rb

@@ -76,6 +76,11 @@ module Discordrb
       @bot.add_await(key, MessageEvent, { from: @id }.merge(attributes), &block)
     end
 
+    # Is the user the bot?
+    def bot?
+      @bot.bot_user.id == @id
+    end
+
     # Determine if the user has permission to do an action
     # action is a permission from Permissions::Flags.
     # channel is the channel in which the action takes place (not applicable for server-wide actions).
@@ -282,6 +287,10 @@ module Discordrb
     def await(key, attributes = {}, &block)
       @bot.add_await(key, MessageEvent, { from: @author.id, in: @channel.id }.merge(attributes), &block)
     end
+
+    def from_bot?
+      @author.bot?
+    end
   end
 
   # A server on Discord

data/lib/discordrb/events/message.rb

@@ -61,8 +61,6 @@ module Discordrb::Events
             a.delete('#') == e.name
           elsif a.is_a? Fixnum
             a == e.id
-          elsif a == ':bot'
-            e.from_bot?
           else
             a == e
           end
@@ -72,6 +70,8 @@ module Discordrb::Events
             a == e.name
           elsif a.is_a? Fixnum
             a == e.id
+          elsif a == :bot
+            e.bot?
           else
             a == e
           end
@@ -92,4 +92,7 @@ module Discordrb::Events
 
   class MentionEvent < MessageEvent; end
   class MentionEventHandler < MessageEventHandler; end
+
+  class PrivateMessageEvent < MessageEvent; end
+  class PrivateMessageEventHandler < MessageEventHandler; end
 end

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.11'
+  VERSION = '1.3.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket