discordrb 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ced42b02743f167ccf6c501aed74677b0630de
-  data.tar.gz: ecb35ffd89d3c5537f628ed70dc2bda51fdfabc1
+  metadata.gz: 4553a299935a6bdc2eabefbfb3457eea8549b108
+  data.tar.gz: cecbbcba26ee274e071e36a6198c5ebf7a488ea4
 SHA512:
-  metadata.gz: 60a7af343d2ab4f3c76b415f6b8449bc44eba59b672c613c846571d509ca52dbf68598495c26f8fffea364f75252b47329e9291422b0964b9496f5a8fe822695
-  data.tar.gz: f8ca48c2344df30dcfe8689763544547d2e4ad735f9163144980940918948ce18e4e26bfd7b133e0cca9e3b5ab1dce7abf5cca48fab6b4b8316ffb250759ae39
+  metadata.gz: 5f4693a18e7b29449038662944e6d91514dc5d7c127ba18f1d27e8a5de87666142bf831dea05cfac0b982bf7628e56e6461cc66b33ca490fb8b8b9ff4c5535ef
+  data.tar.gz: 37fd4cd938da34073f15a5c28bceadfdd05e2fa64f37abe42736fb5ee861a7b72c02375d97b8d17cd618da7c8407aba7a7126054741764bf73f58e0af10b0dc2

data/lib/discordrb/bot.rb

@@ -15,7 +15,9 @@ require 'discordrb/data'
 module Discordrb
   class Bot
     include Discordrb::Events
-    def initialize(email, password)
+    def initialize(email, password, debug = false)
+      @debug = debug
+
       @email = email
       @password = password
 
@@ -25,8 +27,6 @@ module Discordrb
 
       @channels = {}
       @users = {}
-
-      @debug = false
     end
 
     def run
@@ -52,6 +52,15 @@ module Discordrb
       @channels[id] = channel
     end
 
+    def private_channel(id)
+      debug("Creating private channel with user id #{id}")
+      return @private_channels[id] if @private_channels[id]
+
+      response = RestClient.get Discordrb::Endpoints::USERS + "/#{id}/channels", {:Authorization => @token}
+      channel = Channel.new(JSON.parse(response), self)
+      @private_channels[id] = channel
+    end
+
     def user(id)
       @users[id]
     end
@@ -114,6 +123,7 @@ module Discordrb
       login_response_object = JSON.parse(login_response)
       raise InvalidAuthenticationException unless login_response_object['token']
 
+      debug("Received token: #{login_response_object['token']}")
       login_response_object['token']
     end
 
@@ -162,6 +172,14 @@ module Discordrb
           end
         end
 
+        # Add private channels
+        @private_channels = {}
+        data['private_channels'].each do |element|
+          channel = Channel.new(element, self)
+          @channels[channel.id] = channel
+          @private_channels[channel.recipient.id] = channel
+        end
+
         # Make sure to raise the event
         raise_event(ReadyEvent.new)
       when "MESSAGE_CREATE"

data/lib/discordrb/data.rb

@@ -17,18 +17,37 @@ module Discordrb
     def mention
       "<@#{@id}>"
     end
+
+    # Utility function to send a PM
+    def pm(content = nil)
+      if content
+        # Recursively call pm to get the channel, then send a message to it
+        channel = pm
+        channel.send_message(content)
+      else
+        # If no message was specified, return the PM channel
+        @bot.private_channel(@id)
+      end
+    end
   end
 
   class Channel
-    attr_reader :name, :server, :type, :id, :is_private
+    attr_reader :name, :server, :type, :id, :is_private, :recipient
 
     def initialize(data, bot)
       @bot = bot
-      @name = data['name']
-      @server = bot.server(data['guild_id'].to_i)
-      @type = data['type']
+
       @id = data['id']
+      @type = data['type'] || 'text'
+
       @is_private = data['is_private']
+      if @is_private
+        @recipient = User.new(data['recipient'], bot)
+        @name = @recipient.username
+      else
+        @name = data['name']
+        @server = bot.server(data['guild_id'].to_i)
+      end
     end
 
     def send_message(content)

data/lib/discordrb/endpoints/endpoints.rb

@@ -10,4 +10,6 @@ module Discordrb::Endpoints
   SERVERS = APIBASE + "/guilds"
 
   CHANNELS = APIBASE + "/channels"
+
+  USERS = APIBASE + "/users"
 end

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

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