discorb 0.13.2 → 0.15.0

data/lib/discorb/guild.rb

@@ -168,7 +168,7 @@ module Discorb
     #
     def leave!
       Async do
-        @client.http.delete("/users/@me/guilds/#{@id}").wait
+        @client.http.request(Route.new("/users/@me/guilds/#{@id}", "//users/@me/guilds/:guild_id", :delete)).wait
         @client.guilds.delete(@id)
       end
     end
@@ -184,7 +184,7 @@ module Discorb
     #
     def fetch_scheduled_events(with_user_count: true)
       Async do
-        _resp, events = @client.http.get("/guilds/#{@id}/scheduled-events?with_user_count=#{with_user_count}").wait
+        _resp, events = @client.http.request(Route.new("/guilds/#{@id}/scheduled-events?with_user_count=#{with_user_count}", "//guilds/:guild_id/scheduled-events", :get)).wait
         @scheduled_events = events.map { |e| ScheduledEvent.new(@client, e) }
       end
     end
@@ -200,7 +200,7 @@ module Discorb
     #
     def fetch_scheduled_event(id)
       Async do
-        _resp, event = @client.http.get("/guilds/#{@id}/scheduled-events/#{id}").wait
+        _resp, event = @client.http.request(Route.new("/guilds/#{@id}/scheduled-events/#{id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :get)).wait
       rescue Discorb::NotFoundError
         return nil
       else
@@ -274,7 +274,7 @@ module Discorb
           else
             raise ArgumentError, "Invalid scheduled event type: #{type}"
           end
-        _resp, event = @client.http.post("/guilds/#{@id}/scheduled-events", payload).wait
+        _resp, event = @client.http.request(Route.new("/guilds/#{@id}/scheduled-events", "//guilds/:guild_id/scheduled-events", :post), payload).wait
         Discorb::ScheduledEvent.new(@client, event)
       end
     end
@@ -288,7 +288,7 @@ module Discorb
     #
     def fetch_emoji_list
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/emojis").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/emojis", "//guilds/:guild_id/emojis", :get)).wait
         @emojis = Dictionary.new
         ids = @emojis.map(&:id).map(&:to_s)
         data.map do |e|
@@ -312,7 +312,7 @@ module Discorb
     # @return [Async::Task<Discorb::CustomEmoji>] The emoji with the given id.
     #
     def fetch_emoji(id)
-      _resp, data = @client.http.get("/guilds/#{@id}/emojis/#{id}").wait
+      _resp, data = @client.http.request(Route.new("/guilds/#{@id}/emojis/#{id}", "//guilds/:guild_id/emojis/:emoji_id", :get)).wait
       @emojis[e[:id]] = CustomEmoji.new(@client, self, data)
     end
 
@@ -327,14 +327,12 @@ module Discorb
     # @return [Async::Task<Discorb::CustomEmoji>] The created emoji.
     #
     def create_emoji(name, image, roles: [])
-      _resp, data = @client.http.post(
-        "/guilds/#{@id}/emojis",
-        {
-          name: name,
-          image: image.to_s,
-          roles: roles.map { |r| Discorb::Utils.try(r, :id) },
-        }
-      ).wait
+      _resp, data = @client.http.request(Route.new("/guilds/#{@id}/emojis", "//guilds/:guild_id/emojis", :post),
+                                         {
+        name: name,
+        image: image.to_s,
+        roles: roles.map { |r| Discorb::Utils.try(r, :id) },
+      }).wait
       @emojis[data[:id]] = CustomEmoji.new(@client, self, data)
     end
 
@@ -346,7 +344,7 @@ module Discorb
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/webhooks").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/webhooks", "//guilds/:guild_id/webhooks", :get)).wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
@@ -359,7 +357,7 @@ module Discorb
     #
     def fetch_audit_log
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/audit-logs").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/audit-logs", "//guilds/:guild_id/audit-logs", :get)).wait
         AuditLog.new(@client, data, self)
       end
     end
@@ -372,7 +370,7 @@ module Discorb
     #
     def fetch_channels
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/channels").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :get)).wait
         data.map { |c| Channel.make_channel(@client, c) }
       end
     end
@@ -415,9 +413,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent.id if parent
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :post), payload, audit_log_reason: reason).wait
         payload[:parent_id] = parent&.id
         Channel.make_channel(@client, data)
       end
@@ -457,9 +453,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent.id if parent
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :post), payload, audit_log_reason: reason).wait
         payload[:parent_id] = parent&.id
         Channel.make_channel(@client, data)
       end
@@ -492,9 +486,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent&.id
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :post), payload, audit_log_reason: reason).wait
         Channel.make_channel(@client, data)
       end
     end
@@ -531,9 +523,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent&.id
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :post), payload, audit_log_reason: reason).wait
         Channel.make_channel(@client, data)
       end
     end
@@ -576,9 +566,7 @@ module Discorb
         end
         payload[:nsfw] = nsfw unless nsfw.nil?
         payload[:parent_id] = parent&.id
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/channels", "//guilds/:guild_id/channels", :post), payload, audit_log_reason: reason).wait
         Channel.make_channel(@client, data)
       end
     end
@@ -591,7 +579,7 @@ module Discorb
     #
     def fetch_active_threads
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/threads/active").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/threads/active", "//guilds/:guild_id/threads/active", :get)).wait
         data[:threads].map { |t| Channel.make_thread(@client, t) }
       end
     end
@@ -607,7 +595,7 @@ module Discorb
     #
     def fetch_member(id)
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/members/#{id}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members/#{id}", "//guilds/:guild_id/members/:user_id", :get)).wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -626,20 +614,18 @@ module Discorb
     #
     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
+        unless limit.zero?
+          _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members?#{URI.encode_www_form({ after: after, limit: limit })}", "//guilds/:guild_id/members", :get)).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
+          _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members?#{URI.encode_www_form(params)}", "//guilds/:guild_id/members", :get)).wait
           ret += data.map { |m| Member.new(@client, @id, m[:user], m) }
           after = data.last[:user][:id]
-          if data.length != 1000
-            break
-          end
+          break if data.length != 1000
         end
         ret
       end
@@ -658,7 +644,7 @@ module Discorb
     #
     def fetch_members_named(name, limit: 1)
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/members/search?#{URI.encode_www_form({ query: name, limit: limit })}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members/search?#{URI.encode_www_form({ query: name, limit: limit })}", "//guilds/:guild_id/members/search", :get)).wait
         data.map { |d| Member.new(@client, @id, d[:user], d) }
       end
     end
@@ -687,7 +673,7 @@ module Discorb
     #
     def edit_nickname(nickname, reason: nil)
       Async do
-        @client.http.patch("/guilds/#{@id}/members/@me/nick", { nick: nickname }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@id}/members/@me/nick", "//guilds/:guild_id/members/@me/nick", :patch), { nick: nickname }, audit_log_reason: reason).wait
       end
     end
 
@@ -706,7 +692,7 @@ module Discorb
     #
     def kick_member(member, reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@id}/members/#{member.id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@id}/members/#{member.id}", "//guilds/:guild_id/members/:user_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -718,7 +704,7 @@ module Discorb
     #
     def fetch_bans
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/bans").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/bans", "//guilds/:guild_id/bans", :get)).wait
         data.map { |d| Ban.new(@client, self, d) }
       end
     end
@@ -734,7 +720,7 @@ module Discorb
     #
     def fetch_ban(user)
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/bans/#{user.id}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/bans/#{user.id}", "//guilds/:guild_id/bans/:user_id", :get)).wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -768,9 +754,7 @@ module Discorb
     #
     def ban_member(member, delete_message_days: 0, reason: nil)
       Async do
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/bans", { user: member.id, delete_message_days: delete_message_days }, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/bans", "//guilds/:guild_id/bans", :post), { user: member.id, delete_message_days: delete_message_days }, audit_log_reason: reason).wait
         Ban.new(@client, self, data)
       end
     end
@@ -786,7 +770,7 @@ module Discorb
     #
     def unban_user(user, reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@id}/bans/#{user.id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@id}/bans/#{user.id}", "//guilds/:guild_id/bans/:user_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -798,7 +782,7 @@ module Discorb
     #
     def fetch_roles
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/roles").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/roles", "//guilds/:guild_id/roles", :get)).wait
         data.map { |d| Role.new(@client, self, d) }
       end
     end
@@ -822,9 +806,7 @@ module Discorb
         payload[:color] = color.to_i if color
         payload[:hoist] = hoist if hoist
         payload[:mentionable] = mentionable if mentionable
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/roles", payload, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/roles", "//guilds/:guild_id/roles", :post), payload, audit_log_reason: reason).wait
         Role.new(@client, self, data)
       end
     end
@@ -845,7 +827,7 @@ module Discorb
           include_roles: @id.to_s,
         }
         param[:include_roles] = roles.map(&:id).map(&:to_s).join(";") if roles.any?
-        _resp, data = @client.http.get("/guilds/#{@id}/prune?#{URI.encode_www_form(params)}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/prune?#{URI.encode_www_form(params)}", "//guilds/:guild_id/prune", :get)).wait
         data[:pruned]
       end
     end
@@ -862,9 +844,7 @@ module Discorb
     #
     def prune(days = 7, roles: [], reason: nil)
       Async do
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/prune", { days: days, roles: roles.map(&:id) }, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/prune", "//guilds/:guild_id/prune", :post), { days: days, roles: roles.map(&:id) }, audit_log_reason: reason).wait
         data[:pruned]
       end
     end
@@ -877,7 +857,7 @@ module Discorb
     #
     def fetch_voice_regions
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/voice").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/voice", "//guilds/:guild_id/voice", :get)).wait
         data.map { |d| VoiceRegion.new(@client, d) }
       end
     end
@@ -890,7 +870,7 @@ module Discorb
     #
     def fetch_invites
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/invites").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/invites", "//guilds/:guild_id/invites", :get)).wait
         data.map { |d| Invite.new(@client, d) }
       end
     end
@@ -903,7 +883,7 @@ module Discorb
     #
     def fetch_integrations
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/integrations").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/integrations", "//guilds/:guild_id/integrations", :get)).wait
         data.map { |d| Integration.new(@client, d) }
       end
     end
@@ -916,7 +896,7 @@ module Discorb
     #
     def fetch_widget
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/widget").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/widget", "//guilds/:guild_id/widget", :get)).wait
         Widget.new(@client, @id, data)
       end
     end
@@ -929,7 +909,7 @@ module Discorb
     #
     def fetch_vanity_invite
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/vanity-url").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/vanity-url", "//guilds/:guild_id/vanity-url", :get)).wait
         VanityInvite.new(@client, self, data)
       end
     end
@@ -942,7 +922,7 @@ module Discorb
     #
     def fetch_welcome_screen
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/welcome-screen").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/welcome-screen", "//guilds/:guild_id/welcome-screen", :get)).wait
         WelcomeScreen.new(@client, self, data)
       end
     end
@@ -955,7 +935,7 @@ module Discorb
     #
     def fetch_stickers
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/stickers").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/stickers", "//guilds/:guild_id/stickers", :get)).wait
         data.map { |d| Sticker::GuildSticker.new(@client, d) }
       end
     end
@@ -971,7 +951,7 @@ module Discorb
     #
     def fetch_sticker(id)
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/stickers/#{id}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/stickers/#{id}", "//guilds/:guild_id/stickers/:sticker_id", :get)).wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -987,7 +967,7 @@ module Discorb
     #
     def fetch_templates
       Async do
-        _resp, data = @client.http.get("/guilds/#{@id}/templates").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/templates", "//guilds/:guild_id/templates", :get)).wait
         data.map { |d| GuildTemplate.new(@client, d) }
       end
     end
@@ -1015,9 +995,7 @@ module Discorb
     #
     def create_template(name, description = nil, reason: nil)
       Async do
-        _resp, data = @client.http.post(
-          "/guilds/#{@id}/templates", { name: name, description: description }, audit_log_reason: reason,
-        ).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@id}/templates", "//guilds/:guild_id/templates", :post), { name: name, description: description }, audit_log_reason: reason).wait
         GuildTemplate.new(@client, data)
       end
     end
@@ -1097,7 +1075,7 @@ module Discorb
           payload = {}
           payload[:enabled] = enabled unless enabled.nil?
           payload[:channel_id] = channel.id if channel_id
-          @client.http.patch("/guilds/#{@guild_id}/widget", payload, audit_log_reason: reason).wait
+          @client.http.request(Route.new("/guilds/#{@guild_id}/widget", "//guilds/:guild_id/widget", :patch), payload, audit_log_reason: reason).wait
         end
       end
 
@@ -1119,7 +1097,7 @@ module Discorb
       def iframe(theme: "dark", width: 350, height: 500)
         [
           %(<iframe src="https://canary.discord.com/widget?id=#{@guild_id}&theme=#{theme}" width="#{width}" height="#{height}"),
-          %(allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>),
+          %(allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>)
         ].join
       end
     end
@@ -1172,9 +1150,9 @@ module Discorb
       @unavailable = false
       @name = data[:name]
       @members = Discorb::Dictionary.new
-      data[:members].each do |m|
-        Member.new(@client, @id, m[:user], m)
-      end if data[:members]
+      data[:members]&.each do |m|
+          Member.new(@client, @id, m[:user], m)
+        end
       @splash = data[:splash] && Asset.new(self, data[:splash], path: "splashes/#{@id}")
       @discovery_splash = data[:discovery_splash] && Asset.new(self, data[:discovery_splash], path: "discovery-splashes/#{@id}")
       @owner_id = data[:owner_id]
@@ -1220,13 +1198,13 @@ module Discorb
       tmp_channels = data[:channels].filter { |c| !c.key?(:thread_metadata) }.map do |c|
         Channel.make_channel(@client, c.merge({ guild_id: @id }))
       end
-      @channels = Dictionary.new(tmp_channels.map { |c| [c.id, c] }.to_h, sort: ->(c) { c[1].position })
-      @voice_states = Dictionary.new(data[:voice_states].map { |v| [Snowflake.new(v[:user_id]), VoiceState.new(@client, v.merge({ guild_id: @id }))] }.to_h)
+      @channels = Dictionary.new(tmp_channels.to_h { |c| [c.id, c] }, sort: ->(c) { c[1].position })
+      @voice_states = Dictionary.new(data[:voice_states].to_h { |v| [Snowflake.new(v[:user_id]), VoiceState.new(@client, v.merge({ guild_id: @id }))] })
       @threads = data[:threads] ? data[:threads].map { |t| Channel.make_channel(@client, t) } : []
-      @presences = Dictionary.new(data[:presences].map { |pr| [Snowflake.new(pr[:user][:id]), Presence.new(@client, pr)] }.to_h)
+      @presences = Dictionary.new(data[:presences].to_h { |pr| [Snowflake.new(pr[:user][:id]), Presence.new(@client, pr)] })
       @max_presences = data[:max_presences]
-      @stage_instances = Dictionary.new(data[:stage_instances].map { |s| [Snowflake.new(s[:id]), StageInstance.new(@client, s)] }.to_h)
-      @scheduled_events = Dictionary.new(data[:guild_scheduled_events].map { |s| [Snowflake.new(s[:id]), ScheduledEvent.new(@client, s)] }.to_h)
+      @stage_instances = Dictionary.new(data[:stage_instances].to_h { |s| [Snowflake.new(s[:id]), StageInstance.new(@client, s)] })
+      @scheduled_events = Dictionary.new(data[:guild_scheduled_events].to_h { |s| [Snowflake.new(s[:id]), ScheduledEvent.new(@client, s)] })
       @data.update(data)
     end
   end
@@ -1355,7 +1333,7 @@ module Discorb
           payload[:enabled] = enabled unless enabled == Discorb::Unset
           payload[:welcome_channels] = channels.map(&:to_hash) unless channels == Discorb::Unset
           payload[:description] = description unless description == Discorb::Unset
-          @client.http.patch("/guilds/#{@guild.id}/welcome-screen", payload, audit_log_reason: reason).wait
+          @client.http.request(Route.new("/guilds/#{@guild.id}/welcome-screen", "//guilds/:guild_id/welcome-screen", :patch), payload, audit_log_reason: reason).wait
         end
       end
     end

data/lib/discorb/guild_template.rb

@@ -58,7 +58,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name
         payload[:description] = description if description != Discorb::Unset
-        @client.http.patch("/guilds/#{@source_guild_id}/templates/#{@code}", payload).wait
+        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :patch), payload).wait
       end
     end
 
@@ -72,7 +72,7 @@ module Discorb
     #
     def update
       Async do
-        _resp, data = @client.http.put("/guilds/#{@source_guild_id}/templates/#{@code}").wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :put)).wait
         _set_data(data)
       end
     end
@@ -85,7 +85,7 @@ module Discorb
     #
     def delete!
       Async do
-        @client.http.delete("/guilds/#{@source_guild_id}/templates/#{@code}").wait
+        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :delete)).wait
       end
     end
 
@@ -187,9 +187,9 @@ module Discorb
           @nsfw = data[:nsfw]
           @rate_limit_per_user = data[:rate_limit_per_user]
           @parent_id = data[:parent_id]
-          @permission_overwrites = data[:permission_overwrites].map do |ow|
+          @permission_overwrites = data[:permission_overwrites].to_h do |ow|
             [Snowflake.new(ow[:id]), PermissionOverwrite.new(ow[:allow], ow[:deny])]
-          end.to_h
+          end
           @type = Discorb::Channel.descendants.find { |c| c.channel_type == data[:type] }
         end
       end