discordrb 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4b4617fadd16455acbcdae02520c0d2de8f6d6
-  data.tar.gz: 20c792e6f1a164247180c57ee7601f54f89ba381
+  metadata.gz: e2d854d2a25bb8bd4ca304c5038ca48c5faecc73
+  data.tar.gz: 0c241fd003e0a8f18cf88c93a9b5f7fbba8f8cd9
 SHA512:
-  metadata.gz: e0c8e46ea8fd5918d5f48f443b6e651a96fedb3c7c0dfc53250e889d58859e4800844a6b6c71491d357a2af6004bb0d8985e51dcc7a297a852b1df7139ae9d90
-  data.tar.gz: 2535da1d543f437fe1be5bd186d9dd724f2eec5e0d573e58ab553bf19065916930c1f094ed78c3e63efda5482771d52977d4404d815ca0317237c114f5ed700f
+  metadata.gz: 3a5c9019402b2ea016b5cf5c26d420f40ef7b32ad6c5905b0ed652683e425328156b64e84a13d8ab5429d1d51afd8782e0eca274b0c48d3f41e00c537f956a0b
+  data.tar.gz: 2320f2d4578e4df2b080d0928d6e80aa9cf8d47eb66a3ba160a54473ca0c2314fda92a00d8839e0379313294cd9bb8f622051b291151cc57a3ebd728cf3c6eb3

data/lib/discordrb.rb

@@ -1,8 +1,11 @@
 require 'discordrb/version'
 require 'discordrb/bot'
 require 'discordrb/commands/command_bot'
+require 'discordrb/logger'
 
 # All discordrb functionality, to be extended by other files
 module Discordrb
   Thread.current[:discordrb_name] = 'main'
+
+  LOGGER = Logger.new
 end

data/lib/discordrb/api.rb

@@ -26,12 +26,25 @@ module Discordrb::API
     "#{libraries.join(' ')} #{required}"
   end
 
+  def raw_request(type, attributes)
+    RestClient.send(type, *attributes)
+  end
+
   # Make an API request. Utility function to implement message queueing
   # in the future
   def request(type, *attributes)
     # Add a custom user agent
     attributes.last[:user_agent] = user_agent if attributes.last.is_a? Hash
-    RestClient.send(type, *attributes)
+    response = raw_request(type, attributes)
+
+    while response.code == 429
+      wait_seconds = response[:retry_after].to_i / 1000.0
+      LOGGER.debug("WARNING: Discord rate limiting will cause a delay of #{wait_seconds} seconds for the request: #{type} #{attributes}")
+      sleep wait_seconds / 1000.0
+      response = raw_request(type, attributes)
+    end
+
+    response
   end
 
   # Ban a user from a server and delete their messages from the last message_days days
@@ -121,14 +134,7 @@ module Discordrb::API
     )
   end
 
-  # Leave a server
-  def leave_server(server_id)
-    request(
-      :delete,
-      "#{APIBASE}/guilds/#{server_id}",
-      Authorization: token
-    )
-  end
+  alias_method :leave_server, :delete_server
 
   # Get a channel's data
   def channel(token, channel_id)

data/lib/discordrb/bot.rb

@@ -72,7 +72,7 @@ module Discordrb
         exit
       end
 
-      @debug = debug
+      LOGGER.debug = debug
       @should_parse_self = false
 
       @email = email
@@ -276,7 +276,20 @@ module Discordrb
     # @return [Message] The message that was sent.
     def send_message(channel_id, content)
       debug("Sending message to #{channel_id} with content '#{content}'")
-      response = API.send_message(@token, channel_id, content)
+
+      # Replace mentions
+      mentions = []
+      content.gsub!(/<@([0-9]+)>/) do
+        id = Regexp.last_match(1).to_i
+        if @users[id]
+          mentions << id
+          "@#{@users[id].name}"
+        else
+          "<@#{id}}>"
+        end
+      end
+
+      response = API.send_message(@token, channel_id, content, mentions)
       Message.new(JSON.parse(response), self)
     end
 
@@ -353,7 +366,9 @@ module Discordrb
     end
 
     # Sets debug mode. If debug mode is on, many things will be outputted to STDOUT.
-    attr_writer :debug
+    def debug=(new_debug)
+      LOGGER.debug = new_debug
+    end
 
     ##     ##    ###    ##    ## ########  ##       ######## ########   ######
     ##     ##   ## ##   ###   ## ##     ## ##       ##       ##     ## ##    ##
@@ -492,12 +507,11 @@ module Discordrb
     end
 
     def debug(message, important = false)
-      puts "[DEBUG : #{Thread.current[:discordrb_name]} @ #{Time.now}] #{message}" if @debug || important
+      LOGGER.debug(message, important)
     end
 
     def log_exception(e)
-      debug("Exception: #{e.inspect}", true)
-      e.backtrace.each { |line| debug(line, true) }
+      LOGGER.log_exception(e)
     end
 
     def handler_class(event_class)

data/lib/discordrb/data.rb

@@ -4,6 +4,8 @@ require 'ostruct'
 require 'discordrb/permissions'
 require 'discordrb/api'
 require 'discordrb/games'
+require 'discordrb/events/message'
+require 'time'
 require 'base64'
 
 # Discordrb module
@@ -75,7 +77,7 @@ module Discordrb
 
     # Add an await for a message from this user
     def await(key, attributes = {}, &block)
-      @bot.add_await(key, MessageEvent, { from: @id }.merge(attributes), &block)
+      @bot.add_await(key, Discordrb::Events::MessageEvent, { from: @id }.merge(attributes), &block)
     end
 
     # Is the user the bot?
@@ -383,7 +385,7 @@ module Discordrb
 
     # Add an await for a message in this channel
     def await(key, attributes = {}, &block)
-      @bot.add_await(key, MessageEvent, { in: @id }.merge(attributes), &block)
+      @bot.add_await(key, Discordrb::Events::MessageEvent, { in: @id }.merge(attributes), &block)
     end
 
     def make_invite(max_age = 0, max_uses = 0, temporary = false, xkcd = false)
@@ -420,7 +422,7 @@ module Discordrb
       @content = data['content']
       @author = User.new(data['author'], bot)
       @channel = bot.channel(data['channel_id'].to_i)
-      @timestamp = Time.at(data['timestamp'].to_i)
+      @timestamp = Time.parse(data['timestamp'])
       @id = data['id'].to_i
 
       @mentions = []
@@ -444,7 +446,7 @@ module Discordrb
 
     # Add an await for a message with the same user and channel
     def await(key, attributes = {}, &block)
-      @bot.add_await(key, MessageEvent, { from: @author.id, in: @channel.id }.merge(attributes), &block)
+      @bot.add_await(key, Discordrb::Events::MessageEvent, { from: @author.id, in: @channel.id }.merge(attributes), &block)
     end
 
     def from_bot?
@@ -592,6 +594,8 @@ module Discordrb
       API.delete_server(@bot.token, @id)
     end
 
+    alias_method :leave, :delete
+
     def name=(name)
       update_server_data(name: name)
     end

data/lib/discordrb/logger.rb

@@ -0,0 +1,15 @@
+module Discordrb
+  # Logs debug messages
+  class Logger
+    attr_writer :debug
+
+    def debug(message, important = false)
+      puts "[DEBUG : #{Thread.current[:discordrb_name]} @ #{Time.now}] #{message}" if @debug || important
+    end
+
+    def log_exception(e)
+      debug("Exception: #{e.inspect}", true)
+      e.backtrace.each { |line| debug(line, true) }
+    end
+  end
+end

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.3'
+  VERSION = '1.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -128,6 +128,7 @@ files:
 - lib/discordrb/exceptions.rb
 - lib/discordrb/games.rb
 - lib/discordrb/games_list.rb
+- lib/discordrb/logger.rb
 - lib/discordrb/permissions.rb
 - lib/discordrb/version.rb
 - util/update_lists.rb