discordrb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d928acdf371b64591d0438c7bcf45ea0f2bbba1
-  data.tar.gz: b5e0e4847acb2a5624598f19949c6b36e9da1d89
+  metadata.gz: be27c379055ef4c2c5a4f0b0bbaad96edb5c65e4
+  data.tar.gz: ebd782951477ccd5cc10f8f4764d324a2f269969
 SHA512:
-  metadata.gz: 81fdfef418a981ed4318b46854b7071565dda588432353bd4b5a4fb0eb1bb01dcda575dfa4b462ee0cc3d74cb9c6454d1e1fc76c90ac39da24fac584c4c01ecd
-  data.tar.gz: 071a0ad1b506297193216409f3a2327e5318b4a0228f6dfe7243738b4f5e33ded817a0315760037de28eff5a5964e4b37b27d18400a0a69c5f1428090301d640
+  metadata.gz: b738fdba2605b6b5a7fa1bc8ebdffcd2e93756c4ed01f7765b9c2ddf357d64095b35e05ebc801dfba8049179256a9f9dd66e77da6b43e54554a7ea98c4938f71
+  data.tar.gz: c42f9f0a1c6a76e592e59b2ce7854a0bae353ef712ab79c847d21c59f9fcd7d3f8aff3d5eede31c77fdd9e7746c1465d7cae26a25405ac8fc93e3479c42f8db2

data/README.md

@@ -22,15 +22,17 @@ Or install it yourself as:
 
 You can make a simple bot like this:
 
-    require 'discordrb'
+```ruby
+require 'discordrb'
 
-    bot = Discordrb::Bot.new "email@example.com", "hunter2"
+bot = Discordrb::Bot.new "email@example.com", "hunter2"
 
-    bot.message(with_text: "Ping!") do |event|
-      event.respond "Pong!"
-    end
+bot.message(with_text: "Ping!") do |event|
+  event.respond "Pong!"
+end
 
-    bot.run
+bot.run
+```
 
 This bot responds to every "Ping!" with a "Pong!".
 

data/lib/discordrb/bot.rb

@@ -7,6 +7,7 @@ require 'discordrb/endpoints/endpoints'
 require 'discordrb/events/message'
 require 'discordrb/events/typing'
 require 'discordrb/events/lifetime'
+require 'discordrb/events/presence'
 
 require 'discordrb/exceptions'
 require 'discordrb/data'
@@ -55,6 +56,10 @@ module Discordrb
       @users[id]
     end
 
+    def server(id)
+      @servers[id]
+    end
+
     def send_message(channel_id, content)
       debug("Sending message to #{channel_id} with content '#{content}'")
       data = {
@@ -70,23 +75,23 @@ module Discordrb
     end
 
     def message(attributes = {}, &block)
-      @event_handlers[MessageEvent] ||= []
-      @event_handlers[MessageEvent] << MessageEventHandler.new(attributes, block)
+      register_event(MessageEvent, attributes, block)
     end
 
     def ready(attributes = {}, &block)
-      @event_handlers[ReadyEvent] ||= []
-      @event_handlers[ReadyEvent] << ReadyEventHandler.new(attributes, block)
+      register_event(ReadyEvent, attributes, block)
     end
 
     def disconnected(attributes = {}, &block)
-      @event_handlers[DisconnectEvent] ||= []
-      @event_handlers[DisconnectEvent] << DisconnectEventHandler.new(attributes, block)
+      register_event(DisconnectEvent, attributes, block)
     end
 
     def typing(attributes = {}, &block)
-      @event_handlers[TypingEvent] ||= []
-      @event_handlers[TypingEvent] << TypingEvent.new(attributes, block)
+      register_event(TypingEvent, attributes, block)
+    end
+
+    def presence(attributes = {}, &block)
+      register_event(PresenceEvent, attributes, block)
     end
 
     private
@@ -162,6 +167,9 @@ module Discordrb
       when "TYPING_START"
         event = TypingEvent.new(data, self)
         raise_event(event)
+      when "PRESENCE_UPDATE"
+        event = PresenceEvent.new(data, self)
+        raise_event(event)
       end
     end
 
@@ -197,6 +205,12 @@ module Discordrb
       end
     end
 
+    def register_event(clazz, attributes, block)
+      handler = Kernel.const_get(clazz.to_s + "Handler")
+      @event_handlers[clazz] ||= []
+      @event_handlers[clazz] << handler.new(attributes, block)
+    end
+
     def send_heartbeat
       millis = Time.now.strftime("%s%L").to_i
       debug("Sending heartbeat at #{millis}")

data/lib/discordrb/events/message.rb

@@ -4,7 +4,8 @@ module Discordrb::Events
   class MessageEvent
     attr_reader :message
 
-    def initialize(message)
+    def initialize(message, bot)
+      @bot = bot
       @message = message
     end
 

data/lib/discordrb/events/presence.rb

@@ -0,0 +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

data/lib/discordrb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - meew0
@@ -90,6 +90,7 @@ files:
 - lib/discordrb/events/generic.rb
 - lib/discordrb/events/lifetime.rb
 - lib/discordrb/events/message.rb
+- lib/discordrb/events/presence.rb
 - lib/discordrb/events/typing.rb
 - lib/discordrb/exceptions.rb
 - lib/discordrb/version.rb