dsu3 0.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bdb56aba1f99a4481ab5f9f77ca5b0ce9225018bc63e9ee6d2c6328293b4bd4
-  data.tar.gz: 4e21edf7b3a559d2df17051d80afabf2ddfc2092173a0c21ad3799790cd3e866
+  metadata.gz: 9572203f08a6ce1f65c4a33b613b51a116c0fc935c6f26c8d0e5b2f0600740b6
+  data.tar.gz: 89b125202ba866c62599f69fa7f9321b82d4edf3773fdebcbe0dfe6771f1f724
 SHA512:
-  metadata.gz: 23353ec18dc576ed7013887bf3807b8c9c180271de19ffaa6e064785fe587175cd44d70ef7096a162b342032bcc8395914e6bc54c03bf252ffec21c888545bde
-  data.tar.gz: 41d794a77c78de9dac650012f841c3ddb921ef38080dda5d3e654c1e0a8974b5fc9f80a2964e91fc642c5fe168a351e1202357cec6aa2fc0072283068aea25a0
+  metadata.gz: 5fd28581d81eeead4c8295818ef4f1484218e7771b42709a47991696da2b0eb9c9b936aa0fbaa36b800b5f798d55271e3b5acf333a59895658d1b4c87acdb312
+  data.tar.gz: 2857ce644817ba1f2965de5d82585322ecd889fa4eb87f5a7980119a22654d623f1e1af84c174c3a029bbbf04bd5e3f82e3b7e1fea1848ffea96ab1dc360ed66

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
 
@@ -81,7 +86,7 @@ module DSU3
       request(
         :put,
         "channels/#{channel}/messages/#{message}/reactions/#{emoji}/@me",
-        {params: {location: 'Message'}}
+        { params: { location: 'Message' } }
       )
     end
   end

data/lib/dsu3/core.rb

@@ -4,18 +4,17 @@ 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)
     def typespam(channel)
       loop do
-        @bots.each(&:type)
+        @bots.each { |bot| bot.type(channel) }
         sleep 9
       end
     end

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 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.rb

@@ -5,7 +5,7 @@ require 'dsu3/core'
 
 # Main DSU3 namespace
 module DSU3
-  VERSION = '0.3'
+  VERSION = '0.5.0'
 
   LOGGER = Logger.new($stdout)
   LOGGER.level = Logger::WARN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu3
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.5.0
 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
@@ -51,7 +51,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:
   - - ">="