discorb 0.16.0 → 0.18.0

data/examples/components/authorization_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -28,7 +29,7 @@ client.on :message do |message|
     components: [
       Discorb::Button.new(
         "Get role", custom_id: "auth:#{role.id}",
-      )
+      ),
     ],
   )
 end
@@ -36,9 +37,9 @@ end
 client.on :button_click do |response|
   if response.custom_id.start_with?("auth:")
     id = response.custom_id.delete_prefix("auth:")
-    response.fired_by.add_role(id).wait
+    response.user.add_role(id).wait
     response.post("You got your role!\nHere's your role: <@&#{id}>", ephemeral: true)
   end
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/examples/components/select_menu.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -22,7 +23,7 @@ SECTIONS = [
     > So I decided to make it.
     Matsumoto describes the design of Ruby as being like a simple Lisp language at its core, with an object system like that of Smalltalk, blocks inspired by higher-order functions, and practical utility like that of Perl.
   WIKI
-  ["First publication", <<~WIKI]
+  ["First publication", <<~WIKI],
     The first public release of Ruby 0.95 was announced on Japanese domestic newsgroups on December 21, 1995.
     Subsequently, three more versions of Ruby were released in two days.
     The release coincided with the launch of the Japanese-language ruby-list mailing list, which was the first mailing list for the new language.
@@ -41,7 +42,9 @@ client.on :message do |message|
   next if message.author.bot?
   next unless message.content == "!ruby"
 
-  options = SECTIONS.map.with_index { |section, i| Discorb::SelectMenu::Option.new("Page #{i + 1}", "sections:#{i}", description: section[0]) }
+  options = SECTIONS.map.with_index do |section, i|
+    Discorb::SelectMenu::Option.new("Page #{i + 1}", "sections:#{i}", description: section[0])
+  end
   message.channel.post(
     "Select a section", components: [Discorb::SelectMenu.new("sections", options)],
   )
@@ -59,4 +62,4 @@ client.on :select_menu_select do |response|
   )
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/examples/extension/main.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 require_relative "message_expander"
 
@@ -10,4 +11,4 @@ end
 
 client.load_extension(MessageExpander)
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/examples/extension/message_expander.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
+
 require "discorb"
 
+#
+# Class for expanding message URL.
+#
 class MessageExpander
   include Discorb::Extension
 
-  @@message_regex = Regexp.new(
+  MESSAGE_PATTERN = Regexp.new(
     '(?!<)https://(?:ptb\.|canary\.)?discord(?:app)?\.com/channels/' \
     "(?<guild>[0-9]{18})/(?<channel>[0-9]{18})/(?<message>[0-9]{18})(?!>)"
   )
@@ -12,7 +16,7 @@ class MessageExpander
   event :message do |message|
     next if message.author.bot?
 
-    message.content.to_enum(:scan, @@message_regex).map { Regexp.last_match }.each do |match|
+    message.content.to_enum(:scan, MESSAGE_PATTERN).map { Regexp.last_match }.each do |match|
       ch = @client.channels[match[:channel]]
       next if ch.nil?
 

data/examples/sig/commands/message.rbs

@@ -0,0 +1,5 @@
+class Object
+  def build_embed_from_message: (Discorb::Message message) -> Discorb::Embed
+
+  def bookmark_channel: (Discorb::Guild guild) -> Discorb::TextChannel?
+end

data/examples/simple/eval.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -25,9 +26,9 @@ client.on :message do |message|
     res = res.wait if res.is_a? Async::Task
     message.channel.post("```rb\n#{res.inspect[...1990]}\n```")
   end
-rescue Exception => e
+rescue Exception => e # rubocop:disable Lint/RescueException
   message.reply embed: Discorb::Embed.new("Error!", "```rb\n#{e.full_message(highlight: false)[...1990]}\n```",
                                           color: Discorb::Color[:red])
 end
 
-client.run(ENV["discord_bot_token"])
+client.run(ENV.fetch("discord_bot_token", nil))

data/examples/simple/ping_pong.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -14,4 +15,4 @@ client.on :message do |message|
   message.channel.post("Pong!")
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/examples/simple/rolepanel.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
+
 require "discorb"
 intents = Discorb::Intents.new
 intents.members = true
+
 client = Discorb::Client.new(intents: intents)
 
 def convert_role(guild, string)
@@ -15,6 +17,8 @@ client.once :standby do
 end
 
 client.on :reaction_add do |event|
+  next unless event.guild
+  next unless event.member
   next unless event.emoji.value.end_with?(0x0000fe0f.chr("utf-8") + 0x000020e3.chr("utf-8"))
   next if event.member.bot?
 
@@ -31,6 +35,7 @@ end
 
 client.on :reaction_remove do |event|
   next unless event.emoji.value.end_with?(0x0000fe0f.chr("utf-8") + 0x000020e3.chr("utf-8"))
+  next unless event.member
   next if event.member.bot?
 
   msg = event.fetch_message.wait
@@ -49,18 +54,24 @@ client.on :message do |message|
   next if message.author.bot?
 
   message.reply("Too many roles.") if message.content.split.length > 10
-  roles = message.content.delete_prefix("/rp ").split.map.with_index { |raw_role, index| [index, convert_role(message.guild, raw_role), raw_role] }
+  roles = message.content.delete_prefix("/rp ").split.map.with_index do |raw_role, index|
+    [index, convert_role(message.guild, raw_role), raw_role]
+  end
   if (convert_fails = roles.filter { |r| r[1].nil? }).length.positive?
     message.reply("#{convert_fails.map { |r| r[2] }.join(", ")} is not a role.")
     next
   end
-  rp_msg = message.channel.post(embed: Discorb::Embed.new(
-                                  "Role panel",
-                                  roles.map.with_index(1) { |r, index| "#{index}\ufe0f\u20e3#{r[1].mention}" }.join("\n")
-                                )).wait
+  rp_msg = message.channel.post(
+    embed: Discorb::Embed.new(
+      "Role panel",
+      roles.map.with_index(1) do |r, index|
+        "#{index}\ufe0f\u20e3#{r[1].mention}"
+      end.join("\n")
+    ),
+  ).wait
   1.upto(roles.length).each do |i|
     rp_msg.add_reaction(Discorb::UnicodeEmoji["#{i}\ufe0f\u20e3"]).wait
   end
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/examples/simple/shard.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require "discorb"
 
-client = Discorb::Client.new(log: Logger.new($stdout))
+client = Discorb::Client.new(logger: Logger.new($stderr))
 
 client.once :standby do
   puts "Logged in as #{client.user}"
@@ -14,4 +15,4 @@ client.on :message do |message|
   message.channel.post("I'm #{client.user}, running on shard #{client.shard_id}!")
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"], shards: [0, 1], shard_count: 2)
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil), shards: [0, 1], shard_count: 2)

data/examples/simple/wait_for_message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -12,6 +13,8 @@ client.on :message do |message|
   next unless message.content == "!quiz"
 
   operator = %i[+ - *].sample
+  next unless operator
+
   num1 = rand(1..10)
   num2 = rand(1..10)
 
@@ -28,4 +31,4 @@ client.on :message do |message|
   end
 end
 
-client.run(ENV["DISCORD_BOT_TOKEN"])
+client.run(ENV.fetch("DISCORD_BOT_TOKEN", nil))

data/exe/discorb

@@ -1,32 +1,47 @@
 #! /usr/bin/env ruby
 # frozen_string_literal: true
 
-script = ARGV[0]
+require "optparse"
 
-if script.nil?
-  puts "\e[94mThis is a tool for discorb. Currently these tools are available:\e[m"
-
-  discorb_path = $LOAD_PATH.find { |path| File.directory?(path + "/discorb") }
-  scripts = {}
+options = {
+  bundler: true,
+}
+discorb_paths = $LOAD_PATH.filter { |path| File.directory?(path + "/discorb") }
+scripts = {}
+discorb_paths.each do |discorb_path|
   Dir.glob(discorb_path + "/discorb/exe/*.rb") do |exe_script|
     name = File.basename(exe_script, ".rb")
     description = File.read(exe_script).match(/# description: (.+)/)&.[](1) || "No description"
     scripts[name] = description
   end
-  max_length = scripts.keys.map(&:length).max
-  scripts.sort.each do |name, description|
-    puts "\e[90m#{name.rjust(max_length)}\e[m - #{description}"
+end
+max_length = scripts.keys.map(&:length).max
+global = OptionParser.new do |opts|
+  opts.banner = "Usage: discorb [options] [subcommand [options]]"
+  opts.on("-b", "--[no-]bundler", "Whether to use bundler.") do |v|
+    options[:bundler] = v
   end
+  opts.separator ""
+  commands = +"Subcommands:\n"
+  commands << scripts.sort.map do |name, description|
+    "  #{name.rjust(max_length)} - #{description}"
+  end.join("\n")
+  commands << "\n\nYou can run `discorb [subcommand] --help` for more information."
+  opts.separator commands
+end
+global.order!(ARGV)
 
-  puts "\e[94m\nTo run a tool, type:\e[m\n" \
-       "\e[34m  discorb [script]\e[m"
-
-  exit 1
+if ARGV.empty?
+  puts global
+  abort
 end
 
-begin
-  require "discorb/exe/#{script}"
-rescue LoadError
-  puts "\e[91mThis tool is not available: \e[90m#{script}\e[m"
-  exit 1
+require "bundler/setup" if options[:bundler]
+
+command = ARGV.shift
+
+unless $LOAD_PATH.resolve_feature_path("discorb/exe/#{command}.rb")
+  warn "Unknown subcommand: #{command}"
+  abort
 end
+require "discorb/exe/#{command}"

data/lefthook.yml

@@ -0,0 +1,45 @@
+# EXAMPLE USAGE
+# Refer for explanation to following link:
+# https://github.com/evilmartians/lefthook/blob/master/docs/full_guide.md
+#
+# pre-push:
+#   commands:
+#     packages-audit:
+#       tags: frontend security
+#       run: yarn audit
+#     gems-audit:
+#       tags: backend security
+#       run: bundle audit
+#
+# pre-commit:
+#   parallel: true
+#   commands:
+#     eslint:
+#       glob: "*.{js,ts}"
+#       run: yarn eslint {staged_files}
+#     rubocop:
+#       tags: backend style
+#       glob: "*.rb"
+#       exclude: "application.rb|routes.rb"
+#       run: bundle exec rubocop --force-exclusion {all_files}
+#     govet:
+#       tags: backend style
+#       files: git ls-files -m
+#       glob: "*.go"
+#       run: go vet {files}
+#   scripts:
+#     "hello.js":
+#       runner: node
+#     "any.go":
+#       runner: go run
+pre-commit:
+  parallel: true
+  commands:
+    linting:
+      glob: "*.rb"
+      run: rubocop {staged_files}
+
+commit-msg:
+  scripts:
+    "validator.rb":
+      runner: ruby

data/lib/discorb/allowed_mentions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents a allowed mentions in a message.
@@ -22,7 +23,7 @@ module Discorb
     # @param [Boolean] replied_user Whether to ping the user that sent the message to reply.
     #
     def initialize(everyone: nil, roles: nil, users: nil, replied_user: nil)
-      @everyone = everyone
+      @everyone = !everyone.nil?
       @roles = roles
       @users = users
       @replied_user = replied_user