discordrb 3.3.0 → 3.4.0

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'
+
     # 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/api/channel.rb

@@ -5,7 +5,7 @@ module Discordrb::API::Channel
   module_function
 
   # Get a channel's data
-  # https://discordapp.com/developers/docs/resources/channel#get-channel
+  # https://discord.com/developers/docs/resources/channel#get-channel
   def resolve(token, channel_id)
     Discordrb::API.request(
       :channels_cid,
@@ -17,7 +17,7 @@ module Discordrb::API::Channel
   end
 
   # Update a channel's data
-  # https://discordapp.com/developers/docs/resources/channel#modify-channel
+  # https://discord.com/developers/docs/resources/channel#modify-channel
   def update(token, channel_id, name, topic, position, bitrate, user_limit, nsfw, permission_overwrites = nil, parent_id = nil, rate_limit_per_user = nil, reason = nil)
     data = { name: name, position: position, topic: topic, bitrate: bitrate, user_limit: user_limit, nsfw: nsfw, parent_id: parent_id, rate_limit_per_user: rate_limit_per_user }
     data[:permission_overwrites] = permission_overwrites unless permission_overwrites.nil?
@@ -34,7 +34,7 @@ module Discordrb::API::Channel
   end
 
   # Delete a channel
-  # https://discordapp.com/developers/docs/resources/channel#deleteclose-channel
+  # https://discord.com/developers/docs/resources/channel#deleteclose-channel
   def delete(token, channel_id, reason = nil)
     Discordrb::API.request(
       :channels_cid,
@@ -47,7 +47,7 @@ module Discordrb::API::Channel
   end
 
   # Get a list of messages from a channel's history
-  # https://discordapp.com/developers/docs/resources/channel#get-channel-messages
+  # https://discord.com/developers/docs/resources/channel#get-channel-messages
   def messages(token, channel_id, amount, before = nil, after = nil, around = nil)
     Discordrb::API.request(
       :channels_cid_messages,
@@ -59,7 +59,7 @@ module Discordrb::API::Channel
   end
 
   # Get a single message from a channel's history by id
-  # https://discordapp.com/developers/docs/resources/channel#get-channel-message
+  # https://discord.com/developers/docs/resources/channel#get-channel-message
   def message(token, channel_id, message_id)
     Discordrb::API.request(
       :channels_cid_messages_mid,
@@ -72,24 +72,37 @@ module Discordrb::API::Channel
 
   # Send a message to a channel
   # https://discordapp.com/developers/docs/resources/channel#create-message
-  def create_message(token, channel_id, message, tts = false, embed = nil, nonce = nil) # send message
+  # @param attachments [Array<File>, nil] Attachments to use with `attachment://` in embeds. See
+  #   https://discord.com/developers/docs/resources/channel#create-message-using-attachments-within-embeds
+  def create_message(token, channel_id, message, tts = false, embed = nil, nonce = nil, attachments = nil, allowed_mentions = nil, message_reference = nil)
+    body = { content: message, tts: tts, embed: embed, nonce: nonce, allowed_mentions: allowed_mentions, message_reference: message_reference }
+    body = if attachments
+             files = [*0...attachments.size].zip(attachments).to_h
+             { **files, payload_json: body.to_json }
+           else
+             body.to_json
+           end
+
+    headers = { Authorization: token }
+    headers[:content_type] = :json unless attachments
+
     Discordrb::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :post,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages",
-      { content: message, tts: tts, embed: embed, nonce: nonce }.to_json,
-      Authorization: token,
-      content_type: :json
+      body,
+      **headers
     )
   rescue RestClient::BadRequest => e
     parsed = JSON.parse(e.response.body)
-    raise Discordrb::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)" if parsed['content'] && parsed['content'].is_a?(Array) && parsed['content'].first == 'Must be 2000 or fewer in length.'
+    raise Discordrb::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)" if parsed['content'].is_a?(Array) && parsed['content'].first == 'Must be 2000 or fewer in length.'
+
     raise
   end
 
   # Send a file as a message to a channel
-  # https://discordapp.com/developers/docs/resources/channel#upload-file
+  # https://discord.com/developers/docs/resources/channel#upload-file
   def upload_file(token, channel_id, file, caption: nil, tts: false)
     Discordrb::API.request(
       :channels_cid_messages_mid,
@@ -102,7 +115,7 @@ module Discordrb::API::Channel
   end
 
   # Edit a message
-  # https://discordapp.com/developers/docs/resources/channel#edit-message
+  # https://discord.com/developers/docs/resources/channel#edit-message
   def edit_message(token, channel_id, message_id, message, mentions = [], embed = nil)
     Discordrb::API.request(
       :channels_cid_messages_mid,
@@ -117,19 +130,20 @@ module Discordrb::API::Channel
 
   # Delete a message
   # https://discordapp.com/developers/docs/resources/channel#delete-message
-  def delete_message(token, channel_id, message_id)
+  def delete_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :delete,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}",
-      Authorization: token
+      Authorization: token,
+      'X-Audit-Log-Reason': reason
     )
   end
 
   # Delete messages in bulk
   # https://discordapp.com/developers/docs/resources/channel#bulk-delete-messages
-  def bulk_delete_messages(token, channel_id, messages = [])
+  def bulk_delete_messages(token, channel_id, messages = [], reason = nil)
     Discordrb::API.request(
       :channels_cid_messages_bulk_delete,
       channel_id,
@@ -137,14 +151,15 @@ module Discordrb::API::Channel
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/bulk-delete",
       { messages: messages }.to_json,
       Authorization: token,
-      content_type: :json
+      content_type: :json,
+      'X-Audit-Log-Reason': reason
     )
   end
 
   # Create a reaction on a message using this client
-  # https://discordapp.com/developers/docs/resources/channel#create-reaction
+  # https://discord.com/developers/docs/resources/channel#create-reaction
   def create_reaction(token, channel_id, message_id, emoji)
-    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    emoji = URI.encode_www_form_component(emoji) unless emoji.ascii_only?
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions_emoji_me,
       channel_id,
@@ -157,9 +172,9 @@ module Discordrb::API::Channel
   end
 
   # Delete this client's own reaction on a message
-  # https://discordapp.com/developers/docs/resources/channel#delete-own-reaction
+  # https://discord.com/developers/docs/resources/channel#delete-own-reaction
   def delete_own_reaction(token, channel_id, message_id, emoji)
-    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    emoji = URI.encode_www_form_component(emoji) unless emoji.ascii_only?
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions_emoji_me,
       channel_id,
@@ -170,9 +185,9 @@ module Discordrb::API::Channel
   end
 
   # Delete another client's reaction on a message
-  # https://discordapp.com/developers/docs/resources/channel#delete-user-reaction
+  # https://discord.com/developers/docs/resources/channel#delete-user-reaction
   def delete_user_reaction(token, channel_id, message_id, emoji, user_id)
-    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    emoji = URI.encode_www_form_component(emoji) unless emoji.ascii_only?
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions_emoji_uid,
       channel_id,
@@ -183,20 +198,21 @@ module Discordrb::API::Channel
   end
 
   # Get a list of clients who reacted with a specific reaction on a message
-  # https://discordapp.com/developers/docs/resources/channel#get-reactions
-  def get_reactions(token, channel_id, message_id, emoji)
-    emoji = URI.encode(emoji) unless emoji.ascii_only?
+  # https://discord.com/developers/docs/resources/channel#get-reactions
+  def get_reactions(token, channel_id, message_id, emoji, before_id, after_id, limit = 100)
+    emoji = URI.encode_www_form_component(emoji) unless emoji.ascii_only?
+    query_string = "limit=#{limit}#{"&before=#{before_id}" if before_id}#{"&after=#{after_id}" if after_id}"
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions_emoji,
       channel_id,
       :get,
-      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}?#{query_string}",
       Authorization: token
     )
   end
 
   # Deletes all reactions on a message from all clients
-  # https://discordapp.com/developers/docs/resources/channel#delete-all-reactions
+  # https://discord.com/developers/docs/resources/channel#delete-all-reactions
   def delete_all_reactions(token, channel_id, message_id)
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions,
@@ -208,7 +224,7 @@ module Discordrb::API::Channel
   end
 
   # Update a channels permission for a role or member
-  # https://discordapp.com/developers/docs/resources/channel#edit-channel-permissions
+  # https://discord.com/developers/docs/resources/channel#edit-channel-permissions
   def update_permission(token, channel_id, overwrite_id, allow, deny, type, reason = nil)
     Discordrb::API.request(
       :channels_cid_permissions_oid,
@@ -223,7 +239,7 @@ module Discordrb::API::Channel
   end
 
   # Get a channel's invite list
-  # https://discordapp.com/developers/docs/resources/channel#get-channel-invites
+  # https://discord.com/developers/docs/resources/channel#get-channel-invites
   def invites(token, channel_id)
     Discordrb::API.request(
       :channels_cid_invites,
@@ -235,7 +251,7 @@ module Discordrb::API::Channel
   end
 
   # Create an instant invite from a server or a channel id
-  # https://discordapp.com/developers/docs/resources/channel#create-channel-invite
+  # https://discord.com/developers/docs/resources/channel#create-channel-invite
   def create_invite(token, channel_id, max_age = 0, max_uses = 0, temporary = false, unique = false, reason = nil)
     Discordrb::API.request(
       :channels_cid_invites,
@@ -250,7 +266,7 @@ module Discordrb::API::Channel
   end
 
   # Delete channel permission
-  # https://discordapp.com/developers/docs/resources/channel#delete-channel-permission
+  # https://discord.com/developers/docs/resources/channel#delete-channel-permission
   def delete_permission(token, channel_id, overwrite_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_permissions_oid,
@@ -263,7 +279,7 @@ module Discordrb::API::Channel
   end
 
   # Start typing (needs to be resent every 5 seconds to keep up the typing)
-  # https://discordapp.com/developers/docs/resources/channel#trigger-typing-indicator
+  # https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
   def start_typing(token, channel_id)
     Discordrb::API.request(
       :channels_cid_typing,
@@ -276,7 +292,7 @@ module Discordrb::API::Channel
   end
 
   # Get a list of pinned messages in a channel
-  # https://discordapp.com/developers/docs/resources/channel#get-pinned-messages
+  # https://discord.com/developers/docs/resources/channel#get-pinned-messages
   def pinned_messages(token, channel_id)
     Discordrb::API.request(
       :channels_cid_pins,
@@ -289,26 +305,28 @@ module Discordrb::API::Channel
 
   # Pin a message
   # https://discordapp.com/developers/docs/resources/channel#add-pinned-channel-message
-  def pin_message(token, channel_id, message_id)
+  def pin_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_pins_mid,
       channel_id,
       :put,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/pins/#{message_id}",
       nil,
-      Authorization: token
+      Authorization: token,
+      'X-Audit-Log-Reason': reason
     )
   end
 
   # Unpin a message
   # https://discordapp.com/developers/docs/resources/channel#delete-pinned-channel-message
-  def unpin_message(token, channel_id, message_id)
+  def unpin_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_pins_mid,
       channel_id,
       :delete,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/pins/#{message_id}",
-      Authorization: token
+      Authorization: token,
+      'X-Audit-Log-Reason': reason
     )
   end
 
@@ -382,7 +400,7 @@ module Discordrb::API::Channel
   end
 
   # Create a webhook
-  # https://discordapp.com/developers/docs/resources/webhook#create-webhook
+  # https://discord.com/developers/docs/resources/webhook#create-webhook
   def create_webhook(token, channel_id, name, avatar = nil, reason = nil)
     Discordrb::API.request(
       :channels_cid_webhooks,
@@ -397,7 +415,7 @@ module Discordrb::API::Channel
   end
 
   # Get channel webhooks
-  # https://discordapp.com/developers/docs/resources/webhook#get-channel-webhooks
+  # https://discord.com/developers/docs/resources/webhook#get-channel-webhooks
   def webhooks(token, channel_id)
     Discordrb::API.request(
       :channels_cid_webhooks,

data/lib/discordrb/api/invite.rb

@@ -5,7 +5,7 @@ module Discordrb::API::Invite
   module_function
 
   # Resolve an invite
-  # https://discordapp.com/developers/docs/resources/invite#get-invite
+  # https://discord.com/developers/docs/resources/invite#get-invite
   def resolve(token, invite_code, counts = true)
     Discordrb::API.request(
       :invite_code,
@@ -17,7 +17,7 @@ module Discordrb::API::Invite
   end
 
   # Delete an invite by code
-  # https://discordapp.com/developers/docs/resources/invite#delete-invite
+  # https://discord.com/developers/docs/resources/invite#delete-invite
   def delete(token, code, reason = nil)
     Discordrb::API.request(
       :invites_code,
@@ -30,7 +30,7 @@ module Discordrb::API::Invite
   end
 
   # Join a server using an invite
-  # https://discordapp.com/developers/docs/resources/invite#accept-invite
+  # https://discord.com/developers/docs/resources/invite#accept-invite
   def accept(token, invite_code)
     Discordrb::API.request(
       :invite_code,

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,
@@ -60,7 +60,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 +72,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 +84,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 +99,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 +113,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 +125,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 +137,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 +149,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 +157,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 +171,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 +183,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 +197,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 +210,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 +225,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 +243,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 +258,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 +272,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 +285,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 +299,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 +312,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 +324,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 +338,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 +350,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 +375,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 +403,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 +428,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 +440,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 +454,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 +485,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,
@@ -504,7 +509,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 +521,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,