discorb 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575a8b441c3065b5ffa3620b115c58f6356da23c0a50448e48e8db2c364093ef
-  data.tar.gz: c355067b4585325ecc33e400e5a96ba5b95f71843882217f1bc6d34de502b931
+  metadata.gz: 39902a57677adf3ce903678e58060ee04da318617ba81611546772131c9d1696
+  data.tar.gz: 6f0f17d2230a19b79f6330cda2d567f704f8ffe44ca59e8938cc0ec0f32dfb35
 SHA512:
-  metadata.gz: c93f55029eeaaa52448146e1f19f4fd482ae50038b3024c7339a32ad6afc350604e860ae11d8ca36a69b13fc565ce7c64aa445fe17aca2423c6aad9792e2e78f
-  data.tar.gz: 57e2b64e98d0fbff3cb69c8ad576267adc9d17dbe066b1005db2c5a394d7a61faf003e8957b858fc18804b76195a1d16cd0d00ce1e49a9b8ff11225c5289dc5a
+  metadata.gz: 453b9228e5afca3d9b206b54aa3f34f97b3a4c6d6ade46034fe3d0fd8620c1069d0288fa672bc20cdcce2816405f925d92a9fcf6012bc73d5a09fdb4bc7c0335
+  data.tar.gz: 11920dcfc13754975686abe69504af19f81331fa684fd5d51aa1065ff426300dfa90ef373c626a84f1c3533e511dd0f35641126f020c1838bc7262538d6fa505

data/Changelog.md

@@ -252,3 +252,9 @@ end
 - Fix: Fix some issues in document
 - Add: Add some attributes to `Message`
 - Fix: Fix guild parameter in message of message command
+
+## 0.9.5
+
+- Fix: Fix editing message
+- Add: Add `required` in slash command argument
+- Add: Add `default` in slash command argument

data/README.md

@@ -1,10 +1,10 @@
 <div align="center"><img src="./assets/banner.svg" alt="discorb"></div>
 
-<div align="center"><a href="https://discorb-lib.github.io/"><img src="https://img.shields.io/badge/Document-discorb--lib.github.io-blue.svg?style=flat-square" alt="Document"></a>
-<a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff&label=Downloads&style=flat-square" alt="Gem"></a>
-<a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff&label=Version&style=flat-square" alt="Gem"></a>
-<a href="https://discord.gg/hCP6zq8Vpj"><img src="https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord&style=flat-square" alt="Discord"></a>
-<a href="https://github.com/discorb-lib/discorb"><img src="https://img.shields.io/github/stars/discorb-lib/discorb?color=24292e&label=Stars&logo=GitHub&logoColor=fff&style=flat-square" alt="GitHub"></a></div>
+<div align="center"><a href="https://discorb-lib.github.io/"><img src="https://img.shields.io/badge/Document-discorb--lib.github.io-blue.svg?style=flat-square&labelColor=2f3136" alt="Document"></a>
+<a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff&label=Downloads&style=flat-square&labelColor=2f3136" alt="Gem"></a>
+<a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff&label=Version&style=flat-square&labelColor=2f3136" alt="Gem"></a>
+<a href="https://discord.gg/hCP6zq8Vpj"><img src="https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord&style=flat-square&labelColor=2f3136" alt="Discord"></a>
+<a href="https://github.com/discorb-lib/discorb"><img src="https://img.shields.io/github/stars/discorb-lib/discorb?color=24292e&label=Stars&logo=GitHub&logoColor=fff&style=flat-square&labelColor=2f3136" alt="GitHub"></a></div>
 
 ----
 

data/Rakefile

@@ -91,6 +91,7 @@ namespace :document do
       require_relative "template-replace/scripts/index.rb"
       require_relative "template-replace/scripts/yard_replace.rb"
       require_relative "template-replace/scripts/favicon.rb"
+      require_relative "template-replace/scripts/arrow.rb"
       iputs "Resetting changes"
       Dir.glob("doc/#{version}/**/*.html") do |f|
         next if (m = f.match(/[0-9]+\.[0-9]+\.[0-9]+(-[a-z]+)?/)) && m[0] != version
@@ -112,6 +113,8 @@ namespace :document do
       yard_replace("doc/#{version}", version)
       iputs "Adding favicon"
       add_favicon("doc/#{version}")
+      iputs "Replacing arrow"
+      replace_arrow("doc/#{version}")
       iputs "Successfully replaced htmls"
     end
 

data/docs/application_command.md

@@ -60,13 +60,14 @@ In `options`, hash should be like this:
   }
 }
 ```
-
-| Key | Description |
-| --- | --- |
-| `type` | The type of the argument. |
-| `required` | Whether the argument is required. |
-| `description` | The description of the argument. |
-| `choices` | The choices of the argument. |
+| Key | Type | Description |
+| --- | --- | --- |
+| `:description` | `String` | Description of the option. |
+| `:required` | Whether the argument is required. `optional` will be used if not specified. |
+| `:optional` | Whether the argument is optional. `required` will be used if not specified. |
+| `:type` | `Object` | Type of the option. |
+| `:choice` | `Hash{String => String, Integer, Float}` | Type of the option. |
+| `:default` | `Object` | Default value of the option. |
 
 `choices` should be unspecified if you don't want to use it.
 `choices` is hash like this:

data/docs/license.md

@@ -4,4 +4,4 @@
 
 discorb is licensed under the [MIT license](https://opensource.org/licenses/MIT).
 
-{include:file:License.txt}
+{include:file:LICENSE.txt}

data/lib/discorb/app_command.rb

@@ -20,9 +20,11 @@ module Discorb
       #   | Key | Type | Description |
       #   | --- | --- | --- |
       #   | `:description` | `String` | Description of the option. |
-      #   | `:optional` | `Boolean` | Whether the option is optional or not. |
+      #   | `:required` | Whether the argument is required. `optional` will be used if not specified. |
+      #   | `:optional` | Whether the argument is optional. `required` will be used if not specified. |
       #   | `:type` | `Object` | Type of the option. |
       #   | `:choice` | `Hash{String => String, Integer, Float}` | Type of the option. |
+      #   | `:default` | `Object` | Default value of the option. |
       #
       # @param [Array<#to_s>, false, nil] guild_ids Guild IDs to set the command to. `false` to global command, `nil` to use default.
       # @param [Proc] block Command block.
@@ -231,7 +233,7 @@ module Discorb
               end,
               name: name,
               description: value[:description],
-              required: !value[:optional],
+              required: value[:required].nil? ? !value[:optional] : value[:required],
             }
             if value[:choices]
               ret[:choices] = value[:choices].map { |t| { name: t[0], value: t[1] } }

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.9.4"
+  VERSION = "0.9.5"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/extend.rb

@@ -16,3 +16,24 @@ class Time
     end
   end
 end
+
+# @private
+class Async::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
+    end
+  end
+
+  def to_s
+    "\#<#{self.description}>"
+  end
+
+  alias inspect to_s
+end

data/lib/discorb/file.rb

@@ -60,6 +60,14 @@ module Discorb
     # @return [String] The content type of the file. If not set, it is guessed from the filename.
     attr_accessor :content_type
 
+    #
+    # Creates a new file from IO.
+    #
+    # @param [#read] io The IO of the file.
+    # @param [String] filename The filename of the file. If not set, path or object_id of the IO is used.
+    # @param [String] content_type The content type of the file. If not set, it is guessed from the filename.
+    #   If failed to guess, it is set to `application/octet-stream`.
+    #
     def initialize(io, filename = nil, content_type: nil)
       @io = io
       @filename = filename || (io.respond_to?(:path) ? io.path : io.object_id)
@@ -67,8 +75,18 @@ module Discorb
       @content_type = "application/octet-stream" if @content_type == ""
     end
 
+    #
+    # Creates a new file from a string.
+    #
+    # @param [String] string The string to create the file from.
+    # @param [String] filename The filename of the file. object_id of the string is used if not set.
+    # @param [String] content_type The content type of the file. If not set, it is guessed from the filename.
+    #
+    # @return [File] The new file.
+    #
     def self.from_string(string, filename: nil, content_type: nil)
       io = StringIO.new(string)
+      filename ||= string.object_id.to_s + ".txt"
       new(io, filename, content_type: content_type)
     end
   end

data/lib/discorb/interaction.rb

@@ -198,7 +198,6 @@ module Discorb
         # @macro http
         # @macro edit
         #
-        # @param [Discorb::Webhook::Message] message The message to edit.
         # @param [String] content The new content of the message.
         # @param [Discorb::Embed] embed The new embed of the message.
         # @param [Array<Discorb::Embed>] embeds The new embeds of the message.
@@ -363,28 +362,31 @@ module Discorb
               options = data[:options]
             end
           end
-          options ||= []
-          options.map! do |option|
-            case option[:type]
-            when 3, 4, 5, 10
-              option[:value]
-            when 6
-              guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
-            when 7
-              guild.channels[option[:value]] || guild.fetch_channels.wait.find { |channel| channel.id == option[:value] }
-            when 8
-              guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
-            when 9
-              guild.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
-            end
-          end
 
           unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
             @client.log.warn "Unknown command name #{name}, ignoreing"
             next
           end
 
-          command.block.call(self, *options)
+          option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
+          options ||= []
+          options.each do |option|
+            val = case option[:type]
+              when 3, 4, 5, 10
+                option[:value]
+              when 6
+                guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
+              when 7
+                guild.channels[option[:value]] || guild.fetch_channels.wait.find { |channel| channel.id == option[:value] }
+              when 8
+                guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+              when 9
+                guild.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+              end
+            option_map[option[:name]] = val
+          end
+
+          command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
         end
       end
     end

data/lib/discorb/message.rb

@@ -296,11 +296,11 @@ module Discorb
     # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
     # @param [Boolean] supress Whether to supress embeds.
     #
-    def edit(message_id, content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
-                                        components: nil, supress: nil)
+    def edit(content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
+                            components: nil, supress: nil)
       Async do
-        channel.edit_message(@id, message_id, content, embed: embed, embeds: embeds, allowed_mentions: allowed_mentions,
-                                                       components: components, supress: supress).wait
+        channel.edit_message(@id, content, embed: embed, embeds: embeds, allowed_mentions: allowed_mentions,
+                                           components: components, supress: supress).wait
       end
     end
 

data/lib/discorb/modules.rb

@@ -113,7 +113,7 @@ module Discorb
             end
           end
           tmp_components << tmp_row
-          payload[:flags] = (supress ? 1 << 2 : 0) unless flags.nil?
+          payload[:flags] = (supress ? 1 << 2 : 0) unless supress.nil?
           payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
         end
         @client.http.patch("/channels/#{channel_id.wait}/messages/#{message_id}", payload).wait

data/lib/discorb/utils.rb

@@ -14,23 +14,3 @@ module Discorb
     module_function :try
   end
 end
-
-class Async::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
-    end
-  end
-
-  def to_s
-    "\#<#{self.description}>"
-  end
-
-  alias inspect to_s
-end

data/template-replace/files/css/common.css

@@ -550,6 +550,6 @@ dd pre.code {
   display: inline !important;
 }
 
-p.signature, h3.signature{
-  font-family: var(--font-monospace);
+p.signature, h3.signature, p.signature tt, h3.signature tt{
+  font-family: var(--monospace-font);
 }

data/template-replace/scripts/arrow.rb

@@ -0,0 +1,7 @@
+def replace_arrow(dir)
+  Dir.glob("#{dir}/**/*.html") do |file|
+    content = File.read(file)
+    content.gsub!("  ⇒ ", " -> ")
+    File.write(file, content, mode: "wb")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -181,6 +181,7 @@ files:
 - template-replace/files/css/common.css
 - template-replace/files/favicon.png
 - template-replace/resources/version_list.html
+- template-replace/scripts/arrow.rb
 - template-replace/scripts/favicon.rb
 - template-replace/scripts/index.rb
 - template-replace/scripts/sidebar.rb