dsu3 0.9.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640c9953a32bc972d54f3d032163474bfc5f58add8d4f59a9064bacc0512e4e3
-  data.tar.gz: 4fbc03d22f27b90ba2917eb81fb612691fe2be6bd35a6cd725d4d6f2de052496
+  metadata.gz: 926cbe8acc038109fc2b0cda6f10af35f204f2c78e91fe6a31c87d9bd1ea81c3
+  data.tar.gz: a4e823799e5a47bcf068650364dd29d94154708c7db601275eb0f768bbb81e16
 SHA512:
-  metadata.gz: d4b473f3733e34377baf5316e3537aa9368cbf2db4987c5f3b446107925b4f8660f9ca3956f2c3c38a9ecdda45336e276f2a451449216ed2b325079606114371
-  data.tar.gz: 222a46f109dbd7f684d1c86ad1e72c2d730e0e88ca038263f63c3390fb9812bef7702101d6672a93ab4dd1aaeff51b6dbaba717df0a1273226ce9f5645ab98a8
+  metadata.gz: 6eda735ef22ec9762a781d228fcc217f6dade60fbbdc2d65ba0c4efbfe2ceb6fc969698ff3f0311ac035fdf1b952e2e90560f0547e2f79ad07d6f3227836c4c9
+  data.tar.gz: a712aa467a11baeebd5549e88905d570d5e6df41446ef500e6e97785f026ec22b2d7a29ef2bc1f307ec9b20e7a21d14b8ebd89929045bf01b0d2ca2104e67a58

data/bin/dsu3

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'dsu3'
 
-@net = DSU3::Net.new(*File.readlines(ARGV.shift).map(&:chop))
+@net = DSU3::Net.new(*File.read(ARGV.shift).split("\n"))
 
 require 'irb'
-IRB.start
+IRB.start

data/lib/dsu3/api/channel.rb

@@ -2,11 +2,11 @@
 
 module DSU3
   module API
-    # Channels resource
+    # Channel API calls
     module Channel
       module_function
 
-      # Types text into a particular channel
+      # Types text into a channel
       # @param [String] token Discord account token
       # @param [String, Integer] channel Channel ID
       def type(token, channel)
@@ -15,7 +15,7 @@ module DSU3
         )
       end
 
-      # Sends a message to a specific channel
+      # Sends a message to a channel
       # @param [String] token Discord account token
       # @param [String, Integer] channel Channel ID
       # @param [String, Integer] message Message contents

data/lib/dsu3/api/guild.rb

@@ -2,21 +2,20 @@
 
 module DSU3
   module API
-    # Guilds resource
+    # Guild API calls
     module Guild
       module_function
 
       # Verifies the server member
       # @param [String] token Discord account token
       # @param [String, Integer] guild Guild ID
-      # @param [String] invite Invite code
-      def verify(token, guild, invite)
+      def verify(token, guild)
         DSU3::API.request(
           token, :get,
           "guilds/#{guild}/member-verification",
-          { params: { with_guild: false, invite_code: invite } }
+          { params: { with_guild: false } }
         )
       end
     end
   end
-end
+end

data/lib/dsu3/api/invite.rb

@@ -2,7 +2,7 @@
 
 module DSU3
   module API
-    # Invites resource
+    # Invite API calls
     module Invite
       module_function
 
@@ -18,4 +18,4 @@ module DSU3
       end
     end
   end
-end
+end

data/lib/dsu3/api/message.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module DSU3
+  module API
+    # Message API calls
+    module Message
+      module_function
+
+      # 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] token Discord account token
+      # @param [String, Integer] channel Channel ID
+      # @param [String, Integer] message Message ID
+      # @param [String] emoji
+      def react(token, channel, message, emoji)
+        emoji = URI.encode_www_form_component(emoji)
+
+        DSU3::API.request(
+          token, :put,
+          "channels/#{channel}/messages/#{message}/reactions/#{emoji}/@me",
+          { params: { location: 'Message' } }
+        )
+      end
+    end
+  end
+end

data/lib/dsu3/api/user.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module DSU3
+  module API
+    # User API calls
+    module User
+      module_function
+
+      # Get user
+      # @param [String] token Discord account token
+      # @param [String, Integer] user User ID
+      def get(token, user)
+        DSU3::API.request(
+          token, :get, "users/#{user}"
+        )
+      end
+    end
+  end
+end

data/lib/dsu3/api.rb

@@ -2,17 +2,18 @@
 
 require 'rest-client'
 require 'json'
-require 'uri'
 
 require 'dsu3/props'
+require 'dsu3/errors'
 require 'dsu3/api/channel'
 require 'dsu3/api/guild'
 require 'dsu3/api/invite'
+require 'dsu3/api/message'
 
 module DSU3
   # Namespace for all methods representing Discord API endpoints
   module API
-    API_BASE = 'https://discord.com/api/v9'
+    API_BASE = 'https://discord.com/api/v9/'
 
     module_function
 
@@ -22,32 +23,30 @@ module DSU3
     # @param [String] route Discord API route
     # @param [Hash] headers Additional request headers
     # @param [String] payload
-    # @return [RestClient::Response] Response object
+    # @return [String] Response body
     def raw_request(token, method, route, headers = {}, payload = nil)
       RestClient::Request.execute(
         method: method,
-        url: URI.join(API_BASE, route).to_s,
+        url: API_BASE + route,
         headers: headers.merge(DSU3::Props::HEADERS, { authorization: token }),
         payload: payload,
         proxy: DSU3.proxies.sample
-      )
+      ).body
     end
 
-    # Makes an API request, includes simple error handling
+    # Makes an API request, includes handling ratelimits and errors
     # @param (see #raw_request)
     # @return (see #raw_request)
     def request(...)
       raw_request(...)
     rescue RestClient::ExceptionWithResponse => e
-      if e.is_a?(RestClient::TooManyRequests)
-        LOGGER.warn('ratelimit exceeded')
-      elsif e.response.headers[:content_type] == 'application/json'
+      begin
         data = JSON.parse(e.response.body)
-        LOGGER.error("#{data['code']}: #{data['message']}")
-      else
-        LOGGER.error(e.message)
+        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
-      e.response
     end
   end
 end

data/lib/dsu3/data/channel.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module DSU3
+  # Channel object
+  class Channel < DObject
+    # Types text into a channel
+    def type
+      @net.request(cooldown: 9, loop: true) { DSU3::API::Channel.type(_1, @id) }
+    end
+
+    # Sends a message to a channel
+    # @param [String, Integer] message Message contents
+    def send(message)
+      @net.request { DSU3::API::Channel.send(_1, @id, message) }
+    end
+
+    # @overload spam(message)
+    #   Spams to a channel
+    #   @param [String] message Message contents
+    # @overload spam(&block)
+    #   Every time the decisive moment to send a message comes up,
+    #   this function calls our block and pigeonholes the value returned by it
+    def spam(message)
+      @net.request(loop: true) { DSU3::API::Channel.send(_1, @id, message || yield) }
+    end
+
+    # Returns Message instance
+    # @param [String, Integer] message Message ID
+    def message(message_id)
+      DSU3::Message.new(self, message_id)
+    end
+  end
+end

data/lib/dsu3/data/guild.rb

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

data/lib/dsu3/data/invite.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DSU3
+  # Invite object
+  class Invite < DObject
+    # Joins guild
+    def join
+      @net.request(cooldown: 0.5) { DSU3::API::Invites.join(token, @id) }
+    end
+  end
+end

data/lib/dsu3/data/message.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module DSU3
+  # Message object
+  class Message < DObject
+    # @param [DSU3::Channel] channel Channel instance
+    # @param [String, Integer] id Message ID
+    def initialize(channel, id)
+      super(channel.net, id)
+      @channel_id = channel.id
+    end
+
+    # 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) }
+    end
+  end
+end

data/lib/dsu3/data.rb

@@ -0,0 +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'

data/lib/dsu3/dobject.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DSU3
+  # Discord object
+  class DObject
+    attr_reader :net, :id
+
+    # @param [Array] net Net object
+    # @param [String, Integer] id
+    def initialize(net, id)
+      @net = net
+      @id = id
+    end
+  end
+end

data/lib/dsu3/errors.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module DSU3
+  class RateLimitError < StandardError
+    attr_reader :retry_after
+
+    def initialize(message, retry_after)
+      @message = message
+      @retry_after = retry_after
+    end
+  end
+
+  CodeError = Class.new(StandardError)
+end

data/lib/dsu3/net.rb

@@ -1,55 +1,43 @@
 # frozen_string_literal: true
 
-require 'dsu3/api'
+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)
-      @tokens = tokens
-    end
-
-    # (see DSU3::API::Channel#type)
-    def typespam(channel)
-      loop do
-        @tokens.each { |token| DSU3::API::Channel.type(token, channel) }
-        sleep 9
-      end
-    end
+      raise 'There must be at least one token' if tokens.empty?
 
-    # (see DSU3::API::Channel#send)
-    def send(channel, message)
-      @tokens.each { |token| DSU3::API::Channel.send(token, channel, message) }
+      @tokens = tokens
+      @mutex = Mutex.new
     end
 
-    # Infinitely calls a block and sends the value it returns to a specific channel
-    # @param [String] token Discord account token
-    # @param [String, Integer] channel Channel ID
-    def spam(channel, &block)
-      loop do
-        @tokens.each { |token| DSU3::API::Channel.send(token, channel, block.call) }
-      end
-    end
+    # 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)
 
-    # (see DSU3::API::Invite#join)
-    def join(invite)
       @tokens.each do |token|
-        DSU3::API::Invites.join(token, invite)
-        sleep(0.5)
+        Thread.new do
+          begin
+            @mutex.synchronize { yield token }
+            sleep(opts[:cooldown])
+          rescue DSU3::RateLimitError => e
+            DSU3::LOGGER.warn('ratelimit exceeded')
+            @mutex.sleep(e.retry_after)
+            retry
+          end while opts[:loop]
+        end.join
       end
     end
 
-    # (see DSU3::API::Channel#react)
-    def react(channel, message, emoji)
-      @tokens.each { |token| DSU3::API::Channel.react(token, channel, message, emoji) }
-    end
-
-    # (see DSU3::API::Guild#verify)
-    def verify(guild, invite)
-      @tokens.each do |token|
-        DSU3::API::Guild.verify(token, guild, invite)
-        sleep(0.5)
+    # I'm too lazy to try to document it
+    %w[channel guild invite].each do |s|
+      define_method s do |id|
+        DSU3.const_get(s.capitalize).new(self, id)
       end
     end
   end

data/lib/dsu3/props.rb

@@ -8,30 +8,34 @@ module DSU3
     # user-agent header
     USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0'
 
-    DATAMINING_COMMITS_URL = 'https://api.github.com/repos/Discord-Datamining/Discord-Datamining/commits/master'
+    module_function
 
     # Fetches Discord client build number
-    def self.fetch_build_number
-      JSON.parse(RestClient.get(DATAMINING_COMMITS_URL))['commit']['message'].match(/Build (\d+)/)[1]
+    def fetch_build_number
+      JSON.parse(
+        RestClient.get('https://api.github.com/repos/Discord-Datamining/Discord-Datamining/commits/master')
+      )['commit']['message'].match(/Build (\d+)/)[1]
     end
 
-    # Decoded x-super-properties header
-    SUPER_PROPERTIES = {
-      os: 'Linux',
-      browser: 'Firefox',
-      device: '',
-      system_locale: 'en',
-      browser_user_agent: USER_AGENT,
-      browser_version: '91.0',
-      os_version: '',
-      referrer: '',
-      referring_domain: '',
-      referrer_current: '',
-      referring_domain_current: '',
-      release_channel: 'stable',
-      client_build_number: fetch_build_number,
-      client_event_source: nil
-    }.freeze
+    # Generates x-super-properties header
+    def generate_x_super_properties
+      Base64.strict_encode64(JSON.generate(
+        os: 'Linux',
+        browser: 'Firefox',
+        device: '',
+        system_locale: 'en',
+        browser_user_agent: USER_AGENT,
+        browser_version: '91.0',
+        os_version: '',
+        referrer: '',
+        referring_domain: '',
+        referrer_current: '',
+        referring_domain_current: '',
+        release_channel: 'stable',
+        client_build_number: fetch_build_number,
+        client_event_source: nil
+      ))
+    end
 
     resp = RestClient.get('https://discord.com/api/v9/experiments')
 
@@ -50,7 +54,7 @@ module DSU3
       user_agent: USER_AGENT,
       x_debug_options: 'bugReporterEnabled',
       x_discord_locale: 'en-US',
-      x_super_properties: Base64.strict_encode64(SUPER_PROPERTIES.to_json),
+      x_super_properties: generate_x_super_properties,
       content_type: 'application/json',
       cookie: HTTP::Cookie.cookie_value(resp.cookie_jar.cookies),
       x_fingerprint: JSON.parse(resp.body)['fingerprint']

data/lib/dsu3/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu3
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Artur Sheremetjev IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -39,6 +39,15 @@ files:
 - lib/dsu3/api/channel.rb
 - lib/dsu3/api/guild.rb
 - lib/dsu3/api/invite.rb
+- lib/dsu3/api/message.rb
+- lib/dsu3/api/user.rb
+- lib/dsu3/data.rb
+- lib/dsu3/data/channel.rb
+- lib/dsu3/data/guild.rb
+- lib/dsu3/data/invite.rb
+- lib/dsu3/data/message.rb
+- lib/dsu3/dobject.rb
+- lib/dsu3/errors.rb
 - lib/dsu3/net.rb
 - lib/dsu3/props.rb
 - lib/dsu3/version.rb