discorb 0.16.0 → 0.17.0

data/lib/discorb/event.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents an event in guild.
@@ -38,6 +39,7 @@ module Discorb
     class Metadata
       # @return [String, nil] The location of the event. Only present if the event is a external event.
       attr_reader :location
+
       # @!visibility private
       def initialize(data)
         @location = data[:location]
@@ -137,6 +139,7 @@ module Discorb
         payload = case type == Discorb::Unset ? @entity_type : type
           when :stage_instance
             raise ArgumentError, "channel must be provided for stage_instance events" unless channel
+
             {
               name: name,
               description: description,
@@ -149,6 +152,7 @@ module Discorb
             }.reject { |_, v| v == Discorb::Unset }
           when :voice
             raise ArgumentError, "channel must be provided for voice events" unless channel
+
             {
               name: name,
               description: description,
@@ -162,6 +166,7 @@ module Discorb
           when :external
             raise ArgumentError, "location must be provided for external events" unless location
             raise ArgumentError, "end_time must be provided for external events" unless end_time
+
             {
               name: name,
               description: description,
@@ -178,7 +183,13 @@ module Discorb
           else
             raise ArgumentError, "Invalid scheduled event type: #{type}"
           end
-        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :patch), 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
 
@@ -215,7 +226,8 @@ module Discorb
     #
     def delete!
       Async do
-        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :delete)).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}",
+                                       "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :delete)).wait
       end
     end
 
@@ -241,8 +253,15 @@ module Discorb
           after = 0
           res = []
           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
+            _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
@@ -254,7 +273,13 @@ module Discorb
             after: Discorb::Utils.try(after, :id),
             with_member: with_member,
           }.filter { |_k, v| !v.nil? }.to_h
-          _resp, messages = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}", "//channels/:channel_id/messages", :get)).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,4 +1,5 @@
 # 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

@@ -10,8 +10,6 @@ require "optparse"
 intents_value = Discorb::Intents.all.value
 token_file = "token"
 
-ARGV.delete_at 0
-
 opt = OptionParser.new <<~BANNER
                          This command will start an interactive Ruby shell with connected client.
 
@@ -43,7 +41,7 @@ client.on :standby do
 
   puts <<~FIRST_MESSAGE
          Running on \e[31mRuby #{RUBY_VERSION}\e[m, disco\e[31mrb #{Discorb::VERSION}\e[m
-         Type \e[90mdirb_help\e[m to help.
+    Type \e[90mdirb_help\e[m to help.
        FIRST_MESSAGE
 
   binding.irb
@@ -55,7 +53,7 @@ client.on :message do |message|
   $messages << message
 end
 
-token = ENV["DISCORD_BOT_TOKEN"] || ENV["DISCORD_TOKEN"]
+token = ENV.fetch("DISCORD_BOT_TOKEN", nil) || ENV.fetch("DISCORD_TOKEN", nil)
 if token.nil?
   if File.exist?(token_file)
     token = File.read(token_file)

data/lib/discorb/exe/new.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 # description: Make files for the discorb project.
 
 require "optparse"
 require "discorb"
+require "pathname"
 require_relative "../utils/colored_puts"
 
 $path = Dir.pwd
@@ -10,10 +12,10 @@ $path = Dir.pwd
 # @private
 FILES = {
   "main.rb" => <<~'RUBY',
-    require "discorb"
-    require "dotenv"
+    # frozen_string_literal: true
 
-    Dotenv.load  # Loads .env file
+    require "discorb"
+    require "dotenv/load"  # Load environment variables from .env file.
 
     client = Discorb::Client.new  # Create client for connecting to Discord
 
@@ -23,8 +25,26 @@ FILES = {
 
     client.run ENV["%<token>s"]  # Starts client
   RUBY
+  "main.rb_nc" => <<~'RUBY',
+    # frozen_string_literal: true
+
+    require "discorb"
+    require "dotenv/load"
+
+    client = Discorb::Client.new
+
+    client.once :standby do
+      puts "Logged in as #{client.user}"
+    end
+
+    client.run ENV["%<token>s"]
+  RUBY
   ".env" => <<~BASH,
-    %<token>s=Y0urB0tT0k3nHer3.Th1sT0ken.W0ntWorkB3c4useItH4sM34n1ng
+    # Put your token after `%<token>s=`
+    %<token>s=
+  BASH
+  ".env_nc" => <<~BASH,
+    %<token>s=
   BASH
   ".gitignore" => <<~GITIGNORE,
     *.gem
@@ -38,13 +58,13 @@ FILES = {
     /test/tmp/
     /test/version_tmp/
     /tmp/
-    
+
     # Used by dotenv library to load environment variables.
     .env
-    
+
     # Ignore Byebug command history file.
     .byebug_history
-    
+
     ## Specific to RubyMotion:
     .dat*
     .repl_history
@@ -52,7 +72,7 @@ FILES = {
     *.bridgesupport
     build-iPhoneOS/
     build-iPhoneSimulator/
-    
+
     ## Specific to RubyMotion (use of CocoaPods):
     #
     # We recommend against adding the Pods directory to your .gitignore. However
@@ -60,33 +80,68 @@ FILES = {
     # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
     #
     # vendor/Pods/
-    
+
     ## Documentation cache and generated files:
     /.yardoc/
     /_yardoc/
     /doc/
     /rdoc/
-    
+
     ## Environment normalization:
     /.bundle/
     /vendor/bundle
     /lib/bundler/man/
-    
+
     # for a library or gem, you might want to ignore these files since the code is
     # intended to run in multiple environments; otherwise, check them in:
     # Gemfile.lock
     # .ruby-version
     # .ruby-gemset
-    
+
     # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
     .rvmrc
-    
+
     # Used by RuboCop. Remote config files pulled in from inherit_from directive.
     # .rubocop-https?--*
 
     # This gitignore is from github/gitignore.
     # https://github.com/github/gitignore/blob/master/Ruby.gitignore
   GITIGNORE
+  ".gitignore_nc" => <<~GITIGNORE,
+    *.gem
+    *.rbc
+    /.config
+    /coverage/
+    /InstalledFiles
+    /pkg/
+    /spec/reports/
+    /spec/examples.txt
+    /test/tmp/
+    /test/version_tmp/
+    /tmp/
+
+    .env
+
+    .byebug_history
+
+    .dat*
+    .repl_history
+    build/
+    *.bridgesupport
+    build-iPhoneOS/
+    build-iPhoneSimulator/
+
+    /.yardoc/
+    /_yardoc/
+    /doc/
+    /rdoc/
+
+    /.bundle/
+    /vendor/bundle
+    /lib/bundler/man/
+
+    .rvmrc
+  GITIGNORE
   "Gemfile" => <<~RUBY,
     # frozen_string_literal: true
 
@@ -96,6 +151,8 @@ FILES = {
 
     gem "discorb", "~> #{Discorb::VERSION}"
     gem "dotenv", "~> 2.7"
+
+    ruby "~> #{RUBY_VERSION.split(".")[0]}.#{RUBY_VERSION.split(".")[1]}"
   RUBY
   ".env.sample" => <<~BASH,
     %<token>s=
@@ -129,14 +186,16 @@ FILES = {
 
     TODO: Write your bot's license here.
       See https://choosealicense.com/ for more information.
-      https://rubygems.org/gems/license-cli may be useful.
 
   MARKDOWN
 }.freeze
 
 # @private
 def create_file(name)
-  File.write($path + "/#{name}", format(FILES[name], token: $values[:token], name: $values[:name]), mode: "wb")
+  template_name = name
+  template_name += "_nc" if !$values[:comment] && FILES.key?(name + "_nc")
+  content = format(FILES[template_name], token: $values[:token], name: $values[:name])
+  File.write($path + "/#{name}", content, mode: "wb")
 end
 
 # @private
@@ -152,7 +211,7 @@ def bundle_init
   iputs "Initializing bundle..."
   create_file("Gemfile")
   iputs "Installing gems..."
-  system "bundle install"
+  system({ "BUNDLE_GEMFILE" => nil }, "bundle install", chdir: $path)
   sputs "Installed gems.\n"
 end
 
@@ -160,9 +219,9 @@ end
 def git_init
   create_file(".gitignore")
   iputs "Initializing git repository..."
-  system "git init"
-  system "git add ."
-  system "git commit -m \"Initial commit\""
+  system "git init", chdir: $path
+  system "git add .", chdir: $path
+  system "git commit -m \"Initial commit\"", chdir: $path
   sputs "Initialized repository, use " \
         "\e[32mgit commit --amend -m '...'\e[92m" \
         " to change commit message of initial commit.\n"
@@ -191,6 +250,7 @@ $values = {
   token: "TOKEN",
   descs: false,
   name: nil,
+  comment: true,
 }
 
 opt.on("--[no-]bundle", "Whether to use bundle. Default to true.") do |v|
@@ -205,6 +265,10 @@ opt.on("--[no-]descs", "Whether to put some file for description. Default to fal
   $values[:descs] = v
 end
 
+opt.on("--[no-]comment", "Whether to write comment. Default to true.") do |v|
+  $values[:comment] = v
+end
+
 opt.on("-t NAME", "--token NAME", "The name of token environment variable. Default to TOKEN.") do |v|
   $values[:token] = v
 end
@@ -213,16 +277,16 @@ opt.on("-n NAME", "--name NAME", "The name of your project. Default to the direc
   $values[:name] = v
 end
 
-opt.on("-f", "--force", "Whether to force use directory. Default to false.") do |v|
+opt.on("--force", "-f", "Whether to force use directory. Default to false.") do |v|
   $values[:force] = v
 end
 
-ARGV.delete_at(0)
-
 opt.parse!(ARGV)
 
 if (dir = ARGV[0])
   $path += "/#{dir}"
+  $path = File.expand_path($path)
+  dir = File.basename($path)
   if Dir.exist?($path)
     if Dir.empty?($path)
       iputs "Found \e[30m#{dir}\e[90m and empty, using this directory."
@@ -237,6 +301,9 @@ if (dir = ARGV[0])
     iputs "Couldn't find \e[30m#{dir}\e[90m, created directory."
   end
   Dir.chdir($path)
+else
+  puts opt
+  abort
 end
 
 $values[:name] ||= Dir.pwd.split("/").last
@@ -249,4 +316,4 @@ make_descs if $values[:descs]
 
 git_init if $values[:git]
 
-sputs "\nSuccessfully made a new project at \e[32m#{$path}\e[92m."
+sputs "\nSuccessfully made a new project at \e[32m#{Pathname.new($path).cleanpath.split[-1]}\e[92m."

data/lib/discorb/exe/run.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # description: Run a client.
 require "optparse"
 require "json"
@@ -6,8 +7,6 @@ require "discorb/utils/colored_puts"
 require "io/console"
 require "discorb"
 
-ARGV.delete_at 0
-
 opt = OptionParser.new <<~BANNER
                          This command will run a client.
 
@@ -19,12 +18,13 @@ options = {
   title: nil,
   setup: nil,
   token: false,
-  bundler: :default,
 }
 opt.on("-s", "--setup", "Whether to setup application commands.") { |v| options[:setup] = v }
-opt.on("-e", "--env [ENV]", "The name of the environment variable to use for token, or just `-e` or `--env` for intractive prompt.") { |v| options[:token] = v }
+opt.on("-e", "--env [ENV]",
+       "The name of the environment variable to use for token, or just `-e` or `--env` for intractive prompt.") do |v|
+  options[:token] = v
+end
 opt.on("-t", "--title TITLE", "The title of process.") { |v| options[:title] = v }
-opt.on("-b", "--[no-]bundler", "Whether to use bundler. Default to true if Gemfile exists, otherwise false.") { |v| options[:bundler] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
@@ -38,6 +38,7 @@ if script.nil?
       break
     end
     break if dir == File.dirname(dir)
+
     dir = File.dirname(dir)
   end
   if File.dirname(script) != Dir.pwd
@@ -50,7 +51,7 @@ ENV["DISCORB_CLI_FLAG"] = "run"
 ENV["DISCORB_CLI_OPTIONS"] = JSON.generate(options)
 
 if options[:token]
-  ENV["DISCORB_CLI_TOKEN"] = ENV[options[:token]]
+  ENV["DISCORB_CLI_TOKEN"] = ENV.fetch(options[:token], nil)
   raise "#{options[:token]} is not set." if ENV["DISCORB_CLI_TOKEN"].nil?
 elsif options[:token].nil? || options[:token] == "-"
   print "\e[90mPlease enter your token: \e[m"
@@ -58,25 +59,10 @@ elsif options[:token].nil? || options[:token] == "-"
   puts ""
 end
 
-if options[:bundler] == :default
-  dir = Dir.pwd.split("/")
-  options[:bundler] = false
-  dir.length.times.reverse_each do |i|
-    if File.exist? "#{dir[0..i].join("/")}/Gemfile"
-      options[:bundler] = true
-      break
-    end
-  end
-end
-
 ENV["DISCORB_CLI_TITLE"] = options[:title]
 
 if File.exist? script
-  if options[:bundler]
-    exec "bundle exec ruby #{script}"
-  else
-    exec "ruby #{script}"
-  end
+  exec "ruby #{script}"
 else
   eputs "Could not load script: \e[31m#{script}\e[91m"
 end

data/lib/discorb/exe/setup.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
+
 # description: Setup application commands.
 require "optparse"
 require "discorb/utils/colored_puts"
 
-ARGV.delete_at 0
-
 options = {
   guilds: nil,
   script: true,
@@ -17,8 +16,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.on("-g", "--guild ID", Array,
+       "The guild ID to setup, use comma for setup commands in multiple guilds, " \
+       "or `global` for setup global commands.") do |v|
+  options[:guilds] = v
+end
+opt.on("-c", "--clear-guild ID", Array,
+       "The guild ID to clear command, use comma for clear commands in multiple guilds, " \
+       "or `global` for clear global commands.") do |v|
+  options[:clear_guilds] = v
+end
+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.") do |v|
+  options[:script] = v
+end
 opt.parse!(ARGV)
 
 script = ARGV[0]
@@ -26,17 +38,18 @@ script ||= "main.rb"
 ENV["DISCORB_CLI_FLAG"] = "setup"
 
 ENV["DISCORB_SETUP_GUILDS"] = if options[:guilds] == ["global"]
-  "global"
-elsif options[:guilds]
-  options[:guilds].join(",")
-end
+    "global"
+  elsif options[:guilds]
+    options[:guilds].join(",")
+  end
+
+ENV["DISCORB_SETUP_CLEAR_GUILDS"] = options[:clear_guilds]&.join(",")
 
 ENV["DISCORB_SETUP_SCRIPT"] = options[:script].to_s if options[:script]
 
-begin
+if File.exist? script
   load script
-rescue LoadError
-  eputs "Could not load script: \e[31m#{script}\e[m"
-else
   sputs "Successfully set up commands for \e[32m#{script}\e[m."
+else
+  eputs "Could not load script: \e[31m#{script}\e[m"
 end

data/lib/discorb/exe/show.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 # description: Show information of your environment.
 
 require "etc"
 require "discorb"
 
-puts "\e[90mRuby:\e[m #{RUBY_VERSION}"
-puts "\e[90mdiscorb:\e[m #{Discorb::VERSION}"
+puts "\e[90m    Ruby:\e[m #{RUBY_VERSION}"
+puts "\e[90m discorb:\e[m #{Discorb::VERSION}"
 uname = Etc.uname
-puts "\e[90mSystem:\e[m #{uname[:sysname]} #{uname[:release]}"
+puts "\e[90m  System:\e[m #{uname[:sysname]} #{uname[:release]}"
 puts "\e[90mPlatform:\e[m #{RUBY_PLATFORM}"

data/lib/discorb/extend.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop: disable Style/Documentation
 
 class Time

data/lib/discorb/extension.rb

@@ -14,10 +14,13 @@ module Discorb
 
     def events
       return @events if @events
+
       ret = {}
       self.class.events.each do |event, handlers|
         ret[event] = handlers.map do |handler|
-          Discorb::EventHandler.new(proc { |*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
@@ -72,11 +75,11 @@ module Discorb
       # @return [Array<Discorb::ApplicationCommand::Command>] The commands of the extension.
       attr_reader :commands
       # @private
-      attr_reader :bottom_commands
+      attr_reader :callable_commands
 
       def self.extended(klass)
         klass.instance_variable_set(:@commands, [])
-        klass.instance_variable_set(:@bottom_commands, [])
+        klass.instance_variable_set(:@callable_commands, [])
         klass.instance_variable_set(:@events, {})
       end
     end

data/lib/discorb/flag.rb

@@ -96,6 +96,10 @@ module Discorb
       self.class.new(~@value)
     end
 
+    def to_i
+      @value
+    end
+
     def inspect
       "#<#{self.class}: #{@value}>"
     end
@@ -112,6 +116,13 @@ module Discorb
       def max_value
         2 ** @bits.values.max - 1
       end
+
+      #
+      # Initialize a new flag with keys.
+      #
+      def from_keys(*keys)
+        new(keys.sum { |k| 1 << @bits[k] })
+      end
     end
   end
 end