discordrb 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd30b5863b65c18ff871a4da68799e84f9977ed
-  data.tar.gz: 97a66f9143d7f99e9a5e8a8b2128811c9c92aa3a
+  metadata.gz: 86cdc8d762e8e04b93959b865ed2edfdd828b5b4
+  data.tar.gz: 4c5a94198f98bea68dede91ad56eb5440cffa3b4
 SHA512:
-  metadata.gz: 684db72bafc1ea950f6756fa9b135bfd5887fa3466ce4b3492221d0bec1d7456c739db735edf5ff61f4a2d91b86199a4454cc7fc715af71d807c148c1da083c4
-  data.tar.gz: efc166061cd225b3e88b0b71085f432f6d093f5adbc88d2f31f35981438065b084ab3acc365857a30f807a68c868de23303b7f088d9a804f2723fdf3224701da
+  metadata.gz: 8674eba850238067f0de5c1841475e225279cda28d6e587bdec1b8aecc1844550078df9279c3ab14c6598e010a22719973a48b8fc6534d4a5b3650384399cc3a
+  data.tar.gz: 2a715d046b1dc8af3113e0c3c3e6dd0177e4ad18d5162a63b112367bb32986eeeca8c8037e181f01c449bdf31fcb26d3efeaa7408b49eaf3c4f86c9c14942977

data/README.md

@@ -10,17 +10,17 @@ An implementation of the [Discord](https://discordapp.com/) API using Ruby.
 
 On Linux, it should be as simple as running:
 
-    $ gem install discordrb
+    gem install discordrb
 
 ### Windows
 
 On Windows, to install discordrb, run this in a shell:
 
-    $ gem install discordrb
+    gem install discordrb
 
 Run the [ping example](https://github.com/meew0/discordrb/blob/master/examples/ping.rb) to verify that the installation works (make sure to replace the username and password in there with your own or your bots'!):
 
-    $ ruby ping.rb
+    ruby ping.rb
 
 #### Troubleshooting
 
@@ -31,23 +31,23 @@ Run the [ping example](https://github.com/meew0/discordrb/blob/master/examples/p
 
 You're missing the development kit required to build native extensions. Download the development kit [here](http://rubyinstaller.org/downloads/) (scroll down to "Development Kit", then choose the one for Ruby 2.0 and your system architecture) and extract it somewhere. Open a command prompt in that folder and run:
 
-    $ ruby dk.rb init
-    $ ruby dk.rb install
+    ruby dk.rb init
+    ruby dk.rb install
 
 Then reinstall discordrb:
 
-    $ gem uninstall discordrb
-    $ gem install discordrb
+    gem uninstall discordrb
+    gem install discordrb
 
 **If you get an error like this when running the example**:
 
     terminate called after throwing an instance of 'std::runtime_error'
       what():  Encryption not available on this event-machine
 
-You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe), install them to their default location and reinstall EventMachine using these libraries:
+You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](https://slproweb.com/download/Win32OpenSSL-1_0_2e.exe), install them to their default location and reinstall EventMachine using these libraries:
 
-    $ gem uninstall eventmachine
-    $ gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
+    gem uninstall eventmachine
+    gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
 
 ## Usage
 

data/lib/discordrb/bot.rb

@@ -401,6 +401,10 @@ module Discordrb
       register_event(PresenceEvent, attributes, block)
     end
 
+    def playing(attributes = {}, &block)
+      register_event(PlayingEvent, attributes, block)
+    end
+
     def mention(attributes = {}, &block)
       register_event(MentionEvent, attributes, block)
     end
@@ -860,9 +864,16 @@ module Discordrb
         event = TypingEvent.new(data, self)
         raise_event(event)
       when 'PRESENCE_UPDATE'
+        now_playing = data['game']
+        played_before = user(data['user']['id'].to_i).game
         update_presence(data)
 
-        event = PresenceEvent.new(data, self)
+        if now_playing != played_before
+          event = PlayingEvent.new(data, self)
+        else
+          event = PresenceEvent.new(data, self)
+        end
+
         raise_event(event)
       when 'VOICE_STATE_UPDATE'
         update_voice_state(data)

data/lib/discordrb/commands/command_bot.rb

@@ -94,7 +94,8 @@ module Discordrb::Commands
       end
       if permission?(user(event.user.id), command.attributes[:permission_level], event.server)
         event.command = command
-        command.call(event, arguments, chained)
+        result = command.call(event, arguments, chained)
+        result.to_s
       else
         event.respond "You don't have permission to execute command `#{name}`!"
         return

data/lib/discordrb/data.rb

@@ -58,6 +58,7 @@ module Discordrb
 
     # Set this user's roles
     def update_roles(server, roles)
+      @roles ||= {}
       @roles[server.id] = roles
     end
 
@@ -416,11 +417,12 @@ module Discordrb
     attr_reader :content, :author, :channel, :timestamp, :id, :mentions
     alias_method :user, :author
     alias_method :text, :content
+    alias_method :to_s, :content
 
     def initialize(data, bot)
       @bot = bot
       @content = data['content']
-      @author = User.new(data['author'], bot)
+      @author = bot.user(data['author']['id'].to_i)
       @channel = bot.channel(data['channel_id'].to_i)
       @timestamp = Time.parse(data['timestamp'])
       @id = data['id'].to_i

data/lib/discordrb/events/presence.rb

@@ -1,8 +1,9 @@
 require 'discordrb/events/generic'
 require 'discordrb/data'
+require 'discordrb/games'
 
 module Discordrb::Events
-  # Event raised when a user's presence state updates (playing game, idle or back online)
+  # Event raised when a user's presence state updates (idle or online)
   class PresenceEvent
     attr_reader :server, :user, :status
 
@@ -39,4 +40,48 @@ module Discordrb::Events
       ].reduce(true, &:&)
     end
   end
+
+  # Event raised when a user starts or stops playing a game
+  class PlayingEvent
+    attr_reader :server, :user, :game
+
+    def initialize(data, bot)
+      @user = bot.user(data['user']['id'].to_i)
+
+      if data['game']
+        @game = Discordrb::Games.find_game(data['game']['name'])
+      else
+        @game = nil
+      end
+
+      @server = bot.server(data['guild_id'].to_i)
+    end
+  end
+
+  # Event handler for PlayingEvent
+  class PlayingEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? PlayingEvent
+
+      [
+        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[:game], event.game) do |a, e|
+          if a.is_a? String
+            a == e.name
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
 end

data/lib/discordrb/events/typing.rb

@@ -6,7 +6,7 @@ module Discordrb::Events
     attr_reader :channel, :user, :timestamp
 
     def initialize(data, bot)
-      @user_id = data['user_id']
+      @user_id = data['user_id'].to_i
       @user = bot.user(@user_id)
       @channel_id = data['channel_id']
       @channel = bot.channel(@channel_id)

data/lib/discordrb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket