discordrb 3.3.0 → 3.4.3

data/lib/discordrb/api/server.rb

@@ -5,7 +5,7 @@ module Discordrb::API::Server
   module_function
 
   # Create a server
-  # https://discordapp.com/developers/docs/resources/guild#create-guild
+  # https://discord.com/developers/docs/resources/guild#create-guild
   def create(token, name, region = :'eu-central')
     Discordrb::API.request(
       :guilds,
@@ -19,19 +19,19 @@ module Discordrb::API::Server
   end
 
   # Get a server's data
-  # https://discordapp.com/developers/docs/resources/guild#get-guild
-  def resolve(token, server_id)
+  # https://discord.com/developers/docs/resources/guild#get-guild
+  def resolve(token, server_id, with_counts = nil)
     Discordrb::API.request(
       :guilds_sid,
       server_id,
       :get,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}#{'?with_counts=true' if with_counts}",
       Authorization: token
     )
   end
 
   # Update a server
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild
+  # https://discord.com/developers/docs/resources/guild#modify-guild
   def update(token, server_id, name, region, icon, afk_channel_id, afk_timeout, splash, default_message_notifications, verification_level, explicit_content_filter, system_channel_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid,
@@ -46,6 +46,7 @@ module Discordrb::API::Server
   end
 
   # Transfer server ownership
+  # https://discord.com/developers/docs/resources/guild#modify-guild
   def transfer_ownership(token, server_id, user_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid,
@@ -60,7 +61,7 @@ module Discordrb::API::Server
   end
 
   # Delete a server
-  # https://discordapp.com/developers/docs/resources/guild#delete-guild
+  # https://discord.com/developers/docs/resources/guild#delete-guild
   def delete(token, server_id)
     Discordrb::API.request(
       :guilds_sid,
@@ -72,7 +73,7 @@ module Discordrb::API::Server
   end
 
   # Get a server's channels list
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-channels
+  # https://discord.com/developers/docs/resources/guild#get-guild-channels
   def channels(token, server_id)
     Discordrb::API.request(
       :guilds_sid_channels,
@@ -84,14 +85,14 @@ module Discordrb::API::Server
   end
 
   # Create a channel
-  # https://discordapp.com/developers/docs/resources/guild#create-guild-channel
-  def create_channel(token, server_id, name, type, topic, bitrate, user_limit, permission_overwrites, parent_id, nsfw, rate_limit_per_user, reason = nil)
+  # https://discord.com/developers/docs/resources/guild#create-guild-channel
+  def create_channel(token, server_id, name, type, topic, bitrate, user_limit, permission_overwrites, parent_id, nsfw, rate_limit_per_user, position, reason = nil)
     Discordrb::API.request(
       :guilds_sid_channels,
       server_id,
       :post,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/channels",
-      { name: name, type: type, topic: topic, bitrate: bitrate, user_limit: user_limit, permission_overwrites: permission_overwrites, parent_id: parent_id, nsfw: nsfw, rate_limit_per_user: rate_limit_per_user }.to_json,
+      { name: name, type: type, topic: topic, bitrate: bitrate, user_limit: user_limit, permission_overwrites: permission_overwrites, parent_id: parent_id, nsfw: nsfw, rate_limit_per_user: rate_limit_per_user, position: position }.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
@@ -99,7 +100,7 @@ module Discordrb::API::Server
   end
 
   # Update a channels position
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-channel-positions
+  # https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
   def update_channel_positions(token, server_id, positions)
     Discordrb::API.request(
       :guilds_sid_channels,
@@ -113,7 +114,7 @@ module Discordrb::API::Server
   end
 
   # Get a member's data
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-member
+  # https://discord.com/developers/docs/resources/guild#get-guild-member
   def resolve_member(token, server_id, user_id)
     Discordrb::API.request(
       :guilds_sid_members_uid,
@@ -125,7 +126,7 @@ module Discordrb::API::Server
   end
 
   # Gets members from the server
-  # https://discordapp.com/developers/docs/resources/guild#list-guild-members
+  # https://discord.com/developers/docs/resources/guild#list-guild-members
   def resolve_members(token, server_id, limit, after = nil)
     Discordrb::API.request(
       :guilds_sid_members,
@@ -137,7 +138,7 @@ module Discordrb::API::Server
   end
 
   # Update a user properties
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-member
+  # https://discord.com/developers/docs/resources/guild#modify-guild-member
   def update_member(token, server_id, user_id, nick: nil, roles: nil, mute: nil, deaf: nil, channel_id: nil, reason: nil)
     Discordrb::API.request(
       :guilds_sid_members_uid,
@@ -149,7 +150,7 @@ module Discordrb::API::Server
         mute: mute,
         deaf: deaf,
         channel_id: channel_id
-      }.reject { |_, v| v.nil? }.to_json,
+      }.compact.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
@@ -157,7 +158,7 @@ module Discordrb::API::Server
   end
 
   # Remove user from server
-  # https://discordapp.com/developers/docs/resources/guild#remove-guild-member
+  # https://discord.com/developers/docs/resources/guild#remove-guild-member
   def remove_member(token, server_id, user_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_members_uid,
@@ -171,7 +172,7 @@ module Discordrb::API::Server
   end
 
   # Get a server's banned users
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-bans
+  # https://discord.com/developers/docs/resources/guild#get-guild-bans
   def bans(token, server_id)
     Discordrb::API.request(
       :guilds_sid_bans,
@@ -183,9 +184,9 @@ module Discordrb::API::Server
   end
 
   # Ban a user from a server and delete their messages from the last message_days days
-  # https://discordapp.com/developers/docs/resources/guild#create-guild-ban
+  # https://discord.com/developers/docs/resources/guild#create-guild-ban
   def ban_user(token, server_id, user_id, message_days, reason = nil)
-    reason = URI.encode(reason) if reason
+    reason = URI.encode_www_form_component(reason) if reason
     Discordrb::API.request(
       :guilds_sid_bans_uid,
       server_id,
@@ -197,7 +198,7 @@ module Discordrb::API::Server
   end
 
   # Unban a user from a server
-  # https://discordapp.com/developers/docs/resources/guild#remove-guild-ban
+  # https://discord.com/developers/docs/resources/guild#remove-guild-ban
   def unban_user(token, server_id, user_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_bans_uid,
@@ -210,7 +211,7 @@ module Discordrb::API::Server
   end
 
   # Get server roles
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-roles
+  # https://discord.com/developers/docs/resources/guild#get-guild-roles
   def roles(token, server_id)
     Discordrb::API.request(
       :guilds_sid_roles,
@@ -225,7 +226,7 @@ module Discordrb::API::Server
   # Permissions are the Discord defaults; allowed: invite creation, reading/sending messages,
   # sending TTS messages, embedding links, sending files, reading the history, mentioning everybody,
   # connecting to voice, speaking and voice activity (push-to-talk isn't mandatory)
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-roles
+  # https://discord.com/developers/docs/resources/guild#get-guild-roles
   def create_role(token, server_id, name, colour, hoist, mentionable, packed_permissions, reason = nil)
     Discordrb::API.request(
       :guilds_sid_roles,
@@ -243,7 +244,7 @@ module Discordrb::API::Server
   # Permissions are the Discord defaults; allowed: invite creation, reading/sending messages,
   # sending TTS messages, embedding links, sending files, reading the history, mentioning everybody,
   # connecting to voice, speaking and voice activity (push-to-talk isn't mandatory)
-  # https://discordapp.com/developers/docs/resources/guild#batch-modify-guild-role
+  # https://discord.com/developers/docs/resources/guild#batch-modify-guild-role
   def update_role(token, server_id, role_id, name, colour, hoist = false, mentionable = false, packed_permissions = 104_324_161, reason = nil)
     Discordrb::API.request(
       :guilds_sid_roles_rid,
@@ -258,7 +259,7 @@ module Discordrb::API::Server
   end
 
   # Update role positions
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-role-positions
+  # https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
   def update_role_positions(token, server_id, roles)
     Discordrb::API.request(
       :guilds_sid_roles,
@@ -272,7 +273,7 @@ module Discordrb::API::Server
   end
 
   # Delete a role
-  # https://discordapp.com/developers/docs/resources/guild#delete-guild-role
+  # https://discord.com/developers/docs/resources/guild#delete-guild-role
   def delete_role(token, server_id, role_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_roles_rid,
@@ -285,7 +286,7 @@ module Discordrb::API::Server
   end
 
   # Adds a single role to a member
-  # https://discordapp.com/developers/docs/resources/guild#add-guild-member-role
+  # https://discord.com/developers/docs/resources/guild#add-guild-member-role
   def add_member_role(token, server_id, user_id, role_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_members_uid_roles_rid,
@@ -299,7 +300,7 @@ module Discordrb::API::Server
   end
 
   # Removes a single role from a member
-  # https://discordapp.com/developers/docs/resources/guild#remove-guild-member-role
+  # https://discord.com/developers/docs/resources/guild#remove-guild-member-role
   def remove_member_role(token, server_id, user_id, role_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_members_uid_roles_rid,
@@ -312,7 +313,7 @@ module Discordrb::API::Server
   end
 
   # Get server prune count
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-prune-count
+  # https://discord.com/developers/docs/resources/guild#get-guild-prune-count
   def prune_count(token, server_id, days)
     Discordrb::API.request(
       :guilds_sid_prune,
@@ -324,7 +325,7 @@ module Discordrb::API::Server
   end
 
   # Begin server prune
-  # https://discordapp.com/developers/docs/resources/guild#begin-guild-prune
+  # https://discord.com/developers/docs/resources/guild#begin-guild-prune
   def begin_prune(token, server_id, days, reason = nil)
     Discordrb::API.request(
       :guilds_sid_prune,
@@ -338,7 +339,7 @@ module Discordrb::API::Server
   end
 
   # Get invites from server
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-invites
+  # https://discord.com/developers/docs/resources/guild#get-guild-invites
   def invites(token, server_id)
     Discordrb::API.request(
       :guilds_sid_invites,
@@ -350,19 +351,19 @@ module Discordrb::API::Server
   end
 
   # Gets a server's audit logs
-  # https://discordapp.com/developers/docs/resources/audit-log#get-guild-audit-log
-  def audit_logs(token, server_id, limit, userid = nil, actiontype = nil, before = nil)
+  # https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
+  def audit_logs(token, server_id, limit, user_id = nil, action_type = nil, before = nil)
     Discordrb::API.request(
       :guilds_sid_auditlogs,
       server_id,
       :get,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/audit-logs?limit=#{limit}#{"&user_id=#{userid}" if userid}#{"&action_type=#{actiontype}" if actiontype}#{"&before=#{before}" if before}",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/audit-logs?limit=#{limit}#{"&user_id=#{user_id}" if user_id}#{"&action_type=#{action_type}" if action_type}#{"&before=#{before}" if before}",
       Authorization: token
     )
   end
 
   # Get server integrations
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-integrations
+  # https://discord.com/developers/docs/resources/guild#get-guild-integrations
   def integrations(token, server_id)
     Discordrb::API.request(
       :guilds_sid_integrations,
@@ -375,19 +376,20 @@ module Discordrb::API::Server
 
   # Create a server integration
   # https://discordapp.com/developers/docs/resources/guild#create-guild-integration
-  def create_integration(token, server_id, type, id)
+  def create_integration(token, server_id, type, id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_integrations,
       server_id,
       :post,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/integrations",
       { type: type, id: id },
-      Authorization: token
+      Authorization: token,
+      'X-Audit-Log-Reason': reason
     )
   end
 
   # Update integration from server
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-integration
+  # https://discord.com/developers/docs/resources/guild#modify-guild-integration
   def update_integration(token, server_id, integration_id, expire_behavior, expire_grace_period, enable_emoticons)
     Discordrb::API.request(
       :guilds_sid_integrations_iid,
@@ -402,18 +404,19 @@ module Discordrb::API::Server
 
   # Delete a server integration
   # https://discordapp.com/developers/docs/resources/guild#delete-guild-integration
-  def delete_integration(token, server_id, integration_id)
+  def delete_integration(token, server_id, integration_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_integrations_iid,
       server_id,
       :delete,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/integrations/#{integration_id}",
-      Authorization: token
+      Authorization: token,
+      'X-Audit-Log-Reason': reason
     )
   end
 
   # Sync an integration
-  # https://discordapp.com/developers/docs/resources/guild#sync-guild-integration
+  # https://discord.com/developers/docs/resources/guild#sync-guild-integration
   def sync_integration(token, server_id, integration_id)
     Discordrb::API.request(
       :guilds_sid_integrations_iid_sync,
@@ -426,7 +429,7 @@ module Discordrb::API::Server
   end
 
   # Retrieves a server's embed information
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-embed
+  # https://discord.com/developers/docs/resources/guild#get-guild-embed
   def embed(token, server_id)
     Discordrb::API.request(
       :guilds_sid_embed,
@@ -438,7 +441,7 @@ module Discordrb::API::Server
   end
 
   # Modify a server's embed settings
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-embed
+  # https://discord.com/developers/docs/resources/guild#modify-guild-embed
   def modify_embed(token, server_id, enabled, channel_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_embed,
@@ -452,28 +455,30 @@ module Discordrb::API::Server
     )
   end
 
-  # Adds a custom emoji
-  def add_emoji(token, server_id, image, name, reason = nil)
+  # Adds a custom emoji.
+  # https://discord.com/developers/docs/resources/emoji#create-guild-emoji
+  def add_emoji(token, server_id, image, name, roles = [], reason = nil)
     Discordrb::API.request(
       :guilds_sid_emojis,
       server_id,
       :post,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/emojis",
-      { image: image, name: name }.to_json,
+      { image: image, name: name, roles: roles }.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
     )
   end
 
-  # Changes an emoji name
-  def edit_emoji(token, server_id, emoji_id, name, reason = nil)
+  # Changes an emoji name and/or roles.
+  # https://discord.com/developers/docs/resources/emoji#modify-guild-emoji
+  def edit_emoji(token, server_id, emoji_id, name, roles = nil, reason = nil)
     Discordrb::API.request(
       :guilds_sid_emojis_eid,
       server_id,
       :patch,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/emojis/#{emoji_id}",
-      { name: name }.to_json,
+      { name: name, roles: roles }.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
@@ -481,6 +486,7 @@ module Discordrb::API::Server
   end
 
   # Deletes a custom emoji
+  # https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
   def delete_emoji(token, server_id, emoji_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_emojis_eid,
@@ -493,6 +499,7 @@ module Discordrb::API::Server
   end
 
   # Available voice regions for this server
+  # https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
   def regions(token, server_id)
     Discordrb::API.request(
       :guilds_sid_regions,
@@ -504,7 +511,7 @@ module Discordrb::API::Server
   end
 
   # Get server webhooks
-  # https://discordapp.com/developers/docs/resources/webhook#get-guild-webhooks
+  # https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
   def webhooks(token, server_id)
     Discordrb::API.request(
       :guilds_sid_webhooks,
@@ -516,7 +523,7 @@ module Discordrb::API::Server
   end
 
   # Adds a member to a server with an OAuth2 Bearer token that has been granted `guilds.join`
-  # https://discordapp.com/developers/docs/resources/guild#add-guild-member
+  # https://discord.com/developers/docs/resources/guild#add-guild-member
   def add_member(token, server_id, user_id, access_token, nick = nil, roles = [], mute = false, deaf = false)
     Discordrb::API.request(
       :guilds_sid_members_uid,

data/lib/discordrb/api/user.rb

@@ -5,7 +5,7 @@ module Discordrb::API::User
   module_function
 
   # Get user data
-  # https://discordapp.com/developers/docs/resources/user#get-user
+  # https://discord.com/developers/docs/resources/user#get-user
   def resolve(token, user_id)
     Discordrb::API.request(
       :users_uid,
@@ -17,7 +17,7 @@ module Discordrb::API::User
   end
 
   # Get profile data
-  # https://discordapp.com/developers/docs/resources/user#get-current-user
+  # https://discord.com/developers/docs/resources/user#get-current-user
   def profile(token)
     Discordrb::API.request(
       :users_me,
@@ -29,6 +29,7 @@ module Discordrb::API::User
   end
 
   # Change the current bot's nickname on a server
+  # https://discord.com/developers/docs/resources/user#modify-current-user
   def change_own_nickname(token, server_id, nick, reason = nil)
     Discordrb::API.request(
       :guilds_sid_members_me_nick,
@@ -43,7 +44,7 @@ module Discordrb::API::User
   end
 
   # Update user data
-  # https://discordapp.com/developers/docs/resources/user#modify-current-user
+  # https://discord.com/developers/docs/resources/user#modify-current-user
   def update_profile(token, email, password, new_username, avatar, new_password = nil)
     Discordrb::API.request(
       :users_me,
@@ -57,7 +58,7 @@ module Discordrb::API::User
   end
 
   # Get the servers a user is connected to
-  # https://discordapp.com/developers/docs/resources/user#get-current-user-guilds
+  # https://discord.com/developers/docs/resources/user#get-current-user-guilds
   def servers(token)
     Discordrb::API.request(
       :users_me_guilds,
@@ -69,7 +70,7 @@ module Discordrb::API::User
   end
 
   # Leave a server
-  # https://discordapp.com/developers/docs/resources/user#leave-guild
+  # https://discord.com/developers/docs/resources/user#leave-guild
   def leave_server(token, server_id)
     Discordrb::API.request(
       :users_me_guilds_sid,
@@ -81,7 +82,7 @@ module Discordrb::API::User
   end
 
   # Get the DMs for the current user
-  # https://discordapp.com/developers/docs/resources/user#get-user-dms
+  # https://discord.com/developers/docs/resources/user#get-user-dms
   def user_dms(token)
     Discordrb::API.request(
       :users_me_channels,
@@ -93,7 +94,7 @@ module Discordrb::API::User
   end
 
   # Create a DM to another user
-  # https://discordapp.com/developers/docs/resources/user#create-dm
+  # https://discord.com/developers/docs/resources/user#create-dm
   def create_pm(token, recipient_id)
     Discordrb::API.request(
       :users_me_channels,
@@ -107,7 +108,7 @@ module Discordrb::API::User
   end
 
   # Get information about a user's connections
-  # https://discordapp.com/developers/docs/resources/user#get-users-connections
+  # https://discord.com/developers/docs/resources/user#get-users-connections
   def connections(token)
     Discordrb::API.request(
       :users_me_connections,

data/lib/discordrb/api/webhook.rb

@@ -5,7 +5,7 @@ module Discordrb::API::Webhook
   module_function
 
   # Get a webhook
-  # https://discordapp.com/developers/docs/resources/webhook#get-webhook
+  # https://discord.com/developers/docs/resources/webhook#get-webhook
   def webhook(token, webhook_id)
     Discordrb::API.request(
       :webhooks_wid,
@@ -17,7 +17,7 @@ module Discordrb::API::Webhook
   end
 
   # Get a webhook via webhook token
-  # https://discordapp.com/developers/docs/resources/webhook#get-webhook-with-token
+  # https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
   def token_webhook(webhook_token, webhook_id)
     Discordrb::API.request(
       :webhooks_wid,
@@ -28,7 +28,7 @@ module Discordrb::API::Webhook
   end
 
   # Update a webhook
-  # https://discordapp.com/developers/docs/resources/webhook#modify-webhook
+  # https://discord.com/developers/docs/resources/webhook#modify-webhook
   def update_webhook(token, webhook_id, data, reason = nil)
     Discordrb::API.request(
       :webhooks_wid,
@@ -43,7 +43,7 @@ module Discordrb::API::Webhook
   end
 
   # Update a webhook via webhook token
-  # https://discordapp.com/developers/docs/resources/webhook#modify-webhook-with-token
+  # https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
   def token_update_webhook(webhook_token, webhook_id, data, reason = nil)
     Discordrb::API.request(
       :webhooks_wid,
@@ -57,7 +57,7 @@ module Discordrb::API::Webhook
   end
 
   # Deletes a webhook
-  # https://discordapp.com/developers/docs/resources/webhook#delete-webhook
+  # https://discord.com/developers/docs/resources/webhook#delete-webhook
   def delete_webhook(token, webhook_id, reason = nil)
     Discordrb::API.request(
       :webhooks_wid,
@@ -70,7 +70,7 @@ module Discordrb::API::Webhook
   end
 
   # Deletes a webhook via webhook token
-  # https://discordapp.com/developers/docs/resources/webhook#delete-webhook-with-token
+  # https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
   def token_delete_webhook(webhook_token, webhook_id, reason = nil)
     Discordrb::API.request(
       :webhooks_wid,

data/lib/discordrb/api.rb

@@ -9,10 +9,10 @@ require 'discordrb/errors'
 # List of methods representing endpoints in Discord's API
 module Discordrb::API
   # The base URL of the Discord REST API.
-  APIBASE = 'https://discordapp.com/api/v6'.freeze
+  APIBASE = 'https://discord.com/api/v6'
 
   # The URL of Discord's CDN
-  CDN_URL = 'https://cdn.discordapp.com'.freeze
+  CDN_URL = 'https://cdn.discordapp.com'
 
   module_function
 
@@ -31,12 +31,12 @@ module Discordrb::API
     @cdn_url || CDN_URL
   end
 
-  # @return [String] the bot name, previously specified using #bot_name=.
+  # @return [String] the bot name, previously specified using {.bot_name=}.
   def bot_name
     @bot_name
   end
 
-  # Sets the bot name to something.
+  # Sets the bot name to something. Used in {.user_agent}. For the bot's username, see {Profile#username=}.
   def bot_name=(value)
     @bot_name = value
   end
@@ -51,7 +51,7 @@ module Discordrb::API
   # Generate a user agent identifying this requester as discordrb.
   def user_agent
     # This particular string is required by the Discord devs.
-    required = "DiscordBot (https://github.com/meew0/discordrb, v#{Discordrb::VERSION})"
+    required = "DiscordBot (https://github.com/shardlab/discordrb, v#{Discordrb::VERSION})"
     @bot_name ||= ''
 
     "#{required} rest-client/#{RestClient::VERSION} #{RUBY_ENGINE}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} discordrb/#{Discordrb::VERSION} #{@bot_name}"
@@ -80,7 +80,7 @@ module Discordrb::API
   def raw_request(type, attributes)
     RestClient.send(type, *attributes)
   rescue RestClient::Forbidden => e
-    # HACK: for #request, dynamically inject restclient's response into NoPermission - this allows us to ratelimit
+    # HACK: for #request, dynamically inject restclient's response into NoPermission - this allows us to rate limit
     noprm = Discordrb::Errors::NoPermission.new
     noprm.define_singleton_method(:_rc_response) { e.response }
     raise noprm, "The bot doesn't have the required permission to do this!"
@@ -94,6 +94,9 @@ module Discordrb::API
     # Add a custom user agent
     attributes.last[:user_agent] = user_agent if attributes.last.is_a? Hash
 
+    # Specify RateLimit precision
+    attributes.last[:x_ratelimit_precision] = 'millisecond' if attributes.last.is_a?(Hash)
+
     # The most recent Discord rate limit requirements require the support of major parameters, where a particular route
     # and major parameter combination (*not* the HTTP method) uniquely identifies a RL bucket.
     key = [key, major_parameter].freeze
@@ -149,17 +152,12 @@ module Discordrb::API
     response
   end
 
-  # Handles premeptive ratelimiting by waiting the given mutex by the difference of the Date header to the
+  # Handles pre-emptive rate limiting by waiting the given mutex by the difference of the Date header to the
   # X-Ratelimit-Reset header, thus making sure we don't get 429'd in any subsequent requests.
   def handle_preemptive_rl(headers, mutex, key)
     Discordrb::LOGGER.ratelimit "RL bucket depletion detected! Date: #{headers[:date]} Reset: #{headers[:x_ratelimit_reset]}"
-
-    now = Time.rfc2822(headers[:date])
-    reset = Time.at(headers[:x_ratelimit_reset].to_i)
-
-    delta = reset - now
-
-    Discordrb::LOGGER.warn("Locking RL mutex (key: #{key}) for #{delta} seconds preemptively")
+    delta = headers[:x_ratelimit_reset_after].to_f
+    Discordrb::LOGGER.warn("Locking RL mutex (key: #{key}) for #{delta} seconds pre-emptively")
     sync_wait(delta, mutex)
   end
 
@@ -175,7 +173,7 @@ module Discordrb::API
     Discordrb::LOGGER.ratelimit("Trace (#{reason}):")
 
     caller.each do |str|
-      Discordrb::LOGGER.ratelimit(' ' + str)
+      Discordrb::LOGGER.ratelimit(" #{str}")
     end
   end
 
@@ -199,11 +197,26 @@ module Discordrb::API
     "#{cdn_url}/splashes/#{server_id}/#{splash_id}.#{format}"
   end
 
+  # Make a banner URL from server and banner IDs
+  def banner_url(server_id, banner_id, format = 'webp')
+    "#{cdn_url}/banners/#{server_id}/#{banner_id}.#{format}"
+  end
+
   # Make an emoji icon URL from emoji ID
   def emoji_icon_url(emoji_id, format = 'webp')
     "#{cdn_url}/emojis/#{emoji_id}.#{format}"
   end
 
+  # Make an asset URL from application and asset IDs
+  def asset_url(application_id, asset_id, format = 'webp')
+    "#{cdn_url}/app-assets/#{application_id}/#{asset_id}.#{format}"
+  end
+
+  # Make an achievement icon URL from application ID, achievement ID, and icon hash
+  def achievement_icon_url(application_id, achievement_id, icon_hash, format = 'webp')
+    "#{cdn_url}/app-assets/#{application_id}/achievements/#{achievement_id}/icons/#{icon_hash}.#{format}"
+  end
+
   # Login to the server
   def login(email, password)
     request(
@@ -290,6 +303,18 @@ module Discordrb::API
     )
   end
 
+  # Get the gateway to be used, with additional information for sharding and
+  # session start limits
+  def gateway_bot(token)
+    request(
+      :gateway_bot,
+      nil,
+      :get,
+      "#{api_base}/gateway/bot",
+      Authorization: token
+    )
+  end
+
   # Validate a token (this request will fail if the token is invalid)
   def validate_token(token)
     request(

data/lib/discordrb/await.rb

@@ -43,7 +43,6 @@ module Discordrb
       dummy_handler = EventContainer.handler_class(@type).new(@attributes, @bot)
       return [nil, nil] unless event.instance_of?(@type) && dummy_handler.matches?(event)
 
-      should_delete = nil
       should_delete = true if (@block && @block.call(event) != false) || !@block
 
       [@key, should_delete]