discordrb 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17194fcdf12b5f81b55a74f37cd276dcf9e13071
-  data.tar.gz: cb7bd42eb2b78807e44646c35b1717e6a89a3825
+  metadata.gz: b0dcdf2ba14487766e026041d7e00e0e49f565d7
+  data.tar.gz: 2630df655c054d3a00520302bcf8e164f199cddd
 SHA512:
-  metadata.gz: aa692f6814a8440a5783f7c3881e9472b4094e7000c52a762fe0231becf8dad7a1c08b05cfb37aad4bda0f5c0371dad97bdfd88536ebf02e3c1288b0202b6e19
-  data.tar.gz: 86caf5985693e9cf07d64b385b5bab07286c0c06e2e50c16325115e55a5fb1fbb2d47ba7b2ca4effa1887f04825fc6b96b939625c674f5e43aa56f7fb991c864
+  metadata.gz: 6641d9e376c4bacb632a7e9796914974fe3e8225aa9f32604ad9bdd7d84bcc63a8f4dcf5e66b9a1c4af4bebcf4da5b4c7a64f641fc0c6f4793fdc98205de2e24
+  data.tar.gz: f06c2d54af5b4572ebe1a74e108252880e469ecfba206b9e6c5b7dfe55493c9480474b47a0f178ca2e1e537a78e151c877845e66f5229f0bb82b9401ec3a521b

data/lib/discordrb/bot.rb

@@ -27,6 +27,8 @@ module Discordrb
 
       @channels = {}
       @users = {}
+
+      add_default_handlers
     end
 
     def run
@@ -129,6 +131,24 @@ module Discordrb
 
     private
 
+    # Register any default event handlers that the end user shouldn't
+    # need to worry about implementing
+    def add_default_handlers
+      # Update a user's status
+      presence do |event|
+        user_id = event.user.id
+        cached_user = @users[user_id]
+        if !cached_user
+          # If this is a user we've never seen before, add them
+          @users[user_id] = event.user
+          cached_user = event.user
+        end
+        cached_user.instance_exec(event.status) do |status|
+          @status = status
+        end
+      end
+    end
+
     def debug(message)
       puts "[DEBUG @ #{Time.now.to_s}] #{message}" if @debug
     end

data/lib/discordrb/data.rb

@@ -3,14 +3,21 @@
 module Discordrb
   class User
     attr_reader :username, :id, :discriminator, :avatar
+
+    # Is the user online, offline, or away?
+    attr_reader :status
+
     alias_method :name, :username
 
     def initialize(data, bot)
       @bot = bot
+
       @username = data['username']
       @id = data['id'].to_i
       @discriminator = data['discriminator']
       @avatar = data['avatar']
+      
+      @status = :offline
     end
 
     # Utility function to mention users in messages
@@ -32,16 +39,17 @@ module Discordrb
   end
 
   class Channel
-    attr_reader :name, :server, :type, :id, :is_private, :recipient
+    attr_reader :name, :server, :type, :id, :is_private, :recipient, :topic
 
     def initialize(data, bot)
       @bot = bot
 
       #data is a sometimes a Hash and othertimes an array of Hashes, you only want the last one if it's an array
-      data = data[-1] if data.is_a?(Array) 
+      data = data[-1] if data.is_a?(Array)
 
-      @id = data['id']
+      @id = data['id'].to_i
       @type = data['type'] || 'text'
+      @topic = data['topic']
 
       @is_private = data['is_private']
       if @is_private
@@ -85,6 +93,9 @@ module Discordrb
   class Server
     attr_reader :region, :name, :owner_id, :id, :members
 
+    # Array of channels on the server
+    attr_reader :channels
+
     def initialize(data, bot)
       @bot = bot
       @region = data['region']
@@ -93,9 +104,36 @@ module Discordrb
       @id = data['id'].to_i
 
       @members = []
+      members_by_id = {}
 
       data['members'].each do |element|
-        @members << User.new(element, bot)
+        user = User.new(element['user'], bot)
+        @members << user
+        members_by_id[user.id] = user
+      end
+
+      # Update user statuses with presence info
+      if data['presences']
+        data['presences'].each do |element|
+          if element['user']
+            user = members_by_id[element['user']['id'].to_i]
+            if user && element['status']
+              # I don't want to make User#status writable, so we'll use
+              # instance_exec to open the object and set the status
+              user.instance_exec(element['status']) do |status|
+                @status = status.to_sym
+              end
+            end
+          end
+        end
+      end
+
+      @channels = []
+
+      if data['channels']
+        data['channels'].each do |element|
+          @channels << Channel.new(element, bot)
+        end
       end
     end
   end

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket