discorb 0.9.4 → 0.10.1

data/lib/discorb/modules.rb

@@ -37,26 +37,7 @@ module Discorb
         payload[:allowed_mentions] =
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
         payload[:message_reference] = reference.to_reference if reference
-        if components
-          tmp_components = []
-          tmp_row = []
-          components.each do |c|
-            case c
-            when Array
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << c
-            when SelectMenu
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << [c]
-            else
-              tmp_row << c
-            end
-          end
-          tmp_components << tmp_row
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
-        end
+        payload[:components] = Component.to_payload(components) if components
         files = [file] if file
         if files
           seperator, payload = HTTP.multipart(payload, files)
@@ -69,6 +50,8 @@ module Discorb
       end
     end
 
+    alias send_message post
+
     #
     # Edit a message.
     # @macro async
@@ -95,27 +78,8 @@ module Discorb
         payload[:embeds] = tmp_embed.map(&:to_hash) if tmp_embed
         payload[:allowed_mentions] =
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
-        if components
-          tmp_components = []
-          tmp_row = []
-          components.each do |c|
-            case c
-            when Array
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << c
-            when SelectMenu
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << [c]
-            else
-              tmp_row << c
-            end
-          end
-          tmp_components << tmp_row
-          payload[:flags] = (supress ? 1 << 2 : 0) unless flags.nil?
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
-        end
+        payload[:components] = Component.to_payload(components) if components
+        payload[:flags] = (supress ? 1 << 2 : 0) unless supress.nil?
         @client.http.patch("/channels/#{channel_id.wait}/messages/#{message_id}", payload).wait
       end
     end

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

@@ -527,6 +527,7 @@ dd pre.code {
   padding: 9px 14px;
   border-radius: 4px;
   border: 1px solid var(--background-tertiary);
+  overflow-x: scroll;
 }
 
 #main {
@@ -550,6 +551,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

data/template-replace/scripts/version.rb

@@ -4,21 +4,36 @@ def build_version_sidebar(dir, version)
   raw.gsub!(template, "")
   res = +""
   i = 0
-  `git tag`.force_encoding("utf-8").split("\n").each.with_index do |tag|
+  `git tag`.force_encoding("utf-8").split("\n").reverse.each.with_index do |tag|
     i += 1
     sha = `git rev-parse #{tag}`.force_encoding("utf-8").strip
-    version = tag.delete_prefix("v")
+    tag_version = tag.delete_prefix("v")
     cls = i % 2 == 0 ? "even" : "odd"
-    if version == "."
+    if tag_version == version
       cls += " current"
     end
-    res += template.gsub("!version!", version).gsub("!path!", "../" + version).gsub("!class!", cls).gsub("!sha!", sha)
+    res += template
+      .gsub("!version!", tag_version)
+      .gsub("!path!", "/" + tag_version)
+      .gsub("!class!", cls)
+      .gsub("!sha!", sha)
   end
   i += 1
   cls = i % 2 == 0 ? "even" : "odd"
   if version == "main"
     cls += " current"
   end
-  res += template.gsub("!version!", "main").gsub("!path!", "../main").gsub("!class!", cls).gsub("!sha!", "(Latest on GitHub)")
+  res.insert 0, template
+               .gsub("!version!", "main")
+               .gsub("!path!", "/main")
+               .gsub("!class!", cls)
+               .gsub("!sha!", "Latest on GitHub")
+  i += 1
+  cls = i % 2 == 0 ? "even" : "odd"
+  res.insert 0, template
+               .gsub("!version!", "Latest")
+               .gsub("!path!", "/")
+               .gsub("!class!", cls)
+               .gsub("!sha!", "Latest on RubyGems")
   File.write(dir + "/version_list.html", raw.gsub("<!--replace-->", res))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.1
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-10-02 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