discorb 0.7.3 → 0.8.2

data/examples/simple/rolepanel.rb

@@ -9,7 +9,7 @@ def convert_role(guild, string)
   end
 end
 
-client.once :ready do
+client.once :standby do
   puts "Logged in as #{client.user}"
 end
 

data/examples/simple/wait_for_message.rb

@@ -2,7 +2,7 @@ require "discorb"
 
 client = Discorb::Client.new
 
-client.once :ready do
+client.once :standby do
   puts "Logged in as #{client.user}"
 end
 

data/lib/discorb/client.rb

@@ -5,6 +5,7 @@ require "logger"
 
 require "async"
 require "async/websocket/client"
+require_relative "./utils/colored_puts"
 
 module Discorb
   #
@@ -64,11 +65,12 @@ module Discorb
     # @param [Boolean] colorize_log Whether to colorize the log.
     # @param [:debug, :info, :warn, :error, :critical] log_level The log level.
     # @param [Boolean] wait_until_ready Whether to delay event dispatch until ready.
+    # @param [Boolean] fetch_member Whether to fetch member on ready. This may slow down the client. Default to `false`.
     #
     def initialize(
       allowed_mentions: nil, intents: nil, message_caches: 1000,
       log: nil, colorize_log: false, log_level: :info,
-      wait_until_ready: true
+      wait_until_ready: true, fetch_member: false
     )
       @allowed_mentions = allowed_mentions || AllowedMentions.new(everyone: true, roles: true, users: true)
       @intents = (intents or Intents.default)
@@ -91,6 +93,7 @@ module Discorb
       @commands = []
       @bottom_commands = []
       @status = :initialized
+      @fetch_member = fetch_member
       set_default_events
     end
 
@@ -299,9 +302,15 @@ module Discorb
     #
     # @param [Discorb::Activity] activity The activity to update.
     # @param [:online, :idle, :dnd, :invisible] status The status to update.
-    #
-    def update_presence(activity = nil, status: nil)
-      payload = {}
+    # @param [String] afk Whether to set the client as AFK.
+    #
+    def update_presence(activity = nil, status: nil, afk: false)
+      payload = {
+        activities: [],
+        status: status,
+        afk: nil,
+        since: nil,
+      }
       if !activity.nil?
         payload[:activities] = [activity.to_hash]
       end
@@ -405,7 +414,8 @@ module Discorb
       when "run"
         require "json"
         options = JSON.parse(ENV["DISCORB_CLI_OPTIONS"], symbolize_names: true)
-        Process.daemon if options[:daemon]
+        @daemon = options[:daemon]
+
         setup_commands(token) if options[:setup]
         if options[:log_level]
           if options[:log_level] == "none"
@@ -483,6 +493,18 @@ module Discorb
         message = "An error occurred while dispatching #{event_name}:\n#{e.full_message}"
         @log.error message, fallback: $stderr
       end
+
+      once :standby do
+        if @daemon
+          title = "discorb: #{@user}"
+          Process.setproctitle title
+          sputs "Your discorb client is now in standby mode."
+          iputs "Process ID: #{Process.pid}"
+          iputs "Title: #{title}"
+
+          Process.daemon
+        end
+      end
     end
   end
 end

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.7.3"
+  VERSION = "0.8.2"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/error.rb

@@ -92,10 +92,12 @@ module Discorb
     def initialize(resp, client)
       @client = client
       @client.close!
-      DiscorbError.instance_method(:initialize).bind(self).call(<<~MESSAGE)
+      message = <<~MESSAGE
         The client is banned from CloudFlare.
         Hint: Try to decrease the number of requests per second, e.g. Use sleep in between requests.
       MESSAGE
+      $stderr.puts message
+      DiscorbError.instance_method(:initialize).bind(self).call(message)
     end
   end
 

data/lib/discorb/exe/about.rb

@@ -11,5 +11,5 @@ informations = {
 }
 
 informations.each do |key, value|
-  puts "\e[90m#{key}:\e[m #{value}"
+  puts "\e[90m#{key.rjust(informations.keys.map(&:size).max)}:\e[m #{value}"
 end

data/lib/discorb/exe/init.rb

@@ -16,7 +16,7 @@ FILES = {
 
     client = Discorb::Client.new  # Create client for connecting to Discord
 
-    client.once :ready do
+    client.once :standby do
       puts "Logged in as #{client.user}"  # Prints username of logged in user
     end
 

data/lib/discorb/exe/irb.rb

@@ -23,7 +23,7 @@ opt.parse!(ARGV)
 client = Discorb::Client.new(intents: Discorb::Intents.from_value(intents_value))
 $messages = []
 
-client.on :ready do
+client.on :standby do
   puts "\e[96mLogged in as #{client.user}\e[m"
 
   def message

data/lib/discorb/file.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "mime/types"
+require "stringio"
 
 module Discorb
   #
@@ -62,8 +63,13 @@ module Discorb
     def initialize(io, filename = nil, content_type: nil)
       @io = io
       @filename = filename || (io.respond_to?(:path) ? io.path : io.object_id)
-      @content_type = content_type || MIME::Types.type_for(@filename)[0].to_s
+      @content_type = content_type || MIME::Types.type_for(@filename.to_s)[0].to_s
       @content_type = "application/octet-stream" if @content_type == ""
     end
+
+    def self.from_string(string, filename: nil, content_type: nil)
+      io = StringIO.new(string)
+      new(io, filename, content_type: content_type)
+    end
   end
 end

data/lib/discorb/flag.rb

@@ -8,6 +8,7 @@ module Discorb
   class Flag
     # @return [Hash{Symbol => Boolean}] the values of the flag.
     attr_reader :values
+    alias to_h values
     # @return [Integer] the value of the flag.
     attr_reader :value
 

data/lib/discorb/gateway.rb

@@ -2,6 +2,8 @@
 
 require "async/http"
 require "async/websocket"
+require "async/barrier"
+require "async/semaphore"
 require "json"
 require "zlib"
 
@@ -488,7 +490,7 @@ module Discorb
           _, gateway_response = @http.get("/gateway").wait
           gateway_url = gateway_response[:url]
           endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
-                                                alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
+                                                 alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
             Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection) do |connection|
               @connection = connection
@@ -497,9 +499,17 @@ module Discorb
               while (message = @connection.read)
                 @buffer << message
                 if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
-                  message = JSON.parse(@zlib_stream.inflate(@buffer), symbolize_names: true)
-                  @buffer = +""
-                  handle_gateway(message)
+                  begin
+                    data = @zlib_stream.inflate(@buffer)
+                    @buffer = +""
+                    message = JSON.parse(data, symbolize_names: true)
+                  rescue JSON::ParserError
+                    @buffer = +""
+                    @log.error "Received invalid JSON from gateway."
+                    @log.debug data
+                  else
+                    handle_gateway(message)
+                  end
                 end
               end
             end
@@ -510,7 +520,9 @@ module Discorb
               raise ClientError.new("Authentication failed."), cause: nil
             when "Discord WebSocket requesting client reconnect."
               @log.info "Discord WebSocket requesting client reconnect"
-              @tasks.map(&:stop)
+              connect_gateway(false)
+            else
+              @log.error "Discord WebSocket closed: #{e.message}"
               connect_gateway(false)
             end
           rescue EOFError, Async::Wrapper::Cancelled
@@ -522,7 +534,7 @@ module Discorb
       def send_gateway(opcode, **value)
         @connection.write({ op: opcode, d: value }.to_json)
         @connection.flush
-        @log.debug "Sent message with opcode #{opcode}: #{value.to_json.gsub(@token, "[Token]")}"
+        @log.debug "Sent message: #{{ op: opcode, d: value }.to_json.gsub(@token, "[Token]")}"
       end
 
       def handle_gateway(payload)
@@ -579,15 +591,18 @@ module Discorb
         end
       end
 
-      def handle_heartbeat(interval)
+      def handle_heartbeat
         Async do |task|
+          interval = @heartbeat_interval
           sleep((interval / 1000.0 - 1) * rand)
           loop do
-            @heartbeat_before = Time.now.to_f
-            @connection.write({ op: 1, d: @last_s }.to_json)
-            @connection.flush
-            @log.debug "Sent opcode 1."
-            @log.debug "Waiting for heartbeat."
+            unless @connection.closed?
+              @heartbeat_before = Time.now.to_f
+              @connection.write({ op: 1, d: @last_s }.to_json)
+              @connection.flush
+              @log.debug "Sent opcode 1."
+              @log.debug "Waiting for heartbeat."
+            end
             sleep(interval / 1000.0 - 1)
           end
         end
@@ -605,19 +620,17 @@ module Discorb
           @user = ClientUser.new(self, data[:user])
           @uncached_guilds = data[:guilds].map { |g| g[:id] }
           if @uncached_guilds == [] or !@intents.guilds
-            @ready = true
-            dispatch(:ready)
-            @log.info("Successfully connected to Discord.")
+            ready
           end
-          @tasks << handle_heartbeat(@heartbeat_interval)
+          dispatch(:ready)
+          @tasks << handle_heartbeat
         when "GUILD_CREATE"
           if @uncached_guilds.include?(data[:id])
             Guild.new(self, data, true)
             @uncached_guilds.delete(data[:id])
             if @uncached_guilds == []
-              @ready = true
-              dispatch(:ready)
-              @log.info("Successfully connected to Discord, and cached all guilds.")
+              @log.debug "All guilds cached"
+              ready
             end
           elsif @guilds.has?(data[:id])
             @guilds[data[:id]].send(:_set_data, data)
@@ -839,12 +852,12 @@ module Discorb
           dispatch(:voice_state_update, old, current)
           if old&.channel != current&.channel
             dispatch(:voice_channel_update, old, current)
-            case [old&.channel, current&.channel]
-            in [nil, _]
+            case [old&.channel.nil?, current&.channel.nil?]
+            when [true, false]
               dispatch(:voice_channel_connect, current)
-            in [_, nil]
+            when [false, true]
               dispatch(:voice_channel_disconnect, old)
-            in _
+            when [false, false]
               dispatch(:voice_channel_move, old, current)
             end
           end
@@ -980,9 +993,9 @@ module Discorb
           dispatch(:reaction_add, ReactionEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find do |r|
-              data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
-            end)
+             (target_reaction = target_message.reactions.find do |r|
+               data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
+             end)
             target_reaction.instance_variable_set(:@count, target_reaction.count - 1)
             target_message.reactions.delete(target_reaction) if target_reaction.count.zero?
           end
@@ -994,7 +1007,7 @@ module Discorb
           dispatch(:reaction_remove_all, ReactionRemoveAllEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE_EMOJI"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
+             (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
             target_message.reactions.delete(target_reaction)
           end
           dispatch(:reaction_remove_emoji, ReactionRemoveEmojiEvent.new(data))
@@ -1016,26 +1029,56 @@ module Discorb
           end
         end
       end
+
+      def ready
+        Async do
+          if @fetch_member
+            @log.debug "Fetching members"
+            barrier = Async::Barrier.new
+            semaphore = Async::Semaphore.new(@guilds.length)
+
+            @guilds.each do |guild|
+              semaphore.async(parent: barrier) do
+                guild.fetch_members
+              end
+            end
+            semaphore.__send__(:wait)
+          end
+          @ready = true
+          dispatch(:standby)
+          @log.info("Client is ready!")
+        end
+      end
     end
-    
+
     #
     # A class for connecting websocket with raw bytes data.
     # @private
     #
-    class RawConnection < Async::WebSocket::Connection		
-      def initialize(...)
+    class RawConnection < Async::WebSocket::Connection
+      def initialize(*, **)
+        super
+        @closed = false
+      end
+
+      def closed?
+        @closed
+      end
+
+      def close
         super
+        @closed = true
       end
-    
-			def parse(buffer)
-				# noop
+
+      def parse(buffer)
+        # noop
         buffer.to_s
-			end
-			
-			def dump(object)
-				# noop
+      end
+
+      def dump(object)
+        # noop
         object.to_s
-			end
+      end
     end
   end
-end
+end

data/lib/discorb/guild.rb

@@ -502,7 +502,6 @@ module Discorb
     # Fetch a member in the guild.
     # @macro async
     # @macro http
-    # @macro members_intent
     #
     # @param [#to_s] id The ID of the member to fetch.
     #
@@ -519,6 +518,39 @@ module Discorb
       end
     end
 
+    # Fetch members in the guild.
+    # @macro async
+    # @macro http
+    # @macro members_intent
+    #
+    # @param [Integer] limit The maximum number of members to fetch, 0 for all.
+    # @param [Integer] after The ID of the member to start fetching after.
+    #
+    # @return [Async::Task<Array<Discorb::Member>>] The list of members.
+    #
+    def fetch_members(limit: 0, after: nil)
+      Async do
+        unless limit == 0
+          _resp, data = @client.http.get("/guilds/#{@id}/members?#{URI.encode_www_form({ after: after, limit: limit })}").wait
+          next data[:members].map { |m| Member.new(@client, @id, m[:user], m) }
+        end
+        ret = []
+        after = 0
+        loop do
+          params = { after: after, limit: 100 }
+          _resp, data = @client.http.get("/guilds/#{@id}/members?#{URI.encode_www_form(params)}").wait
+          ret += data.map { |m| Member.new(@client, @id, m[:user], m) }
+          after = data.last[:user][:id]
+          if data.length != 1000
+            break
+          end
+        end
+        ret
+      end
+    end
+
+    alias fetch_member_list fetch_members
+
     #
     # Search for members by name in the guild.
     # @macro async

data/lib/discorb/http.rb

@@ -221,7 +221,7 @@ module Discorb
           { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}",
             "content-type" => "application/json" }
         end
-      ret.merge(headers) if !headers.nil? && headers.length.positive?
+      ret.merge!(headers) if !headers.nil? && headers.length.positive?
       ret["X-Audit-Log-Reason"] = audit_log_reason unless audit_log_reason.nil?
       ret
     end
@@ -242,12 +242,13 @@ module Discorb
         else
           API_BASE_URL + path
         end
-      URI(full_path).path
+      uri = URI(full_path)
+      full_path.sub(uri.scheme + "://" + uri.host, "")
     end
 
     def get_response_data(resp)
-      if resp["Via"].nil?
-        raise CloudFlareBanError.new(@client, resp)
+      if resp["Via"].nil? && resp.code == "429"
+        raise CloudFlareBanError.new(resp, @client)
       end
       rd = resp.body
       if rd.nil? || rd.empty?

data/lib/discorb/intents.rb

@@ -82,7 +82,7 @@ module Discorb
       if @raw_value.key?(name)
         @raw_value[name]
       elsif name.end_with?("=") && @raw_value.key?(name[0..-2].to_sym)
-        raise ArgumentError, "true/false expected" if (!args.is_a? TrueClass) || args.is_a?(FalseClass)
+        raise ArgumentError, "true/false expected" unless args.is_a? TrueClass or args.is_a?(FalseClass)
 
         @raw_value[name[0..-2].to_sym] = args
       else
@@ -108,6 +108,10 @@ module Discorb
       "#<#{self.class} value=#{value}>"
     end
 
+    def to_h
+      @raw_value
+    end
+
     class << self
       # Create new intent object from raw value.
       # @param value [Integer] The value of the intent.
@@ -121,12 +125,12 @@ module Discorb
 
       # Create new intent object with default values.
       def default
-        from_value(32_509)
+        from_value(32509)
       end
 
       # Create new intent object with all intents.
       def all
-        from_value(32_767)
+        from_value(32767)
       end
 
       # Create new intent object with no intents.

data/lib/discorb/message.rb

@@ -213,6 +213,55 @@ module Discorb
       !@updated_at.nil?
     end
 
+    #
+    # Removes the mentions from the message.
+    #
+    # @param [Boolean] user Whether to clean user mentions.
+    # @param [Boolean] channel Whether to clean channel mentions.
+    # @param [Boolean] role Whether to clean role mentions.
+    # @param [Boolean] emoji Whether to clean emoji.
+    # @param [Boolean] everyone Whether to clean `@everyone` and `@here`.
+    # @param [Boolean] codeblock Whether to clean codeblocks.
+    #
+    # @return [String] The cleaned content of the message.
+    #
+    def clean_content(user: true, channel: true, role: true, emoji: true, everyone: true, codeblock: false)
+      ret = @content.dup
+      ret.gsub!(/<@!?(\d+)>/) do |match|
+        member = guild&.members&.[]($1)
+        member ||= @client.users[$1]
+        member ? "@#{member.name}" : "@Unknown User"
+      end if user
+      ret.gsub!(/<#(\d+)>/) do |match|
+        channel = @client.channels[$1]
+        channel ? "<##{channel.id}>" : "#Unknown Channel"
+      end
+      ret.gsub!(/<@&(\d+)>/) do |match|
+        role = guild&.roles&.[]($1)
+        role ? "@#{role.name}" : "@Unknown Role"
+      end if role
+      ret.gsub!(/<a?:([a-zA-Z0-9_]+):\d+>/) do |match|
+        $1
+      end if emoji
+      ret.gsub!(/@(everyone|here)/, "@\u200b\\1") if everyone
+      unless codeblock
+        codeblocks = ret.split("```", -1)
+        original_codeblocks = @content.scan(/```(.+?)```/m)
+        res = []
+        max = codeblocks.length
+        codeblocks.each_with_index do |codeblock, i|
+          if max % 2 == 0 && i == max - 1 or i.even?
+            res << codeblock
+          else
+            res << original_codeblocks[i / 2]
+          end
+        end
+        res.join("```")
+      else
+        ret
+      end
+    end
+
     #
     # Edit the message.
     #

data/lib/discorb/modules.rb

@@ -59,7 +59,8 @@ module Discorb
         end
         files = [file] if file
         if files
-          headers, payload = HTTP.multipart(payload, files)
+          seperator, payload = HTTP.multipart(payload, files)
+          headers = { "content-type" => "multipart/form-data; boundary=#{seperator}" }
         else
           headers = {}
         end

data/po/yard.pot

@@ -203,7 +203,7 @@ msgid "client = Discorb::Client.new"
 msgstr ""
 
 #: ../README.md:35
-msgid "client.once :ready do\n"
+msgid "client.once :standby do\n"
 "  puts \"Logged in as #{client.user}\"\n"
 "end"
 msgstr ""