discordrb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be27c379055ef4c2c5a4f0b0bbaad96edb5c65e4
-  data.tar.gz: ebd782951477ccd5cc10f8f4764d324a2f269969
+  metadata.gz: d241461b5a7da1e2bf3bf123e59712a1bdfb111e
+  data.tar.gz: 308d0be900d8fdb8754a03b86c3662dff48f7330
 SHA512:
-  metadata.gz: b738fdba2605b6b5a7fa1bc8ebdffcd2e93756c4ed01f7765b9c2ddf357d64095b35e05ebc801dfba8049179256a9f9dd66e77da6b43e54554a7ea98c4938f71
-  data.tar.gz: c42f9f0a1c6a76e592e59b2ce7854a0bae353ef712ab79c847d21c59f9fcd7d3f8aff3d5eede31c77fdd9e7746c1465d7cae26a25405ac8fc93e3479c42f8db2
+  metadata.gz: e9714fc988119b956c2259489920a4ce1e8d6acc62c34ba809d8b6eb16eab4dbb6c750e9964795d7aa49fab33a11612f45ad859d32733e35a8cf31d48eddfc43
+  data.tar.gz: a1e0d1d7603a8ebdce87b3489e230b21064e03a638f37fff279b033e60aefb0f81d116b410b1a1d372f1dcefe0ef12f90d600fced661d4346fd86797eb974074

data/lib/discordrb/bot.rb

@@ -162,7 +162,7 @@ module Discordrb
         raise_event(ReadyEvent.new)
       when "MESSAGE_CREATE"
         message = Message.new(data, self)
-        event = MessageEvent.new(message)
+        event = MessageEvent.new(message, self)
         raise_event(event)
       when "TYPING_START"
         event = TypingEvent.new(data, self)

data/lib/discordrb/data.rb

@@ -20,12 +20,12 @@ module Discordrb
   end
 
   class Channel
-    attr_reader :name, :server_id, :type, :id, :is_private
+    attr_reader :name, :server, :type, :id, :is_private
 
     def initialize(data, bot)
       @bot = bot
       @name = data['name']
-      @server_id = data['guild_id']
+      @server = bot.server(data['guild_id'].to_i)
       @type = data['type']
       @id = data['id']
       @is_private = data['is_private']

data/lib/discordrb/events/message.rb

@@ -16,7 +16,7 @@ module Discordrb::Events
     alias_method :text, :content
     def timestamp; @message.timestamp; end
 
-    def send_message(content); @message.send_message(content); end
+    def send_message(content); @message.channel.send_message(content); end
     alias_method :send, :send_message
     alias_method :message, :send_message
     alias_method :respond, :send_message
@@ -33,7 +33,8 @@ module Discordrb::Events
         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
-            a == e.name
+            # 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

data/lib/discordrb/events/typing.rb

@@ -21,7 +21,7 @@ module Discordrb::Events
       return [
         matches_all(@attributes[:in], event.channel) do |a,e|
           if a.is_a? String
-            a == e.name
+            a.gsub('#', '') == e.name
           elsif a.is_a? Fixnum
             a == e.id
           else

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket