dsu3 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3836a58d3aac7cf05d21fddc541bff2daed7ae535c9afbf57aedccaaa452a11a
-  data.tar.gz: 5dec7ec5f4704f993efeccda45900e6824da03bf5c9c9715203d446cb0231a67
+  metadata.gz: 926cbe8acc038109fc2b0cda6f10af35f204f2c78e91fe6a31c87d9bd1ea81c3
+  data.tar.gz: a4e823799e5a47bcf068650364dd29d94154708c7db601275eb0f768bbb81e16
 SHA512:
-  metadata.gz: 803eafe94df41b818bb6d90bb068b6f27bc7f0a7c718c854069070c7e381fe62e5f85598cc43ed594bbe63284e6542cf3bbe70cb865daea6a80cd293607b6493
-  data.tar.gz: 8872033f7b17ffd4498f4bb35003543f8c8f0f29a11cc480924e92141b0eb577c2a730a49fd31173c56c496e03f14fe213f167613420c17ab7a3355adccd8b1e
+  metadata.gz: 6eda735ef22ec9762a781d228fcc217f6dade60fbbdc2d65ba0c4efbfe2ceb6fc969698ff3f0311ac035fdf1b952e2e90560f0547e2f79ad07d6f3227836c4c9
+  data.tar.gz: a712aa467a11baeebd5549e88905d570d5e6df41446ef500e6e97785f026ec22b2d7a29ef2bc1f307ec9b20e7a21d14b8ebd89929045bf01b0d2ca2104e67a58

data/lib/dsu3/api/message.rb

@@ -23,4 +23,4 @@ module DSU3
       end
     end
   end
-end
+end

data/lib/dsu3/api/user.rb

@@ -16,4 +16,4 @@ module DSU3
       end
     end
   end
-end
+end

data/lib/dsu3/api.rb

@@ -15,8 +15,6 @@ module DSU3
   module API
     API_BASE = 'https://discord.com/api/v9/'
 
-    @ratelimits = []
-
     module_function
 
     # Makes an API request without any error handling
@@ -40,16 +38,14 @@ module DSU3
     # @param (see #raw_request)
     # @return (see #raw_request)
     def request(...)
+      raw_request(...)
+    rescue RestClient::ExceptionWithResponse => e
       begin
-        raw_request(...)
-      rescue RestClient::ExceptionWithResponse => e
-        begin
-          data = JSON.parse(e.response.body)
-          raise DSU3::RateLimitError('ratelimit exceeded', data['retry_after']) if e.is_a?(RestClient::TooManyRequests)
-          raise DSU3::CodeError.new("#{data['code']}: #{data['message']}")
-        rescue JSON::ParserError
-          raise e
-        end
+        data = JSON.parse(e.response.body)
+        raise DSU3::RateLimitError('ratelimit exceeded', data['retry_after']) if e.is_a?(RestClient::TooManyRequests)
+        raise DSU3::CodeError, "#{data['code']}: #{data['message']}"
+      rescue JSON::ParserError
+        raise e
       end
     end
   end

data/lib/dsu3/data/channel.rb

@@ -27,7 +27,7 @@ module DSU3
     # Returns Message instance
     # @param [String, Integer] message Message ID
     def message(message_id)
-      DSU3::Message.new(@tokens, @id, message_id)
+      DSU3::Message.new(self, message_id)
     end
   end
 end

data/lib/dsu3/data/guild.rb

@@ -8,4 +8,4 @@ module DSU3
       @net.request(cooldown: 0.5) { DSU3::API::Guild.verify(_1, @id) }
     end
   end
-end
+end

data/lib/dsu3/data/invite.rb

@@ -8,4 +8,4 @@ module DSU3
       @net.request(cooldown: 0.5) { DSU3::API::Invites.join(token, @id) }
     end
   end
-end
+end

data/lib/dsu3/data/message.rb

@@ -17,4 +17,4 @@ module DSU3
       @net.request { DSU3::API::Message.react(_1, @channel_id, @id, emoji) }
     end
   end
-end
+end

data/lib/dsu3/data.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'dsu3/api'
 require 'dsu3/dobject'
 require 'dsu3/data/channel'
 require 'dsu3/data/guild'
 require 'dsu3/data/invite'
-require 'dsu3/data/message'
+require 'dsu3/data/message'

data/lib/dsu3/dobject.rb

@@ -12,4 +12,4 @@ module DSU3
       @id = id
     end
   end
-end
+end

data/lib/dsu3/errors.rb

@@ -11,4 +11,4 @@ module DSU3
   end
 
   CodeError = Class.new(StandardError)
-end
+end

data/lib/dsu3/net.rb

@@ -18,7 +18,7 @@ module DSU3
     # An auxiliary method that can be used to make an Discord API call from multiple tokens with ratelimit and thread support
     # @param [Hash] opts Options
     def request(opts = {})
-      opts = {cooldown: 0, loop: false}.merge(opts)
+      opts = { cooldown: 0, loop: false }.merge(opts)
 
       @tokens.each do |token|
         Thread.new do
@@ -35,7 +35,7 @@ module DSU3
     end
 
     # I'm too lazy to try to document it
-    %w{channel guild invite}.each do |s|
+    %w[channel guild invite].each do |s|
       define_method s do |id|
         DSU3.const_get(s.capitalize).new(self, id)
       end

data/lib/dsu3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DSU3
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsu3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Artur Sheremetjev IV