discorb 0.7.1 → 0.8.0

data/lib/discorb/guild.rb

@@ -502,7 +502,6 @@ module Discorb
     # Fetch a member in the guild.
     # @macro async
     # @macro http
-    # @macro members_intent
     #
     # @param [#to_s] id The ID of the member to fetch.
     #
@@ -519,6 +518,39 @@ module Discorb
       end
     end
 
+    # Fetch members in the guild.
+    # @macro async
+    # @macro http
+    # @macro members_intent
+    #
+    # @param [Integer] limit The maximum number of members to fetch, 0 for all.
+    # @param [Integer] after The ID of the member to start fetching after.
+    #
+    # @return [Async::Task<Array<Discorb::Member>>] The list of members.
+    #
+    def fetch_members(limit: 0, after: nil)
+      Async do
+        unless limit == 0
+          _resp, data = @client.http.get("/guilds/#{@id}/members?#{URI.encode_www_form({ after: after, limit: limit })}").wait
+          next data[:members].map { |m| Member.new(@client, @id, m[:user], m) }
+        end
+        ret = []
+        after = 0
+        loop do
+          params = { after: after, limit: 100 }
+          _resp, data = @client.http.get("/guilds/#{@id}/members?#{URI.encode_www_form(params)}").wait
+          ret += data.map { |m| Member.new(@client, @id, m[:user], m) }
+          after = data.last[:user][:id]
+          if data.length != 1000
+            break
+          end
+        end
+        ret
+      end
+    end
+
+    alias fetch_member_list fetch_members
+
     #
     # Search for members by name in the guild.
     # @macro async

data/lib/discorb/http.rb

@@ -242,12 +242,13 @@ module Discorb
         else
           API_BASE_URL + path
         end
-      URI(full_path).path
+      uri = URI(full_path)
+      full_path.sub(uri.scheme + "://" + uri.host, "")
     end
 
     def get_response_data(resp)
-      if resp["Via"].nil?
-        raise CloudFlareBanError.new(@client, resp)
+      if resp["Via"].nil? && resp.code == "429"
+        raise CloudFlareBanError.new(resp, @client)
       end
       rd = resp.body
       if rd.nil? || rd.empty?

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/intents.rb

@@ -82,7 +82,7 @@ module Discorb
       if @raw_value.key?(name)
         @raw_value[name]
       elsif name.end_with?("=") && @raw_value.key?(name[0..-2].to_sym)
-        raise ArgumentError, "true/false expected" if (!args.is_a? TrueClass) || args.is_a?(FalseClass)
+        raise ArgumentError, "true/false expected" unless args.is_a? TrueClass or args.is_a?(FalseClass)
 
         @raw_value[name[0..-2].to_sym] = args
       else
@@ -108,6 +108,10 @@ module Discorb
       "#<#{self.class} value=#{value}>"
     end
 
+    def to_h
+      @raw_value
+    end
+
     class << self
       # Create new intent object from raw value.
       # @param value [Integer] The value of the intent.
@@ -121,12 +125,12 @@ module Discorb
 
       # Create new intent object with default values.
       def default
-        from_value(32_509)
+        from_value(32509)
       end
 
       # Create new intent object with all intents.
       def all
-        from_value(32_767)
+        from_value(32767)
       end
 
       # Create new intent object with no intents.

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

data/po/yard.pot

@@ -203,7 +203,7 @@ msgid "client = Discorb::Client.new"
 msgstr ""
 
 #: ../README.md:35
-msgid "client.once :ready do\n"
+msgid "client.once :standby do\n"
 "  puts \"Logged in as #{client.user}\"\n"
 "end"
 msgstr ""