dsu3 0.2.0 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc824dc0c20f13c57b1d52de343242849f438cfd4ad4689d52d67e364640c32
-  data.tar.gz: 0fd1ff66a6390130bac16711c7dee4ece28ede6022e640a0ce8d9c7365e02604
+  metadata.gz: e9a0705c6d460fe073239d8637574b0fa3e8abfb618064aca5d79271f34a0d70
+  data.tar.gz: c622c03008ec604396abf1309d7fc87155bc9dca09650c7486305ec05214d6cb
 SHA512:
-  metadata.gz: '09d69467460d12018015c06b3913739eab1c596f82b6d6def36601c4f3417e76bd1db62dacd1c9f042971c819a289f1592bd2fa0ad065fc787cbfe9a1ae3b1b5'
-  data.tar.gz: 822d6e5232aa464cd77e5440313353d917ce0433c46a75442baffcebe9c121cbdf0a88a4d4b680e71a64c44968392dd82cb3aca2592f1ccc391dcd736c6e09c6
+  metadata.gz: db0f31beb357f9e01751305fa00c0e914c0b2e9a51664afdbf88a2940e8b23fef2488e84597eb44c1e155d4bb6f6641f51ba86067dc7ca3fa537f86da13088b5
+  data.tar.gz: 9a9c5288a110b35e13db5b5879c8d79ab9ba2b26f952b91b203a87ed628c1b100f0f69cfb8c27a267d1cbcd50cff43e770e3f80e5f50161492c051b2039d314d

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,15 +28,33 @@ module DSU3
 
       args[:payload] = payload if payload
 
-      begin
-        RestClient::Request.execute(args)
-      rescue RestClient::TooManyRequests => e
-        LOGGER.warn('rate limit exceeded')
-        sleep(JSON.parse(e.response)['retry_after'] / 1000.0)
+      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
+
+        LOGGER.warn("rate limit exceeded, waiting #{retry_after} seconds")
+        sleep(retry_after)
         retry
+      else
+        LOGGER.error("#{data['code']}: #{data['message']}")
       end
     end
 
+    # Types text into a particular channel
+    # @param [String, Integer] channel Channel ID
+    def type(channel)
+      request(:post, "channels/#{channel}/typing")
+    end
+
     # Sends a message to a specific channel
     # @param [String, Integer] channel Channel ID
     # @param [String] message
@@ -55,5 +74,20 @@ module DSU3
         '{}'
       )
     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, Integer] channel Channel ID
+    # @param [String, Integer] message Message ID
+    # @param [String] emoji
+    def react(channel, message, emoji)
+      emoji = URI.encode_www_form_component(emoji)
+
+      request(
+        :put,
+        "channels/#{channel}/messages/#{message}/reactions/#{emoji}/@me",
+        { params: { location: 'Message' } }
+      )
+    end
   end
 end

data/lib/dsu3/core.rb

@@ -4,19 +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
 
-    # Infinitely writes to a particular channel
-    # @param [String, Integer] channel Channel ID
+    # (see Bot#type)
     def typespam(channel)
       loop do
-        @bots.each { |bot| bot.request(:post, "channels/#{channel}/typing") }
+        @bots.each { |bot| bot.type(channel) }
         sleep 9
       end
     end
@@ -39,5 +37,10 @@ module DSU3
         sleep(0.5)
       end
     end
+
+    # (see Bot#react)
+    def react(channel, message, emoji)
+      @bots.each { |bot| bot.react(channel, message, emoji) }
+    end
   end
 end

data/lib/dsu3/props.rb

@@ -6,8 +6,6 @@ require 'base64'
 
 module DSU3
   module Props
-    module_function
-
     # user-agent header
     USER_AGENT =
       'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) '\
@@ -28,7 +26,9 @@ module DSU3
       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',
@@ -40,17 +40,10 @@ module DSU3
       x_debug_options: 'bugReporterEnabled',
       x_discord_locale: 'en-US',
       x_super_properties: Base64.strict_encode64(SUPER_PROPERTIES.to_json),
-      content_type: 'application/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.2.0'
+  VERSION = '0.4'
 
   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.2.0
+  version: '0.4'
 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
@@ -42,6 +42,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/hackers-pr/dsu3
   bug_tracker_uri: https://github.com/hackers-pr/dsu3/issues
+  wiki_uri: https://www.rubydoc.info/gems/dsu3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -50,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:
   - - ">="