discordrb 3.3.0 → 3.5.0

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,20 +126,22 @@ 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)
+    query_string = URI.encode_www_form({ limit: limit, after: after }.compact)
     Discordrb::API.request(
       :guilds_sid_members,
       server_id,
       :get,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/members?limit=#{limit}#{"&after=#{after}" if after}",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/members?#{query_string}",
       Authorization: token
     )
   end
 
   # Update a user properties
-  # https://discordapp.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)
+  # https://discord.com/developers/docs/resources/guild#modify-guild-member
+  def update_member(token, server_id, user_id, nick: :undef, roles: :undef, mute: :undef, deaf: :undef, channel_id: :undef,
+                    communication_disabled_until: :undef, reason: nil)
     Discordrb::API.request(
       :guilds_sid_members_uid,
       server_id,
@@ -148,8 +151,9 @@ module Discordrb::API::Server
         nick: nick,
         mute: mute,
         deaf: deaf,
-        channel_id: channel_id
-      }.reject { |_, v| v.nil? }.to_json,
+        channel_id: channel_id,
+        communication_disabled_until: communication_disabled_until
+      }.reject { |_, v| v == :undef }.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
@@ -157,7 +161,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,33 +175,34 @@ module Discordrb::API::Server
   end
 
   # Get a server's banned users
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-bans
-  def bans(token, server_id)
+  # https://discord.com/developers/docs/resources/guild#get-guild-bans
+  def bans(token, server_id, limit = nil, before = nil, after = nil)
+    query_string = URI.encode_www_form({ limit: limit, before: before, after: after }.compact)
     Discordrb::API.request(
       :guilds_sid_bans,
       server_id,
       :get,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/bans",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/bans?#{query_string}",
       Authorization: token
     )
   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,
       :put,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/bans/#{user_id}?delete-message-days=#{message_days}&reason=#{reason}",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/bans/#{user_id}?delete_message_days=#{message_days}&reason=#{reason}",
       nil,
       Authorization: token
     )
   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 +215,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 +230,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,14 +248,29 @@ 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
-  def update_role(token, server_id, role_id, name, colour, hoist = false, mentionable = false, packed_permissions = 104_324_161, reason = nil)
+  # https://discord.com/developers/docs/resources/guild#batch-modify-guild-role
+  # @param icon [:undef, File]
+  def update_role(token, server_id, role_id, name, colour, hoist = false, mentionable = false, packed_permissions = 104_324_161, reason = nil, icon = :undef)
+    data = { color: colour, name: name, hoist: hoist, mentionable: mentionable, permissions: packed_permissions }
+
+    if icon != :undef && icon
+      path_method = %i[original_filename path local_path].find { |meth| icon.respond_to?(meth) }
+
+      raise ArgumentError, 'File object must respond to original_filename, path, or local path.' unless path_method
+      raise ArgumentError, 'File must respond to read' unless icon.respond_to? :read
+
+      mime_type = MIME::Types.type_for(icon.__send__(path_method)).first&.to_s || 'image/jpeg'
+      data[:icon] = "data:#{mime_type};base64,#{Base64.encode64(icon.read).strip}"
+    elsif icon.nil?
+      data[:icon] = nil
+    end
+
     Discordrb::API.request(
       :guilds_sid_roles_rid,
       server_id,
       :patch,
       "#{Discordrb::API.api_base}/guilds/#{server_id}/roles/#{role_id}",
-      { color: colour, name: name, hoist: hoist, mentionable: mentionable, permissions: packed_permissions }.to_json,
+      data.to_json,
       Authorization: token,
       content_type: :json,
       'X-Audit-Log-Reason': reason
@@ -258,7 +278,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 +292,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 +305,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 +319,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 +332,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 +344,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 +358,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 +370,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,
@@ -374,20 +394,21 @@ module Discordrb::API::Server
   end
 
   # Create a server integration
-  # https://discordapp.com/developers/docs/resources/guild#create-guild-integration
-  def create_integration(token, server_id, type, id)
+  # https://discord.com/developers/docs/resources/guild#create-guild-integration
+  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,
@@ -401,19 +422,20 @@ module Discordrb::API::Server
   end
 
   # Delete a server integration
-  # https://discordapp.com/developers/docs/resources/guild#delete-guild-integration
-  def delete_integration(token, server_id, integration_id)
+  # https://discord.com/developers/docs/resources/guild#delete-guild-integration
+  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,
@@ -425,55 +447,59 @@ module Discordrb::API::Server
     )
   end
 
-  # Retrieves a server's embed information
-  # https://discordapp.com/developers/docs/resources/guild#get-guild-embed
-  def embed(token, server_id)
+  # Retrieves a server's widget information
+  # https://discord.com/developers/docs/resources/guild#get-guild-widget
+  def widget(token, server_id)
     Discordrb::API.request(
       :guilds_sid_embed,
       server_id,
       :get,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/embed",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/widget",
       Authorization: token
     )
   end
+  alias embed widget
 
-  # Modify a server's embed settings
-  # https://discordapp.com/developers/docs/resources/guild#modify-guild-embed
-  def modify_embed(token, server_id, enabled, channel_id, reason = nil)
+  # Modify a server's widget settings
+  # https://discord.com/developers/docs/resources/guild#modify-guild-widget
+  def modify_widget(token, server_id, enabled, channel_id, reason = nil)
     Discordrb::API.request(
       :guilds_sid_embed,
       server_id,
       :patch,
-      "#{Discordrb::API.api_base}/guilds/#{server_id}/embed",
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/widget",
       { enabled: enabled, channel_id: channel_id }.to_json,
       Authorization: token,
       'X-Audit-Log-Reason': reason,
       content_type: :json
     )
   end
+  alias modify_embed modify_widget
 
-  # 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 +507,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 +520,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 +532,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 +544,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,
@@ -131,9 +132,14 @@ module Discordrb::API::User
     )
   end
 
-  # Returns one of the "default" discord avatars from the CDN given a discriminator
-  def default_avatar(discrim = 0)
-    index = discrim.to_i % 5
+  # Returns one of the "default" discord avatars from the CDN given a discriminator or id since new usernames
+  # TODO: Maybe change this method again after discriminator removal ?
+  def default_avatar(discrim_id = 0, legacy: false)
+    index = if legacy
+              discrim_id.to_i % 5
+            else
+              (discrim_id.to_i >> 22) % 5
+            end
     "#{Discordrb::API.cdn_url}/embed/avatars/#{index}.png"
   end