dsu3 0.3.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 784b8e875ba73a242236edf3a5623de6dba9c8546234f117db8a0e15ceb90ee2
-  data.tar.gz: 6637133b46a4fe93d22673a6737c66a644b853ef336eb050e099526cf3891162
+  metadata.gz: e545e0e38f675b05b374e68e43bed9c5cb794ae4acce2a05eb50830ded1c16ee
+  data.tar.gz: a7ccac599af92f1320f561326f8a7e025c91393e496e8baca014afeb5043d3a8
 SHA512:
-  metadata.gz: 24883144dbdca199af341c19e213833d887349378ea0dbd2d17cc01e1f92389d31baf9fc889f15a92c9ecfe64d74b96f861e807732861aa5d9834d0c85e0c499
-  data.tar.gz: 408862f035b692fa792f655ed9f8d887e6ff2fcef75c3dfb39f64bc567a3fe3a3170ce43c808a9d593a20f1785206a04fc87b6518cc61cbef5ce6f0f79680263
+  metadata.gz: eef4eadf13de5db7a8dbd4dca2bbf59e4f44956de4175d1cf308df4b009b3b0bdced88ca295bacb18562161c4b2bbcb0567a3462afb3990599cad7762b3fe5fa
+  data.tar.gz: f10eef693e3e690a6003a46e802f22d7435eedceaa6b31821b68055cf342be975b74170f6eb1a9afa4df5c61e4947934ebef175bce0bd4632ffab79b83fa14be

data/lib/dsu3/bot.rb

@@ -5,20 +5,21 @@ require 'json'
 require 'uri'
 
 module DSU3
+  # Class representing Discord bot
   class Bot
     API_BASE = 'https://discord.com/api/v9'
 
-    # @param [Hash] headers
-    def initialize(headers)
-      @headers = headers
+    # @param [String] token Discord account token
+    def initialize(token)
+      @headers = Props::HEADERS.merge(authorization: token)
     end
 
-    # Makes an API request, includes simple rate limit handling
+    # Makes an API request without any error handling
     # @param [Symbol, String] method
     # @param [String] endpoint Discord API endpoint
     # @param [Hash] headers Additional request headers
     # @param [String] payload
-    def request(method, endpoint, headers = {}, payload = nil)
+    def raw_request(method, endpoint, headers = {}, payload = nil)
       args = {
         method: method,
         url: URI.join(API_BASE, endpoint).to_s,
@@ -27,20 +28,24 @@ module DSU3
 
       args[:payload] = payload if payload
 
-      begin
-        RestClient::Request.execute(args)
-      rescue RestClient::ExceptionWithResponse => e
-        data = JSON.parse(e.response)
+      RestClient::Request.execute(args)
+    end
+
+    # Makes an API request, includes simple error handling
+    # @param (see #raw_request)
+    def request(...)
+      raw_request(...)
+    rescue RestClient::ExceptionWithResponse => e
+      data = JSON.parse(e.response)
 
-        if e.is_a?(RestClient::TooManyRequests)
-          retry_after = data['retry_after'] / 1000.0
+      if e.is_a?(RestClient::TooManyRequests)
+        retry_after = data['retry_after'] / 1000.0
 
-          LOGGER.warn("rate limit exceeded, waiting #{retry_after} seconds")
-          sleep(retry_after)
-          retry
-        else
-          LOGGER.error("#{data['code']}: #{data['message']}")
-        end
+        LOGGER.warn("rate limit exceeded, waiting #{retry_after} seconds")
+        sleep(retry_after)
+        retry
+      else
+        LOGGER.error("#{data['code']}: #{data['message']}")
       end
     end
 

data/lib/dsu3/core.rb

@@ -4,12 +4,11 @@ require 'dsu3/props'
 require 'dsu3/bot'
 
 module DSU3
-  # All DSU3 functionality, used to manage multiple bots
+  # Class used to manage multiple bots
   class Core
     # @param [Array] tokens List of bot tokens
-    def initialize(tokens)
-      headers = Props.headers
-      @bots = tokens.map { |token| Bot.new(headers.merge(authorization: token)) }
+    def initialize(*tokens)
+      @bots = tokens.map(&Bot.method(:new))
     end
 
     # (see Bot#type)

data/lib/dsu3/props.rb

@@ -5,53 +5,58 @@ require 'json'
 require 'base64'
 
 module DSU3
+  # The fundamental class in this vast system, on which all the other parts of the structure depend
+  # pretty bad code in this module rests by the way
   module Props
-    module_function
-
     # user-agent header
-    USER_AGENT =
-      'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) '\
-      'discord/0.0.18 Chrome/91.0.4472.164 Electron/13.6.6 Safari/537.36'
+    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'
+
+    # Fetches Discord client build number
+    def self.fetch_build_number
+      JSON.parse(RestClient.get(DATAMINING_COMMITS_URL))['commit']['message'].match(/Build (\d+)/)[1]
+    end
 
     # Decoded x-super-properties header
     SUPER_PROPERTIES = {
       os: 'Linux',
-      browser: 'Discord Client',
+      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_version: '0.0.18',
-      os_version: '5.10.0-14-amd64',
-      os_arch: 'x64',
-      system_locale: 'en-US',
-      window_manager: 'XFCE,xfce',
-      distro: 'Debian GNU/Linux 11 (bullseye)',
-      client_build_number: 136_921,
+      client_build_number: fetch_build_number,
       client_event_source: nil
     }.freeze
 
-    # Main headers
+    resp = RestClient.get('https://discord.com/api/v9/experiments')
+
+    # Headers necessary for normal interaction with the Discord API
     HEADERS = {
       accept: '*/*',
       accept_encoding: 'gzip, deflate, br',
-      accept_language: 'en-US',
+      accept_language: 'en',
+      alt_used: 'discord.com',
+      connection: 'keep-alive',
+      host: 'discord.com',
       sec_fetch_dest: 'empty',
       sec_fetch_mode: 'cors',
       sec_fetch_site: 'same-origin',
+      te: 'trailers',
       user_agent: USER_AGENT,
       x_debug_options: 'bugReporterEnabled',
       x_discord_locale: 'en-US',
       x_super_properties: Base64.strict_encode64(SUPER_PROPERTIES.to_json),
       content_type: 'application/json',
-      origin: 'https://discord.com'
+      cookie: HTTP::Cookie.cookie_value(resp.cookie_jar.cookies),
+      x_fingerprint: JSON.parse(resp.body)['fingerprint']
     }.freeze
-
-    # Gets the headers necessary for normal interaction with the Discord API
-    def headers
-      resp = RestClient.get('https://discord.com/api/v9/experiments')
-
-      {
-        cookie: HTTP::Cookie.cookie_value(resp.cookie_jar.cookies),
-        x_fingerprint: JSON.parse(resp.body)['fingerprint']
-      }.merge(HEADERS)
-    end
   end
 end

data/lib/dsu3/version.rb

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

data/lib/dsu3.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'logger'
+
+require 'dsu3/version'
 require 'dsu3/core'
 
 # Main DSU3 namespace
 module DSU3
-  VERSION = '0.3.1'
-
   LOGGER = Logger.new($stdout)
   LOGGER.level = Logger::WARN
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu3
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Artur Sheremetjev IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -36,6 +36,7 @@ files:
 - lib/dsu3/bot.rb
 - lib/dsu3/core.rb
 - lib/dsu3/props.rb
+- lib/dsu3/version.rb
 homepage: https://rubygems.org/gems/dsu3
 licenses:
 - MIT
@@ -51,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="