discordrb 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec7e3a8b62b062f98fbee7d3df3f39bafdd67d9
-  data.tar.gz: e95a464d355afd62bb5efe8b05a1f8fd5fdc8f82
+  metadata.gz: 62fe85ee830d1b97bab34f61e01961d2c159724c
+  data.tar.gz: f42039af35431e99f4c513450360f0f96b145aa8
 SHA512:
-  metadata.gz: c0bcdf7cb78ea821c1216615ff3934e6d23839cf0ebee6f7ff06b812a18f250bc951777cfc3d5b8e3c5b30802ab553217c2f4438372012784f41526a3cb33c22
-  data.tar.gz: 851fe9fcb6fd6b1b1ae87f949956cf4708015f0afb76edda68eb528386b6d130cc8a8b31bf93fdf65853eacb91c91432a1e1bf06b88784147816902c30053e64
+  metadata.gz: e81ca3b6bcc077c62ecf84d651963703d829e72dbd6667d852f930ba08ac30bc9e1e79ffed01a87ddc677d367cb6459e817e3f7161297c83009662de385d99c8
+  data.tar.gz: 0e552aea62a2f0fe25613b489444c9b9e6f36860cac8e50276a5883aafe127a6d789de8b7501e379913e02b12192cb7ddb89868ef6e76ffd0a5610889a339788

data/discordrb.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faye-websocket"
   spec.add_dependency "rest-client"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/discordrb/bot.rb

@@ -41,10 +41,10 @@ module Discordrb
       end
 
       while true do
-        @token = login
         websocket_connect
         puts "disconnected. attempting to reconnect. " + Time.now.to_s
         sleep 2
+        @token = login
       end
     end
 
@@ -77,7 +77,7 @@ module Discordrb
     def send_message(channel_id, content)
       debug("Sending message to #{channel_id} with content '#{content}'")
       data = {
-        'content' => content,
+        'content' => content.to_s,
         'mentions' => []
       }
 
@@ -145,7 +145,7 @@ module Discordrb
       debug("Received token: #{login_response_object['token']}")
       login_response_object['token']
     rescue Exception => e
-      response_code = login_response.code || 0
+      response_code = login_response.code || 0 ######## 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
@@ -156,17 +156,22 @@ module Discordrb
       end
     end
 
+    def get_gateway
+      response = JSON.parse( RestClient.get Discordrb::Endpoints::GATEWAY, :authorization => @token ) #get updated websocket_hub
+      response["url"]
+    end
+
     def websocket_connect
+      websocket_hub = get_gateway
+
       EM.run {
-        @ws = Faye::WebSocket::Client.new(Discordrb::Endpoints::WEBSOCKET_HUB)
+        #@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
         @ws.on :message do |event|; websocket_message(event); end
-
-        @ws.on :close do |event|
-          websocket_close(event)
-          @ws = nil
-        end
+        @ws.on :error do |event|; debug(event.message); end
+        @ws.on :close do |event|; websocket_close(event); @ws = nil; end
       }
     end
 
@@ -243,7 +248,7 @@ module Discordrb
           "token" => @token,
           "properties" => {   # I'm unsure what these values are for exactly, but they don't appear to impact bot functionality in any way.
             "$os" => "Linux",
-            "$browser" => "Chrome",
+            "$browser" => "",
             "$device" => "discordrb",
             "$referrer" => "",
             "$referring_domain" => ""

data/lib/discordrb/endpoints/endpoints.rb

@@ -2,7 +2,8 @@ module Discordrb::Endpoints
   BASE = "https://discordapp.com/"
   APIBASE = BASE + "api"
 
-  WEBSOCKET_HUB = "wss://discordapp.com/hub"
+  #WEBSOCKET_HUB = "wss://discordapp.com/hub"
+  GATEWAY = APIBASE + "/gateway"
 
   LOGIN = APIBASE + "/auth/login"
   LOGOUT = APIBASE + "/auth/logout"

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - meew0
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement