discordrb 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba9ef73aa069ebdb0bbbb9d89339cf4b10d9e706
-  data.tar.gz: 9a32dcb4a8c9923653255453107aaea6c0d634d0
+  metadata.gz: 17194fcdf12b5f81b55a74f37cd276dcf9e13071
+  data.tar.gz: cb7bd42eb2b78807e44646c35b1717e6a89a3825
 SHA512:
-  metadata.gz: 94cc392c8c4fda6078aefa460f9d22802d58f1fc0a4b9181482008a70aaa6e8e44825ff509b6e15e27ae7b2b3ae9cb659a1a53bc88450768159e13b2f86f2bf7
-  data.tar.gz: ad17ad5babe2f5975385da9a1470792bfd0b0be1ec20d51b978f212bac4afe56a251b1e3bcd0675e65ad44328e25906cf9e7183183953f4c49a88cf5d6fc269b
+  metadata.gz: aa692f6814a8440a5783f7c3881e9472b4094e7000c52a762fe0231becf8dad7a1c08b05cfb37aad4bda0f5c0371dad97bdfd88536ebf02e3c1288b0202b6e19
+  data.tar.gz: 86caf5985693e9cf07d64b385b5bab07286c0c06e2e50c16325115e55a5fb1fbb2d47ba7b2ca4effa1887f04825fc6b96b939625c674f5e43aa56f7fb991c864

data/lib/discordrb/bot.rb

@@ -42,8 +42,8 @@ module Discordrb
 
       while true do
         websocket_connect
-        puts "disconnected. attempting to reconnect. " + Time.now.to_s
-        sleep 2
+        debug("Disconnected! Attempting to reconnect in 5 seconds.")
+        sleep 5
         @token = login
       end
     end
@@ -130,7 +130,7 @@ module Discordrb
     private
 
     def debug(message)
-      puts "[DEBUG] #{message}" if @debug
+      puts "[DEBUG @ #{Time.now.to_s}] #{message}" if @debug
     end
 
     def login
@@ -149,26 +149,34 @@ module Discordrb
       login_response_object['token']
     rescue Exception => e
       response_code = login_response.nil? ? 0 : login_response.code ######## mackmm145
-      if login_attempts < 100 && ( e.inspect.include?("No such host is known.") || response_code == 523)
-        sleep 15
-        puts "login failed. reattempting. " + Time.now.to_s
-        login_attempts = login_attempts + 1
+      if login_attempts < 100 && (e.inspect.include?("No such host is known.") || response_code == 523)
+        debug("Login failed! Reattempting in 5 seconds. #{100 - login_attempts} attempts remaining.")
+        debug("Error was: #{e.inspect}")
+        sleep 5
+        login_attempts += 1
         retry
       else
+        debug("Login failed permanently after #{login_attempts + 1} attempts")
+
+        # Apparently we get a 400 if the password or username is incorrect. In that case, tell the user
+        debug("Are you sure you're using the correct username and password?") if e.class == RestClient::BadRequest
         raise $!
       end
     end
 
     def get_gateway
-      response = JSON.parse( RestClient.get Discordrb::Endpoints::GATEWAY, :authorization => @token ) #get updated websocket_hub
-      response["url"]
+      # Get updated websocket_hub
+      response = RestClient.get Discordrb::Endpoints::GATEWAY, :authorization => @token
+      JSON.parse(response)["url"]
     end
 
     def websocket_connect
+      debug("Attempting to get gateway URL...")
       websocket_hub = get_gateway
+      debug("Success! Gateway URL is #{websocket_hub}.")
+      debug("Now running bot")
 
       EM.run {
-        #@ws = Faye::WebSocket::Client.new(Discordrb::Endpoints::WEBSOCKET_HUB)
         @ws = Faye::WebSocket::Client.new(websocket_hub)
 
         @ws.on :open do |event|; websocket_open(event); end
@@ -238,6 +246,9 @@ module Discordrb
     end
 
     def websocket_close(event)
+      debug("Disconnected from WebSocket!")
+      debug(" (Reason: #{event.reason})")
+      debug(" (Code: #{event.code})")
       raise_event(DisconnectEvent.new)
       EM.stop
     end

data/lib/discordrb/version.rb

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

metadata

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