discorb 0.7.0 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13326863238ba4e79e873947fe579da1027bfcfe7f6baed1bd9d0c74806e31a1
-  data.tar.gz: c43a370b95eec06dcfa2ce0f627c8b9e14421464848c7170690ddc9527aff589
+  metadata.gz: a2d341757256d728ba6bb750b068a06f859e5d796d9e44bb1e4d616f4b439444
+  data.tar.gz: 3d4f6aaf740f8366a7f714011f60688871a9b4698bce9a37b6fd4c35cd31ab10
 SHA512:
-  metadata.gz: bf804c54e218696a9ba5464af5e8c6d4d25132ac573413d0453502872e2dcc55ec49bfb4c571d05df4d489a49cef894ca139091e74fb41fb0d5f36c2786e5cdf
-  data.tar.gz: 8fb94771a4ea9730962f084d40439383b412caa97674aa9d6edb38d01ebd10fb14ecc54a9bac24a067768bbe5866d18ddd6366449ba84355324af70839fce135
+  metadata.gz: dd2620d3de3cf9e1b024701a9312d63a0990ac5360c9b5e65d096cc3792dd81effb79b26577812e6ac229f155d53ccf4a8f5aa093103e56d05c677eb8904936b
+  data.tar.gz: a04ab3bb0982d21d0d40d132b0b217ee4b95b214c848d970229e8f66bf0a4d5e2d07dce2006822ab07954f5a0de343a7769b1e36181778ccd501e5a02b6456fb

data/Changelog.md

@@ -157,6 +157,7 @@
 - Fix: Fix some issues with client without guild intent
 - Add: Add alias for `#fired_by`
 - Change!: Change block usage of `ApplicationCommand::Handler#group`
+
 ```ruby
 # before
 client.slash_group do
@@ -170,4 +171,35 @@ client.slash_group do |group|
   group.slash "help", "Help" do |interaction|
     # ...
   end
-end
+end
+
+```
+
+## 0.7.1
+
+- Fix: Fix error of responding to interaction
+  
+## 0.7.2
+
+- Add: Add `Member#owner?`
+- Fix: Fix `Member#permissions`
+- Add: Add `Member#guild_permissions` as alias of `Member#permissions`
+- Add: Add default role to `Member#roles`
+- Fix: Fix error in `Integration#_set_data`
+- Change: Reverse `Member#roles`
+
+## 0.7.3
+
+- Add: Improve `discorb init`
+
+## 0.7.4 (yanked)
+
+- Fix: Fix disconnected client
+  
+## 0.7.5 (yanked)
+
+- Fix: Fix critical error
+
+## 0.7.6
+
+- Fix: Fix heartbeating error

data/docs/cli/init.md

@@ -32,6 +32,18 @@ If true, the command will initialize git and commit the initial files with commi
 Use `git commit --amend -m "..."` to change the commit message.
 Default to false.
 
+### `--[no-]desc`
+
+Whether to create a description file.
+If true, the command will create a `.env.sample` and `README.md` file.
+Default to false.
+
+### `-n` `--name`
+
+The name of the project.
+It will be used in the `README.md` file.
+Default to the directory name.
+
 ### `-t`, `--token`
 
 The name of token environment variable.
@@ -49,7 +61,9 @@ The following files will be created:
 | File | Description |
 | ---- | ----------- |
 | `.env` | Environment variables. |
+| `main.rb` | Main script. |
 | `.gitignore` | Git ignore file. Won't be created if `--git` is false. |
 | `Gemfile` | Gemfile. Won't be created if `--bundle` is false. |
 | `Gemfile.lock` | Gemfile lock file. Won't be created if `--bundle` is false. |
-| `main.rb` | Main script. |
+| `README.md` | Readme file. Won't be created if `--desc` is false. |
+| `.env.sample` | Sample environment variables. Won't be created if `--desc` is false. |

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.7.0"
+  VERSION = "0.7.6"
   # @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/init.rb

@@ -96,11 +96,46 @@ FILES = {
     gem "discorb", "~> #{Discorb::VERSION}"
     gem "dotenv", "~> 2.7"
   RUBY
+  ".env.sample" => <<~BASH,
+    %<token>s=
+  BASH
+  "README.md" => <<~MARKDOWN,
+    # %<name>s
+
+    Welcome to your bot: %<name>s!
+
+    TODO: Write your bot's description here.
+
+    ## Usage
+
+    TODO: Write your bot's usage here.
+
+    ## Features
+
+    TODO: Write your bot's features here.
+
+    ## How to host
+
+    1. Clone the repository.
+    2. Run `bundle install`.
+    3. Get your bot's token from the Discord developer portal.
+    4. Copy `.env.sample` to `.env` and fill in the token.
+    5. Run `bundle exec discorb run`.
+
+    TODO: Write your own customizations here.
+
+    ## License
+
+    TODO: Write your bot's license here.
+      See https://choosealicense.com/ for more information.
+      https://rubygems.org/gems/license-cli may be useful.
+
+  MARKDOWN
 }
 
 # @!visibility private
 def create_file(name)
-  File.write($path + "/#{name}", format(FILES[name], token: $values[:token]), mode: "wb")
+  File.write($path + "/#{name}", format(FILES[name], token: $values[:token], name: $values[:name]), mode: "wb")
 end
 
 # @!visibility private
@@ -132,6 +167,14 @@ def git_init
           " to change commit message of initial commit.\n"
 end
 
+# @!visibility private
+def make_descs
+  iputs "Making descriptions..."
+  create_file(".env.sample")
+  create_file("README.md")
+  sputs "Made descriptions.\n"
+end
+
 opt = OptionParser.new <<~BANNER
                          A tool to make a new project.
 
@@ -145,6 +188,8 @@ $values = {
   git: false,
   force: false,
   token: "TOKEN",
+  descs: false,
+  name: nil,
 }
 
 opt.on("--[no-]bundle", "Whether to use bundle. Default to true.") do |v|
@@ -155,10 +200,18 @@ opt.on("--[no-]git", "Whether to initialize git. Default to false.") do |v|
   $values[:git] = v
 end
 
+opt.on("--[no-]descs", "Whether to put some file for description. Default to false.") do |v|
+  $values[:descs] = v
+end
+
 opt.on("-t NAME", "--token NAME", "The name of token environment variable. Default to TOKEN.") do |v|
   $values[:token] = v
 end
 
+opt.on("-n NAME", "--name NAME", "The name of your project. Default to the directory name.") do |v|
+  $values[:name] = v
+end
+
 opt.on("-f", "--force", "Whether to force use directory. Default to false.") do |v|
   $values[:force] = v
 end
@@ -187,10 +240,14 @@ if (dir = ARGV[0])
   Dir.chdir($path)
 end
 
+$values[:name] ||= Dir.pwd.split("/").last
+
 bundle_init if $values[:bundle]
 
 make_files
 
 git_init if $values[:git]
 
+make_descs if $values[:descs]
+
 sputs "\nSuccessfully made a new project at \e[32m#{$path}\e[92m."

data/lib/discorb/gateway.rb

@@ -488,7 +488,7 @@ module Discorb
           _, gateway_response = @http.get("/gateway").wait
           gateway_url = gateway_response[:url]
           endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
-                                                alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
+                                                 alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
             Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection) do |connection|
               @connection = connection
@@ -510,7 +510,9 @@ module Discorb
               raise ClientError.new("Authentication failed."), cause: nil
             when "Discord WebSocket requesting client reconnect."
               @log.info "Discord WebSocket requesting client reconnect"
-              @tasks.map(&:stop)
+              connect_gateway(false)
+            else
+              @log.error "Discord WebSocket closed: #{e.message}"
               connect_gateway(false)
             end
           rescue EOFError, Async::Wrapper::Cancelled
@@ -579,15 +581,18 @@ module Discorb
         end
       end
 
-      def handle_heartbeat(interval)
+      def handle_heartbeat
         Async do |task|
+          interval = @heartbeat_interval
           sleep((interval / 1000.0 - 1) * rand)
           loop do
-            @heartbeat_before = Time.now.to_f
-            @connection.write({ op: 1, d: @last_s }.to_json)
-            @connection.flush
-            @log.debug "Sent opcode 1."
-            @log.debug "Waiting for heartbeat."
+            unless @connection.closed?
+              @heartbeat_before = Time.now.to_f
+              @connection.write({ op: 1, d: @last_s }.to_json)
+              @connection.flush
+              @log.debug "Sent opcode 1."
+              @log.debug "Waiting for heartbeat."
+            end
             sleep(interval / 1000.0 - 1)
           end
         end
@@ -609,7 +614,7 @@ module Discorb
             dispatch(:ready)
             @log.info("Successfully connected to Discord.")
           end
-          @tasks << handle_heartbeat(@heartbeat_interval)
+          @tasks << handle_heartbeat
         when "GUILD_CREATE"
           if @uncached_guilds.include?(data[:id])
             Guild.new(self, data, true)
@@ -839,12 +844,12 @@ module Discorb
           dispatch(:voice_state_update, old, current)
           if old&.channel != current&.channel
             dispatch(:voice_channel_update, old, current)
-            case [old&.channel, current&.channel]
-            in [nil, _]
+            case [old&.channel.nil?, current&.channel.nil?]
+            when [true, false]
               dispatch(:voice_channel_connect, current)
-            in [_, nil]
+            when [false, true]
               dispatch(:voice_channel_disconnect, old)
-            in _
+            when [false, false]
               dispatch(:voice_channel_move, old, current)
             end
           end
@@ -980,9 +985,9 @@ module Discorb
           dispatch(:reaction_add, ReactionEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find do |r|
-              data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
-            end)
+             (target_reaction = target_message.reactions.find do |r|
+               data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
+             end)
             target_reaction.instance_variable_set(:@count, target_reaction.count - 1)
             target_message.reactions.delete(target_reaction) if target_reaction.count.zero?
           end
@@ -994,7 +999,7 @@ module Discorb
           dispatch(:reaction_remove_all, ReactionRemoveAllEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE_EMOJI"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
+             (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
             target_message.reactions.delete(target_reaction)
           end
           dispatch(:reaction_remove_emoji, ReactionRemoveEmojiEvent.new(data))
@@ -1017,25 +1022,35 @@ module Discorb
         end
       end
     end
-    
+
     #
     # A class for connecting websocket with raw bytes data.
     # @private
     #
-    class RawConnection < Async::WebSocket::Connection		
-      def initialize(...)
+    class RawConnection < Async::WebSocket::Connection
+      def initialize(*, **)
         super
+        @closed = false
       end
-    
-			def parse(buffer)
-				# noop
+
+      def closed?
+        @closed
+      end
+
+      def close
+        super
+        @closed = true
+      end
+
+      def parse(buffer)
+        # noop
         buffer.to_s
-			end
-			
-			def dump(object)
-				# noop
+      end
+
+      def dump(object)
+        # noop
         object.to_s
-			end
+      end
     end
   end
-end
+end

data/lib/discorb/integration.rb

@@ -80,7 +80,7 @@ module Discorb
       @enable_emoticons = data[:enable_emoticons]
       @expire_behavior = self.class.expire_behavior[data[:expire_behavior]]
       @expire_grace_period = data[:expire_grace_period]
-      @user = client.users[data[:user].to_i]
+      @user = @client.users[data[:user].to_i]
       @account = Account.new(data[:account])
       @subscriber_count = data[:subscriber_count]
       @revoked = data[:revoked]

data/lib/discorb/interaction.rb

@@ -100,6 +100,9 @@ module Discorb
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       def defer_source(ephemeral: false)
@@ -117,6 +120,9 @@ module Discorb
       #
       # Response with `CHANNEL_MESSAGE_WITH_SOURCE`(`4`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
       # @param [Discorb::Embed] embed The embed to send.
@@ -126,45 +132,48 @@ module Discorb
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
-        payload = {}
-        payload[:content] = content if content
-        payload[:tts] = tts
-        tmp_embed = if embed
-            [embed]
-          elsif embeds
-            embeds
-          end
-        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
+        Async do
+          payload = {}
+          payload[:content] = content if content
+          payload[:tts] = tts
+          tmp_embed = if embed
+              [embed]
+            elsif embeds
+              embeds
+            end
+          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[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
           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[:flags] = (ephemeral ? 1 << 6 : 0)
-        if @responded
-          @client.http.post("/webhooks/#{@id}/#{@token}", { type: 4, data: payload }).wait
-        elsif @defered
-          @client.http.post("/interactions/#{@id}/#{@token}/@original/edit", { type: 4, data: payload }).wait
-        else
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+          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
+          @responded = true
         end
-        @responded = true
       end
     end
 
@@ -191,6 +200,9 @@ module Discorb
       #
       # Response with `UPDATE_MESSAGE`(`7`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
       # @param [Discorb::Embed] embed The embed to send.
@@ -200,38 +212,40 @@ module Discorb
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       def edit(content, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
-        payload = {}
-        payload[:content] = content if content
-        payload[:tts] = tts
-        tmp_embed = if embed
-            [embed]
-          elsif embeds
-            embeds
-          end
-        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
+        Async do
+          payload = {}
+          payload[:content] = content if content
+          payload[:tts] = tts
+          tmp_embed = if embed
+              [embed]
+            elsif embeds
+              embeds
+            end
+          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[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
           end
-          tmp_components << tmp_row
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
+          payload[:flags] = (ephemeral ? 1 << 6 : 0)
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
         end
-        payload[:flags] = (ephemeral ? 1 << 6 : 0)
-        @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
       end
     end
 

data/lib/discorb/member.rb

@@ -59,6 +59,8 @@ module Discorb
     # @!attribute [r] status
     #   @macro client_cache
     #   @return [Symbol] The status of the member. It's from the {#presence}.
+    # @!attribute [r] owner?
+    #   @return [Boolean] Whether the member is the owner of the guild.
 
     # @!visibility private
     def initialize(client, guild_id, user_data, member_data)
@@ -99,18 +101,27 @@ module Discorb
       guild.voice_states[@id]
     end
 
+    def owner?
+      guild.owner_id == @id
+    end
+
     def guild
       @client.guilds[@guild_id]
     end
 
     def roles
-      @role_ids.map { |r| guild.roles[r] }.sort_by(&:position)
+      @role_ids.map { |r| guild.roles[r] }.sort_by(&:position).reverse + [guild.roles[guild.id]]
     end
 
     def permissions
+      if owner?
+        return Permission.new((1 << 38) - 1)
+      end
       roles.map(&:permissions).sum(Permission.new(0))
     end
 
+    alias guild_permissions permissions
+
     def hoisted_role
       @hoisted_role_id && guild.roles[@hoisted_role_id]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.6
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async