discorb 0.13.2 → 0.15.0

data/lib/discorb/embed.rb

@@ -45,45 +45,46 @@ module Discorb
     # @param [Discorb::Embed::Thumbnail, String] thumbnail The thumbnail of embed.
     #
     def initialize(title = nil, description = nil, color: nil, url: nil, timestamp: nil, author: nil,
-                                                   fields: nil, footer: nil, image: nil, thumbnail: nil, data: nil)
-      if data.nil?
-        @title = title
-        @description = description
-        @url = url
-        @timestamp = timestamp
-        @color = color
-        @author = author
-        @fields = fields || []
-        @footer = footer
-        @image = image && (image.is_a?(String) ? Image.new(image) : image)
-        @thumbnail = thumbnail && (thumbnail.is_a?(String) ? Thumbnail.new(thumbnail) : thumbnail)
-        @type = "rich"
-      else
-        @title = data[:title]
-        @description = data[:description]
-        @url = data[:url]
-        @timestamp = data[:timestamp] && Time.iso8601(data[:timestamp])
-        @type = data[:type]
-        @color = data[:color] && Color.new(data[:color])
-        @footer = data[:footer] && Footer.new(data[:footer][:text], icon: data[:footer][:icon_url])
-        @author = if data[:author]
-            Author.new(data[:author][:name], icon: data[:author][:icon_url],
-                                             url: data[:author][:url])
-          end
-        @thumbnail = data[:thumbnail] && Thumbnail.new(data[:thumbnail])
-        @image = data[:image] && Image.new(data[:image])
-        @video = data[:video] && Video.new(data[:video])
-        @provider = data[:provider] && Provider.new(data[:provider])
-        @fields = data[:fields] ? data[:fields].map { |f| Field.new(f[:name], f[:value], inline: f[:inline]) } : []
-      end
+                                                   fields: nil, footer: nil, image: nil, thumbnail: nil)
+      @title = title
+      @description = description
+      @url = url
+      @timestamp = timestamp
+      @color = color
+      @author = author
+      @fields = fields || []
+      @footer = footer
+      @image = image && (image.is_a?(String) ? Image.new(image) : image)
+      @thumbnail = thumbnail && (thumbnail.is_a?(String) ? Thumbnail.new(thumbnail) : thumbnail)
+      @type = "rich"
+    end
+
+    # @private
+    def initialize_hash(data)
+      @title = data[:title]
+      @description = data[:description]
+      @url = data[:url]
+      @timestamp = data[:timestamp] && Time.iso8601(data[:timestamp])
+      @type = data[:type]
+      @color = data[:color] && Color.new(data[:color])
+      @footer = data[:footer] && Footer.new(data[:footer][:text], icon: data[:footer][:icon_url])
+      @author = if data[:author]
+          Author.new(data[:author][:name], icon: data[:author][:icon_url],
+                                           url: data[:author][:url])
+        end
+      @thumbnail = data[:thumbnail] && Thumbnail.new(data[:thumbnail])
+      @image = data[:image] && Image.new(data[:image])
+      @video = data[:video] && Video.new(data[:video])
+      @provider = data[:provider] && Provider.new(data[:provider])
+      @fields = data[:fields] ? data[:fields].map { |f| Field.new(f[:name], f[:value], inline: f[:inline]) } : []
     end
 
     def image=(value)
-      @image = (value.is_a?(String)) ? Image.new(value) : value
+      @image = value.is_a?(String) ? Image.new(value) : value
     end
 
     def thumbnail=(value)
-      @thumbnail = (value.is_a?(String)) ? Thumbnail.new(value) : value
+      @thumbnail = value.is_a?(String) ? Thumbnail.new(value) : value
     end
 
     def inspect
@@ -111,6 +112,12 @@ module Discorb
       ret
     end
 
+    def self.from_hash(data)
+      inst = allocate
+      inst.initialize_hash(data)
+      inst
+    end
+
     #
     # Represents an author of embed.
     #

data/lib/discorb/emoji.rb

@@ -96,7 +96,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name != Discorb::Unset
         payload[:roles] = roles.map { |r| Discorb::Utils.try(r, :id) } if roles != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :patch), payload, audit_log_reason: reason)
         self
       end
     end
@@ -113,7 +113,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :delete), audit_log_reason: reason).wait
         @available = false
         self
       end
@@ -121,6 +121,15 @@ module Discorb
 
     alias destroy! delete!
 
+    # @private
+    def to_hash
+      {
+        name: @name,
+        id: @id,
+        animated: @animated,
+      }
+    end
+
     private
 
     def _set_data(data)
@@ -202,9 +211,7 @@ module Discorb
       else
         raise ArgumentError, "No such emoji: #{name}"
       end
-      if tone > 0
-        @value += EmojiTable::SKIN_TONES[tone]
-      end
+      @value += EmojiTable::SKIN_TONES[tone] if tone.positive?
     end
 
     # @return [String] The unicode string of the emoji.
@@ -225,6 +232,15 @@ module Discorb
       "#<#{self.class} :#{@name}:>"
     end
 
+    # @private
+    def to_hash
+      {
+        name: @value,
+        id: nil,
+        animated: false,
+      }
+    end
+
     class << self
       alias [] new
     end

data/lib/discorb/emoji_table.rb

@@ -3885,7 +3885,7 @@ module Discorb
       "\xf0\x9f\x8f\xbc",
       "\xf0\x9f\x8f\xbd",
       "\xf0\x9f\x8f\xbe",
-      "\xf0\x9f\x8f\xbf",
+      "\xf0\x9f\x8f\xbf"
     ].freeze
   end
 end

data/lib/discorb/error.rb

@@ -11,9 +11,7 @@ module Discorb
     def enumerate_errors(hash)
       res = {}
       _recr_items([], hash, res)
-      if res == { "" => nil }
-        res = {}
-      end
+      res = {} if res == { "" => nil }
       res
     end
 
@@ -64,7 +62,7 @@ module Discorb
         [
           data[:message] + " (#{@code})", enumerate_errors(data[:errors])
             .map { |ek, ev| "#{ek}=>#{ev}" }
-            .join("\n"),
+            .join("\n")
         ].join("\n")
       )
     end
@@ -92,14 +90,14 @@ module Discorb
   # Represents a error because of a cloudflare ban.
   #
   class CloudFlareBanError < HTTPError
-    def initialize(resp, client)
+    def initialize(_resp, client)
       @client = client
       @client.close!
       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
+      warn message
       DiscorbError.instance_method(:initialize).bind(self).call(message)
     end
   end

data/lib/discorb/event.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
 module Discorb
+  #
+  # Represents an event in guild.
+  #
   class ScheduledEvent < DiscordModel
     @privacy_level = {
       2 => :guild_only,
@@ -120,7 +124,7 @@ module Discorb
       status: Discorb::Unset
     )
       Async do
-        payload = case (type == Discorb::Unset) ? @entity_type : type
+        payload = case type == Discorb::Unset ? @entity_type : type
           when :stage_instance
             raise ArgumentError, "channel must be provided for stage_instance events" unless channel
             {
@@ -164,7 +168,7 @@ module Discorb
           else
             raise ArgumentError, "Invalid scheduled event type: #{type}"
           end
-        @client.http.patch("/guilds/#{@guild_id}/scheduled-events/#{@id}", payload).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :patch), payload).wait
       end
     end
 
@@ -201,7 +205,7 @@ module Discorb
     #
     def delete!
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/scheduled-events/#{@id}").wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :delete)).wait
       end
     end
 
@@ -226,11 +230,9 @@ module Discorb
         if limit.nil?
           after = 0
           res = []
-          while true
-            _resp, users = @client.http.get("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true").wait
-            if users.empty?
-              break
-            end
+          loop do
+            _resp, users = @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true", "//guilds/:guild_id/scheduled-events/:scheduled_event_id/users", :get)).wait
+            break if users.empty?
             res += users.map { |u| Member.new(@client, @guild_id, u[:user], u[:member]) }
             after = users.last[:user][:id]
           end
@@ -238,11 +240,11 @@ module Discorb
         else
           params = {
             limit: limit,
-            before: Discorb::Utils.try(after, :id),
-            after: Discorb::Utils.try(around, :id),
+            before: Discorb::Utils.try(before, :id),
+            after: Discorb::Utils.try(after, :id),
             with_member: with_member,
           }.filter { |_k, v| !v.nil? }.to_h
-          _resp, messages = @client.http.get("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}").wait
+          _resp, messages = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}", "//channels/:channel_id/messages", :get)).wait
           messages.map { |m| Message.new(@client, m.merge({ guild_id: @guild_id.to_s })) }
         end
       end

data/lib/discorb/exe/about.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Show information of discorb.
 
 puts "  disco\e[31mrb\e[m -  A new Discord API wrapper in Ruby.  \n\n"

data/lib/discorb/exe/irb.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # description: Connect to discord and start IRB.
 
@@ -31,13 +32,13 @@ client.on :standby do
   end
 
   def dirb_help
-    puts <<~EOS
+    puts <<~MESSAGE
            \e[96mDiscord-IRB\e[m
            This is a debug client for Discord.
            \e[90mmessage\e[m to get latest message.
 
            \e[36mhttps://discorb-lib.github.io/#{Discorb::VERSION}/file.irb.html\e[m for more information.
-         EOS
+         MESSAGE
   end
 
   puts <<~FIRST_MESSAGE
@@ -56,7 +57,7 @@ end
 
 token = ENV["DISCORD_BOT_TOKEN"] || ENV["DISCORD_TOKEN"]
 if token.nil?
-  if File.exists?(token_file)
+  if File.exist?(token_file)
     token = File.read(token_file)
   else
     print "\e[90mToken?\e[m : "

data/lib/discorb/exe/new.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Make files for the discorb project.
 
 require "optparse"
@@ -131,7 +132,7 @@ FILES = {
       https://rubygems.org/gems/license-cli may be useful.
 
   MARKDOWN
-}
+}.freeze
 
 # @private
 def create_file(name)
@@ -162,8 +163,8 @@ def git_init
   system "git init"
   system "git add ."
   system "git commit -m \"Initial commit\""
-  sputs "Initialized repository, use " +
-          "\e[32mgit commit --amend -m '...'\e[92m" +
+  sputs "Initialized repository, use " \
+          "\e[32mgit commit --amend -m '...'\e[92m" \
           " to change commit message of initial commit.\n"
 end
 
@@ -225,13 +226,11 @@ if (dir = ARGV[0])
   if Dir.exist?($path)
     if Dir.empty?($path)
       iputs "Found \e[30m#{dir}\e[90m and empty, using this directory."
-    else
-      if $values[:force]
-        iputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
+    elsif $values[:force]
+      iputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
       else
         eputs "Directory \e[31m#{dir}\e[91m already exists and not empty. Use \e[31m-f\e[91m to force."
         exit
-      end
     end
   else
     Dir.mkdir($path)

data/lib/discorb/exe/run.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Run a client.
 require "optparse"
 require "json"
@@ -6,7 +7,7 @@ require "io/console"
 
 ARGV.delete_at 0
 # @private
-LOG_LEVELS = %w[none debug info warn error fatal]
+LOG_LEVELS = %w[none debug info warn error fatal].freeze
 
 opt = OptionParser.new <<~BANNER
                          This command will run a client.

data/lib/discorb/exe/setup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Setup application commands.
 require "optparse"
 require "discorb/utils/colored_puts"
@@ -6,6 +7,7 @@ ARGV.delete_at 0
 
 options = {
   guilds: nil,
+  script: true,
 }
 
 opt = OptionParser.new <<~BANNER
@@ -16,20 +18,21 @@ opt = OptionParser.new <<~BANNER
                                    script                     The script to setup.
                        BANNER
 opt.on("-g", "--guild ID", Array, "The guild ID to setup, use comma for setup commands in multiple guilds, or `global` for setup global commands.") { |v| options[:guilds] = v }
+opt.on("-s", "--[no-]script", "Whether to run `:setup` event. This may be useful if setup script includes operation that shouldn't run twice. Default to true.") { |v| options[:script] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
 script ||= "main.rb"
 ENV["DISCORB_CLI_FLAG"] = "setup"
 
-if options[:guilds] == ["global"]
-  ENV["DISCORB_SETUP_GUILDS"] = "global"
+ENV["DISCORB_SETUP_GUILDS"] = if options[:guilds] == ["global"]
+  "global"
 elsif options[:guilds]
-  ENV["DISCORB_SETUP_GUILDS"] = options[:guilds].join(",")
-else
-  ENV["DISCORB_SETUP_GUILDS"] = nil
+  options[:guilds].join(",")
 end
 
+ENV["DISCORB_SETUP_SCRIPT"] = options[:script].to_s if options[:script]
+
 begin
   load script
 rescue LoadError

data/lib/discorb/exe/show.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Show information of your environment.
 
 require "etc"

data/lib/discorb/extend.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop: disable Style/Documentation
 
 class Time
   #
@@ -18,22 +19,26 @@ class Time
 end
 
 # @private
-class Async::Node
-  def description
-    @object_name ||= "#{self.class}:0x#{object_id.to_s(16)}#{@transient ? " transient" : nil}"
+module Async
+  class Node
+    def description
+      @object_name ||= "#{self.class}:0x#{object_id.to_s(16)}#{@transient ? " transient" : nil}"
 
-    if @annotation
-      "#{@object_name} #{@annotation}"
-    elsif line = self.backtrace(0, 1)&.first
-      "#{@object_name} #{line}"
-    else
-      @object_name
+      if @annotation
+        "#{@object_name} #{@annotation}"
+      elsif line = self.backtrace(0, 1)&.first
+        "#{@object_name} #{line}"
+      else
+        @object_name
+      end
     end
-  end
 
-  def to_s
-    "\#<#{self.description}>"
-  end
+    def to_s
+      "\#<#{self.description}>"
+    end
 
-  alias inspect to_s
+    alias inspect to_s
+  end
 end
+
+# rubocop: enable Style/Documentation

data/lib/discorb/extension.rb

@@ -17,7 +17,7 @@ module Discorb
       ret = {}
       self.class.events.each do |event, handlers|
         ret[event] = handlers.map do |handler|
-          Discorb::EventHandler.new(Proc.new { |*args, **kwargs| instance_exec(*args, **kwargs, &handler[2]) }, handler[0], handler[1])
+          Discorb::EventHandler.new(proc { |*args, **kwargs| instance_exec(*args, **kwargs, &handler[2]) }, handler[0], handler[1])
         end
       end
       @events = ret
@@ -27,6 +27,10 @@ module Discorb
       base.extend(ClassMethods)
     end
 
+    #
+    # @private
+    # Module for adding class methods to the extension class.
+    #
     module ClassMethods
       include Discorb::ApplicationCommand::Handler
       undef setup_commands