dsu3 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3836a58d3aac7cf05d21fddc541bff2daed7ae535c9afbf57aedccaaa452a11a
-  data.tar.gz: 5dec7ec5f4704f993efeccda45900e6824da03bf5c9c9715203d446cb0231a67
+  metadata.gz: cab6805b66145e0cd335d4431b7d16146ecc05b119159eaf741d2cb986c9bd7d
+  data.tar.gz: 11c4787411fb7fb0210e8e2599f8d1d3205745447d0ba380963e8687837e6497
 SHA512:
-  metadata.gz: 803eafe94df41b818bb6d90bb068b6f27bc7f0a7c718c854069070c7e381fe62e5f85598cc43ed594bbe63284e6542cf3bbe70cb865daea6a80cd293607b6493
-  data.tar.gz: 8872033f7b17ffd4498f4bb35003543f8c8f0f29a11cc480924e92141b0eb577c2a730a49fd31173c56c496e03f14fe213f167613420c17ab7a3355adccd8b1e
+  metadata.gz: 05fd5a369ad65fe3fe4330ee216b4108f894695964211389c16d3996c7c428a2e387eda909f3e96689511112f39fe526777b25053d3fd493958d67b13c85ccfb
+  data.tar.gz: aad9ef63b68458829d85845015d2f70e8f93611d85fc4e2e86f19136cccbf1cbf213d764be3a15b512c86c8f42d882dba653c4c121f84b7d63088fbee5028257

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.new('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

@@ -5,7 +5,7 @@ module DSU3
   class Channel < DObject
     # Types text into a channel
     def type
-      @net.request(cooldown: 9, loop: true) { DSU3::API::Channel.type(_1, @id) }
+      @net.request(loop: true, cooldown: 9) { DSU3::API::Channel.type(_1, @id) }
     end
 
     # Sends a message to a channel
@@ -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

@@ -5,7 +5,7 @@ module DSU3
   class Guild < DObject
     # Verifies accounts on the server
     def verify
-      @net.request(cooldown: 0.5) { DSU3::API::Guild.verify(_1, @id) }
+      @net.request(seq: true, cooldown: 0.5) { DSU3::API::Guild.verify(_1, @id) }
     end
   end
-end
+end

data/lib/dsu3/data/invite.rb

@@ -5,7 +5,7 @@ module DSU3
   class Invite < DObject
     # Joins guild
     def join
-      @net.request(cooldown: 0.5) { DSU3::API::Invites.join(token, @id) }
+      @net.request(seq: true, cooldown: 0.5) { DSU3::API::Invite.join(_1, @id) }
     end
   end
-end
+end

data/lib/dsu3/data/message.rb

@@ -13,8 +13,9 @@ module DSU3
     # Reacts to a message
     # @note To use custom emoji, you must encode it in the format name:id with the emoji name and emoji id
     # @param [String] emoji
-    def react(emoji)
-      @net.request { DSU3::API::Message.react(_1, @channel_id, @id, emoji) }
+    # @param [Integer] cooldown
+    def react(emoji, cooldown = 0)
+      @net.request(seq: true, cooldown: cooldown) { 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

@@ -5,37 +5,47 @@ require 'dsu3/data'
 module DSU3
   # Class used to manage multiple bots
   class Net
-    attr_reader :tokens, :mutex
-
     # @param [Array] tokens List of bot tokens
     def initialize(*tokens)
       raise 'There must be at least one token' if tokens.empty?
 
-      @tokens = tokens
-      @mutex = Mutex.new
+      @tokens = tokens.uniq
     end
 
-    # An auxiliary method that can be used to make an Discord API call from multiple tokens with ratelimit and thread support
+    # Make Discord API calls
     # @param [Hash] opts Options
+    # @option opts [Bool] :seq Whether we have to make API calls consecutively
+    # @option opts [Bool] :loop If threads should loop
+    # @option opts [Integer, Float] :cooldown Cooldown between API calls
     def request(opts = {})
-      opts = {cooldown: 0, loop: false}.merge(opts)
+      opts = { seq: false, loop: false, cooldown: 0 }.merge(opts)
+
+      raise 'sequential requests do not support looping' if opts[:seq] && opts[:loop]
 
-      @tokens.each do |token|
+      mutex = opts[:seq] ? Mutex.new : nil
+
+      @tokens.map do |token|
         Thread.new do
           begin
-            @mutex.synchronize { yield token }
+            mutex&.lock
+
+            yield token
             sleep(opts[:cooldown])
+
+            mutex&.unlock
           rescue DSU3::RateLimitError => e
+            mutex&.unlock
+
             DSU3::LOGGER.warn('ratelimit exceeded')
-            @mutex.sleep(e.retry_after)
+            sleep(e.retry_after)
             retry
           end while opts[:loop]
-        end.join
-      end
+        end
+      end.join(&:map)
     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.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Artur Sheremetjev IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client