discorb 0.8.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd489ad4debd6585ee50f7e260288c862b1b655d2dda44af6151398e9b722b01
-  data.tar.gz: b5fd92c939bdbc8456dd0302b1a6d5e362afba2f39bdbe337e03918d30eb6357
+  metadata.gz: fbb61003015daf1f1731f80809e9c739cad169f60b7b5f7cc6c1ac7580d61bd1
+  data.tar.gz: e2d7bcad6c493bea84b7f2608a1d1366f76e95675c50052b034742be322d0569
 SHA512:
-  metadata.gz: ebf5a3685316ab02f18ff2d21af0f494c13beac47554968a54b96109eebfa98c38b6e4e0c5f4c1c8e8d8ce2dee70a6424a87782ca75804830e8826da1ce64c43
-  data.tar.gz: dfb9ee552ed4eae349ed6cf99f846f391a1afab96941a181de11a3257d1a9234bb7304baeedd36b29f751374a59492299697856728b1a7779b930dc22e43ff81
+  metadata.gz: 9b2cee7155fe0273181fc7cf1fdd048ebd0b9d1adba4ca7c4444a31a92b5cd86a65c77511e581858c379e1abb53d1d092ab6115394b0a9fbc076b6692b04312b
+  data.tar.gz: 245db18f6b68599ccf199e5c1571a3f38181d4a4a6dc5371cf55e29bc9dd1d95766ff67047091558aaf392f41ea3fb0d28b726972c120ad7dd80a216a1e3699c

data/Changelog.md

@@ -220,3 +220,28 @@ end
 - Add: Add `File.from_string`
 - Fix: Fix `Client#update_presence`
 - Add: Add information in `discorb run -d`
+
+## 0.8.2
+
+- Fix: Fix `Client#initialize`
+
+## 0.9.0
+
+- Delete: Delete `-d` parameter from `discorb run`; This is caused by segement fault error.
+- Change: Rename `-t`, `--token` to `-e`, `--env` parameter
+- Add: Add `-t`, `--title` parameter to `discorb run`
+- Add: Add `title` parameter to `Client#initialize`
+
+## 0.9.1
+
+- Fix: Fix member fetching
+
+## 0.9.2 (yanked)
+
+- Add: Make `Async::Task#inspect` shorter
+- Add: `SourceResponse#post` will return message now
+- Fix: Fix member caching
+
+## 0.9.3
+
+- Fix: Fix interaction responding

data/docs/faq.md

@@ -35,7 +35,7 @@ Use {Discorb::Client#update_presence} method.
   client.on event do
     client.update_presence(
       Discorb::Activity.new(
-        name: "#{client.guilds.length} Servers"
+        "#{client.guilds.length} Servers"
       ),
       status: :online
     )

data/lib/discorb/client.rb

@@ -65,13 +65,14 @@ module Discorb
     # @param [Boolean] colorize_log Whether to colorize the log.
     # @param [:debug, :info, :warn, :error, :critical] log_level The log level.
     # @param [Boolean] wait_until_ready Whether to delay event dispatch until ready.
-    # @param [Boolean] fetch_member Whether to fetch member on ready. This may slow down the client.
-    #   Defaultly, it's `false` if {Discorb::Intents#members} is false. Otherwise, it's `true`.
+    # @param [Boolean] fetch_member Whether to fetch member on ready. This may slow down the client. Default to `false`.
+    # @param [String] title The title of the process. `false` to default, `nil` to `discorb: User#0000`. Default to `nil`.
     #
     def initialize(
       allowed_mentions: nil, intents: nil, message_caches: 1000,
       log: nil, colorize_log: false, log_level: :info,
-      wait_until_ready: true, fetch_member: nil
+      wait_until_ready: true, fetch_member: false,
+      title: nil
     )
       @allowed_mentions = allowed_mentions || AllowedMentions.new(everyone: true, roles: true, users: true)
       @intents = (intents or Intents.default)
@@ -94,7 +95,8 @@ module Discorb
       @commands = []
       @bottom_commands = []
       @status = :initialized
-      @fetch_member = fetch_member.nil? ? !(intents&.members) : fetch_member
+      @fetch_member = fetch_member
+      @title = title
       set_default_events
     end
 
@@ -496,15 +498,10 @@ module Discorb
       end
 
       once :standby do
-        if @daemon
-          title = "discorb: #{@user}"
-          Process.setproctitle title
-          sputs "Your discorb client is now in standby mode."
-          iputs "Process ID: #{Process.pid}"
-          iputs "Title: #{title}"
+        next if @title == false
 
-          Process.daemon
-        end
+        title = @title || ENV["DISCORB_CLI_TITLE"] || "discorb: #{@user}"
+        Process.setproctitle title
       end
     end
   end

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

data/lib/discorb/exe/run.rb

@@ -16,14 +16,13 @@ opt = OptionParser.new <<~BANNER
                                    script                     The script to run. Defaults to 'main.rb'.
                        BANNER
 options = {
-  deamon: false,
+  title: nil,
   log_level: nil,
   log_file: nil,
   log_color: nil,
   setup: nil,
   token: false,
 }
-opt.on("-d", "--deamon", "Run as a daemon.") { |v| options[:daemon] = v }
 opt.on("-l", "--log-level LEVEL", "Log level.") do |v|
   unless LOG_LEVELS.include? v.downcase
     eputs "Invalid log level: \e[31m#{v}\e[91m"
@@ -35,7 +34,8 @@ end
 opt.on("-f", "--log-file FILE", "File to write log to.") { |v| options[:log_file] = v }
 opt.on("-c", "--[no-]log-color", "Whether to colorize log output.") { |v| options[:log_color] = v }
 opt.on("-s", "--setup", "Whether to setup application commands.") { |v| options[:setup] = v }
-opt.on("-t", "--token [ENV]", "The name of the environment variable to use for token, or just `-t` or `--token` 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.") { |v| options[:token] = v }
+opt.on("-t", "--title TITLE", "The title of process.") { |v| options[:title] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
@@ -54,6 +54,8 @@ elsif options[:token].nil? || options[:token] == "-"
   puts ""
 end
 
+ENV["DISCORB_CLI_TITLE"] = options[:title]
+
 begin
   load script
 rescue LoadError

data/lib/discorb/gateway.rb

@@ -3,7 +3,6 @@
 require "async/http"
 require "async/websocket"
 require "async/barrier"
-require "async/semaphore"
 require "json"
 require "zlib"
 
@@ -1035,14 +1034,13 @@ module Discorb
           if @fetch_member
             @log.debug "Fetching members"
             barrier = Async::Barrier.new
-            semaphore = Async::Semaphore.new(@guilds.length)
 
             @guilds.each do |guild|
-              semaphore.async(parent: barrier) do
+              barrier.async(parent: barrier) do
                 guild.fetch_members
               end
             end
-            semaphore.__send__(:wait)
+            barrier.wait
           end
           @ready = true
           dispatch(:standby)

data/lib/discorb/interaction.rb

@@ -131,6 +131,8 @@ module Discorb
       # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
+      # @return [Discorb::Interaction::SourceResponse::CallbackMessage, Discorb::Webhook::Message] The callback message.
+      #
       def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
         Async do
           payload = {}
@@ -165,14 +167,79 @@ module Discorb
           end
           payload[:flags] = (ephemeral ? 1 << 6 : 0)
 
-          if @responded
-            @client.http.post("/webhooks/#{@application_id}/#{@token}", payload).wait
-          elsif @defered
-            @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload).wait
-          else
-            @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
-          end
+          ret = if @responded
+              _resp, data = @client.http.post("/webhooks/#{@application_id}/#{@token}", payload).wait
+              webhook = Webhook::URLWebhook.new("/webhooks/#{@application_id}/#{@token}")
+              Webhook::Message.new(webhook, data, @client)
+            elsif @defered
+              @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload).wait
+              CallbackMessage.new(@client, payload, @application_id, @token)
+            else
+              @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+              CallbackMessage.new(@client, payload, @application_id, @token)
+            end
           @responded = true
+          ret
+        end
+      end
+
+      class CallbackMessage
+        # @!visibility private
+        def initialize(client, data, application_id, token)
+          @client = client
+          @data = data
+          @application_id = application_id
+          @token = token
+        end
+
+        #
+        # Edits the callback message.
+        # @macro async
+        # @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.
+        # @param [Array<Discorb::Attachment>] attachments The attachments to remain.
+        # @param [Discorb::File] file The file to send.
+        # @param [Array<Discorb::File>] files The files to send.
+        #
+        def edit(
+          content = :unset,
+          embed: :unset, embeds: :unset,
+          file: :unset, files: :unset,
+          attachments: :unset
+        )
+          Async do
+            payload = {}
+            payload[:content] = content if content != :unset
+            payload[:embeds] = embed ? [embed.to_hash] : [] if embed != :unset
+            payload[:embeds] = embeds.map(&:to_hash) if embeds != :unset
+            payload[:attachments] = attachments.map(&:to_hash) if attachments != :unset
+            files = [file] if file != :unset
+            if files == :unset
+              headers = {
+                "Content-Type" => "application/json",
+              }
+            else
+              headers, payload = HTTP.multipart(payload, files)
+            end
+            @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload, headers: headers).wait
+          end
+        end
+
+        alias modify edit
+
+        #
+        # Deletes the callback message.
+        # @note This will fail if the message is ephemeral.
+        #
+        def delete!
+          Async do
+            @client.http.delete("/webhooks/#{@application_id}/#{@token}/messages/@original").wait
+          end
         end
       end
     end

data/lib/discorb/message.rb

@@ -213,6 +213,55 @@ module Discorb
       !@updated_at.nil?
     end
 
+    #
+    # Removes the mentions from the message.
+    #
+    # @param [Boolean] user Whether to clean user mentions.
+    # @param [Boolean] channel Whether to clean channel mentions.
+    # @param [Boolean] role Whether to clean role mentions.
+    # @param [Boolean] emoji Whether to clean emoji.
+    # @param [Boolean] everyone Whether to clean `@everyone` and `@here`.
+    # @param [Boolean] codeblock Whether to clean codeblocks.
+    #
+    # @return [String] The cleaned content of the message.
+    #
+    def clean_content(user: true, channel: true, role: true, emoji: true, everyone: true, codeblock: false)
+      ret = @content.dup
+      ret.gsub!(/<@!?(\d+)>/) do |match|
+        member = guild&.members&.[]($1)
+        member ||= @client.users[$1]
+        member ? "@#{member.name}" : "@Unknown User"
+      end if user
+      ret.gsub!(/<#(\d+)>/) do |match|
+        channel = @client.channels[$1]
+        channel ? "<##{channel.id}>" : "#Unknown Channel"
+      end
+      ret.gsub!(/<@&(\d+)>/) do |match|
+        role = guild&.roles&.[]($1)
+        role ? "@#{role.name}" : "@Unknown Role"
+      end if role
+      ret.gsub!(/<a?:([a-zA-Z0-9_]+):\d+>/) do |match|
+        $1
+      end if emoji
+      ret.gsub!(/@(everyone|here)/, "@\u200b\\1") if everyone
+      unless codeblock
+        codeblocks = ret.split("```", -1)
+        original_codeblocks = @content.scan(/```(.+?)```/m)
+        res = []
+        max = codeblocks.length
+        codeblocks.each_with_index do |codeblock, i|
+          if max % 2 == 0 && i == max - 1 or i.even?
+            res << codeblock
+          else
+            res << original_codeblocks[i / 2]
+          end
+        end
+        res.join("```")
+      else
+        ret
+      end
+    end
+
     #
     # Edit the message.
     #

data/lib/discorb/utils.rb

@@ -14,3 +14,23 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.3
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -79,8 +79,6 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/build_main.yml"
 - ".github/workflows/build_version.yml"
-- ".github/workflows/changelog.rb"
-- ".github/workflows/release_from_changelog.yml"
 - ".gitignore"
 - ".yardopts"
 - Changelog.md

data/.github/workflows/changelog.rb

@@ -1,12 +0,0 @@
-changelog = File.read("./Changelog.md")
-releases = changelog.split("## ")
-releases_hash = releases.map do |release|
-  release_name = "v" + release.split("\n")[0]
-  release_body = release.split("\n")[1..-1].join("\n").strip
-  [release_name, release_body]
-end.to_h
-
-release_version = ENV["GITHUB_REF"].split("/")[-1]
-
-release_body = releases_hash[release_version] || "No release notes for this version"
-puts "::set-output name=release_body::#{release_body.gsub("\n", "\\n")}"

data/.github/workflows/release_from_changelog.yml

@@ -1,39 +0,0 @@
-name: Release from changelog
-
-on:
-  workflow_dispatch:
-  push:
-    tags: 
-      - "v*"
-jobs:
-  main:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: true
-      - name: Install dependencies
-        run: |
-          bundle install
-      - name: Get changelog
-        run: |
-          bundle exec ruby .github/workflows/changelog.rb
-        id: get-changelog
-      - name: Build gem
-        run: |
-          bundle exec rake build
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            $(ls -1 pkg/*.gem)
-          body: ${{ steps.get-changelog.outputs.release_body }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}