discordrb 3.4.0 → 3.5.0

data/lib/discordrb/api/channel.rb

@@ -49,11 +49,12 @@ module Discordrb::API::Channel
   # Get a list of messages from a channel's history
   # https://discord.com/developers/docs/resources/channel#get-channel-messages
   def messages(token, channel_id, amount, before = nil, after = nil, around = nil)
+    query_string = URI.encode_www_form({ limit: amount, before: before, after: after, around: around }.compact)
     Discordrb::API.request(
       :channels_cid_messages,
       channel_id,
       :get,
-      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages?limit=#{amount}#{"&before=#{before}" if before}#{"&after=#{after}" if after}#{"&around=#{around}" if around}",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages?#{query_string}",
       Authorization: token
     )
   end
@@ -71,11 +72,11 @@ module Discordrb::API::Channel
   end
 
   # Send a message to a channel
-  # https://discordapp.com/developers/docs/resources/channel#create-message
+  # https://discord.com/developers/docs/resources/channel#create-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 }
+  def create_message(token, channel_id, message, tts = false, embeds = nil, nonce = nil, attachments = nil, allowed_mentions = nil, message_reference = nil, components = nil)
+    body = { content: message, tts: tts, embeds: embeds, nonce: nonce, allowed_mentions: allowed_mentions, message_reference: message_reference, components: components&.to_a }
     body = if attachments
              files = [*0...attachments.size].zip(attachments).to_h
              { **files, payload_json: body.to_json }
@@ -116,20 +117,20 @@ module Discordrb::API::Channel
 
   # Edit a message
   # https://discord.com/developers/docs/resources/channel#edit-message
-  def edit_message(token, channel_id, message_id, message, mentions = [], embed = nil)
+  def edit_message(token, channel_id, message_id, message, mentions = [], embeds = nil, components = nil)
     Discordrb::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :patch,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}",
-      { content: message, mentions: mentions, embed: embed }.to_json,
+      { content: message, mentions: mentions, embeds: embeds, components: components }.to_json,
       Authorization: token,
       content_type: :json
     )
   end
 
   # Delete a message
-  # https://discordapp.com/developers/docs/resources/channel#delete-message
+  # https://discord.com/developers/docs/resources/channel#delete-message
   def delete_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_messages_mid,
@@ -142,7 +143,7 @@ module Discordrb::API::Channel
   end
 
   # Delete messages in bulk
-  # https://discordapp.com/developers/docs/resources/channel#bulk-delete-messages
+  # https://discord.com/developers/docs/resources/channel#bulk-delete-messages
   def bulk_delete_messages(token, channel_id, messages = [], reason = nil)
     Discordrb::API.request(
       :channels_cid_messages_bulk_delete,
@@ -201,7 +202,7 @@ module Discordrb::API::Channel
   # 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}"
+    query_string = URI.encode_www_form({ limit: limit || 100, before: before_id, after: after_id }.compact)
     Discordrb::API.request(
       :channels_cid_messages_mid_reactions_emoji,
       channel_id,
@@ -223,6 +224,20 @@ module Discordrb::API::Channel
     )
   end
 
+  # Deletes all the reactions for a given emoji on a message
+  # https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
+  def delete_all_emoji_reactions(token, channel_id, message_id, emoji)
+    emoji = URI.encode_www_form_component(emoji) unless emoji.ascii_only?
+
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions_emoji,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}",
+      Authorization: token
+    )
+  end
+
   # Update a channels permission for a role or member
   # https://discord.com/developers/docs/resources/channel#edit-channel-permissions
   def update_permission(token, channel_id, overwrite_id, allow, deny, type, reason = nil)
@@ -304,7 +319,7 @@ module Discordrb::API::Channel
   end
 
   # Pin a message
-  # https://discordapp.com/developers/docs/resources/channel#add-pinned-channel-message
+  # https://discord.com/developers/docs/resources/channel#add-pinned-channel-message
   def pin_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_pins_mid,
@@ -318,7 +333,7 @@ module Discordrb::API::Channel
   end
 
   # Unpin a message
-  # https://discordapp.com/developers/docs/resources/channel#delete-pinned-channel-message
+  # https://discord.com/developers/docs/resources/channel#delete-pinned-channel-message
   def unpin_message(token, channel_id, message_id, reason = nil)
     Discordrb::API.request(
       :channels_cid_pins_mid,
@@ -331,6 +346,8 @@ module Discordrb::API::Channel
   end
 
   # Create an empty group channel.
+  # @deprecated Discord no longer supports bots in group DMs, this endpoint was repurposed and no longer works as implemented here.
+  # https://discord.com/developers/docs/resources/user#create-group-dm
   def create_empty_group(token, bot_user_id)
     Discordrb::API.request(
       :users_uid_channels,
@@ -344,6 +361,8 @@ module Discordrb::API::Channel
   end
 
   # Create a group channel.
+  # @deprecated Discord no longer supports bots in group DMs, this endpoint was repurposed and no longer works as implemented here.
+  # https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
   def create_group(token, pm_channel_id, user_id)
     Discordrb::API.request(
       :channels_cid_recipients_uid,
@@ -363,6 +382,8 @@ module Discordrb::API::Channel
   end
 
   # Add a user to a group channel.
+  # @deprecated Discord no longer supports bots in group DMs, this endpoint was repurposed and no longer works as implemented here.
+  # https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
   def add_group_user(token, group_channel_id, user_id)
     Discordrb::API.request(
       :channels_cid_recipients_uid,
@@ -376,6 +397,8 @@ module Discordrb::API::Channel
   end
 
   # Remove a user from a group channel.
+  # @deprecated Discord no longer supports bots in group DMs, this endpoint was repurposed and no longer works as implemented here.
+  # https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
   def remove_group_user(token, group_channel_id, user_id)
     Discordrb::API.request(
       :channels_cid_recipients_uid,
@@ -388,6 +411,8 @@ module Discordrb::API::Channel
   end
 
   # Leave a group channel.
+  # @deprecated Discord no longer supports bots in group DMs, this endpoint was repurposed and no longer works as implemented here.
+  # https://discord.com/developers/docs/resources/channel#deleteclose-channel
   def leave_group(token, group_channel_id)
     Discordrb::API.request(
       :channels_cid,
@@ -425,4 +450,150 @@ module Discordrb::API::Channel
       Authorization: token
     )
   end
+
+  # Start a thread based off a channel message.
+  # https://discord.com/developers/docs/resources/channel#start-thread-with-message
+  def start_thread_with_message(token, channel_id, message_id, name, auto_archive_duration)
+    Discordrb::API.request(
+      :channels_cid_messages_mid_threads,
+      channel_id,
+      :post,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/threads",
+      { name: name, auto_archive_duration: auto_archive_duration }.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Start a thread without an associated message.
+  # https://discord.com/developers/docs/resources/channel#start-thread-without-message
+  def start_thread_without_message(token, channel_id, name, auto_archive_duration, type = 11)
+    Discordrb::API.request(
+      :channels_cid_threads,
+      channel_id,
+      :post,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/threads",
+      { name: name, auto_archive_duration: auto_archive_duration, type: type },
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Add the current user to a thread.
+  # https://discord.com/developers/docs/resources/channel#join-thread
+  def join_thread(token, channel_id)
+    Discordrb::API.request(
+      :channels_cid_thread_members_me,
+      channel_id,
+      :put,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/thread-members/@me",
+      nil,
+      Authorization: token
+    )
+  end
+
+  # Add a user to a thread.
+  # https://discord.com/developers/docs/resources/channel#add-thread-member
+  def add_thread_member(token, channel_id, user_id)
+    Discordrb::API.request(
+      :channels_cid_thread_members_uid,
+      channel_id,
+      :put,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/thread-members/#{user_id}",
+      nil,
+      Authorization: token
+    )
+  end
+
+  # Remove the current user from a thread.
+  # https://discord.com/developers/docs/resources/channel#leave-thread
+  def leave_thread(token, channel_id)
+    Discordrb::API.request(
+      :channels_cid_thread_members_me,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/thread-members/#{user_id}",
+      Authorization: token
+    )
+  end
+
+  # Remove a user from a thread.
+  # https://discord.com/developers/docs/resources/channel#remove-thread-member
+  def remove_thread_member(token, channel_id, user_id)
+    Discordrb::API.request(
+      :channels_cid_thread_members_uid,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/thread-members/#{user_id}",
+      Authorization: token
+    )
+  end
+
+  # Get the members of a thread.
+  # https://discord.com/developers/docs/resources/channel#list-thread-members
+  def list_thread_members(token, channel_id, before, limit)
+    query = URI.encode_www_form({ before: before, limit: limit }.compact)
+
+    Discordrb::API.request(
+      :channels_cid_thread_members,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/thread-members?#{query}",
+      Authorization: token
+    )
+  end
+
+  # List active threads
+  # https://discord.com/developers/docs/resources/channel#list-active-threads
+  def list_active_threads(token, channel_id)
+    Discordrb::API.request(
+      :channels_cid_threads_active,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/threads/active",
+      Authorization: token
+    )
+  end
+
+  # List public archived threads.
+  # https://discord.com/developers/docs/resources/channel#list-public-archived-threads
+  def list_public_archived_threads(token, channel_id, before = nil, limit = nil)
+    query = URI.encode_www_form({ before: before, limit: limit }.compact)
+
+    Discordrb::API.request(
+      :channels_cid_threads_archived_public,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/threads/archived/public?#{query}",
+      Authorization: token
+    )
+  end
+
+  # List private archived threads.
+  # https://discord.com/developers/docs/resources/channel#list-private-archived-threads
+  def list_private_archived_threads(token, channel_id, before = nil, limit = nil)
+    query = URI.encode_www_form({ before: before, limit: limit }.compact)
+
+    Discordrb::API.request(
+      :channels_cid_threads_archived_private,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/threads/archived/private?#{query}",
+      Authorization: token
+    )
+  end
+
+  # List joined private archived threads.
+  # https://discord.com/developers/docs/resources/channel#list-joined-private-archived-threads
+  def list_joined_private_archived_threads(token, channel_id, before = nil, limit = nil)
+    query = URI.encode_www_form({ before: before, limit: limit }.compact)
+
+    Discordrb::API.request(
+      :channels_cid_users_me_threads_archived_private,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/users/@me/threads/archived/private?#{query}",
+      Authorization: token
+    )
+  end
 end

data/lib/discordrb/api/interaction.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# API calls for interactions.
+module Discordrb::API::Interaction
+  module_function
+
+  # Respond to an interaction.
+  # https://discord.com/developers/docs/interactions/slash-commands#create-interaction-response
+  def create_interaction_response(interaction_token, interaction_id, type, content = nil, tts = nil, embeds = nil, allowed_mentions = nil, flags = nil, components = nil)
+    data = { tts: tts, content: content, embeds: embeds, allowed_mentions: allowed_mentions, flags: flags, components: components }.compact
+
+    Discordrb::API.request(
+      :interactions_iid_token_callback,
+      interaction_id,
+      :post,
+      "#{Discordrb::API.api_base}/interactions/#{interaction_id}/#{interaction_token}/callback",
+      { type: type, data: data }.to_json,
+      content_type: :json
+    )
+  end
+
+  # Create a response that results in a modal.
+  # https://discord.com/developers/docs/interactions/slash-commands#create-interaction-response
+  def create_interaction_modal_response(interaction_token, interaction_id, custom_id, title, components)
+    data = { custom_id: custom_id, title: title, components: components.to_a }.compact
+
+    Discordrb::API.request(
+      :interactions_iid_token_callback,
+      interaction_id,
+      :post,
+      "#{Discordrb::API.api_base}/interactions/#{interaction_id}/#{interaction_token}/callback",
+      { type: 9, data: data }.to_json,
+      content_type: :json
+    )
+  end
+
+  # Get the original response to an interaction.
+  # https://discord.com/developers/docs/interactions/slash-commands#get-original-interaction-response
+  def get_original_interaction_response(interaction_token, application_id)
+    Discordrb::API::Webhook.token_get_message(interaction_token, application_id, '@original')
+  end
+
+  # Edit the original response to an interaction.
+  # https://discord.com/developers/docs/interactions/slash-commands#edit-original-interaction-response
+  def edit_original_interaction_response(interaction_token, application_id, content = nil, embeds = nil, allowed_mentions = nil, components = nil)
+    Discordrb::API::Webhook.token_edit_message(interaction_token, application_id, '@original', content, embeds, allowed_mentions, components)
+  end
+
+  # Delete the original response to an interaction.
+  # https://discord.com/developers/docs/interactions/slash-commands#delete-original-interaction-response
+  def delete_original_interaction_response(interaction_token, application_id)
+    Discordrb::API::Webhook.token_delete_message(interaction_token, application_id, '@original')
+  end
+end

data/lib/discordrb/api/invite.rb

@@ -11,7 +11,7 @@ module Discordrb::API::Invite
       :invite_code,
       nil,
       :get,
-      "#{Discordrb::API.api_base}/invite/#{invite_code}#{counts ? '?with_counts=true' : ''}",
+      "#{Discordrb::API.api_base}/invites/#{invite_code}#{counts ? '?with_counts=true' : ''}",
       Authorization: token
     )
   end
@@ -36,7 +36,7 @@ module Discordrb::API::Invite
       :invite_code,
       nil,
       :post,
-      "#{Discordrb::API.api_base}/invite/#{invite_code}",
+      "#{Discordrb::API.api_base}/invites/#{invite_code}",
       nil,
       Authorization: token
     )

data/lib/discordrb/api/server.rb

@@ -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,
@@ -127,18 +128,20 @@ module Discordrb::API::Server
   # Gets members from the server
   # 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://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)
+  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
-      }.compact.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
@@ -172,12 +176,13 @@ module Discordrb::API::Server
 
   # Get a server's banned users
   # https://discord.com/developers/docs/resources/guild#get-guild-bans
-  def bans(token, server_id)
+  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
@@ -190,7 +195,7 @@ module Discordrb::API::Server
       :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
     )
@@ -244,13 +249,28 @@ module Discordrb::API::Server
   # 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://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)
+  # @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
@@ -374,7 +394,7 @@ module Discordrb::API::Server
   end
 
   # Create a server integration
-  # https://discordapp.com/developers/docs/resources/guild#create-guild-integration
+  # 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,
@@ -402,7 +422,7 @@ module Discordrb::API::Server
   end
 
   # Delete a server integration
-  # https://discordapp.com/developers/docs/resources/guild#delete-guild-integration
+  # 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,
@@ -427,32 +447,34 @@ module Discordrb::API::Server
     )
   end
 
-  # Retrieves a server's embed information
-  # https://discord.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://discord.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.
   # https://discord.com/developers/docs/resources/emoji#create-guild-emoji
@@ -498,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,

data/lib/discordrb/api/user.rb

@@ -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,
@@ -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
 

data/lib/discordrb/api/webhook.rb

@@ -27,6 +27,28 @@ module Discordrb::API::Webhook
     )
   end
 
+  # Execute a webhook via token.
+  # https://discord.com/developers/docs/resources/webhook#execute-webhook
+  def token_execute_webhook(webhook_token, webhook_id, wait = false, content = nil, username = nil, avatar_url = nil, tts = nil, file = nil, embeds = nil, allowed_mentions = nil, flags = nil, components = nil)
+    body = { content: content, username: username, avatar_url: avatar_url, tts: tts, embeds: embeds&.map(&:to_hash),  allowed_mentions: allowed_mentions, flags: flags, components: components }
+    body = if file
+             { file: file, payload_json: body.to_json }
+           else
+             body.to_json
+           end
+
+    headers = { content_type: :json } unless file
+
+    Discordrb::API.request(
+      :webhooks_wid,
+      webhook_id,
+      :post,
+      "#{Discordrb::API.api_base}/webhooks/#{webhook_id}/#{webhook_token}?wait=#{wait}",
+      body,
+      headers
+    )
+  end
+
   # Update a webhook
   # https://discord.com/developers/docs/resources/webhook#modify-webhook
   def update_webhook(token, webhook_id, data, reason = nil)
@@ -80,4 +102,39 @@ module Discordrb::API::Webhook
       'X-Audit-Log-Reason': reason
     )
   end
+
+  # Get a message that was created by the webhook corresponding to the provided token.
+  # https://discord.com/developers/docs/resources/webhook#get-webhook-message
+  def token_get_message(webhook_token, webhook_id, message_id)
+    Discordrb::API.request(
+      :webhooks_wid_messages_mid,
+      webhook_id,
+      :get,
+      "#{Discordrb::API.api_base}/webhooks/#{webhook_id}/#{webhook_token}/messages/#{message_id}"
+    )
+  end
+
+  # Edit a webhook message via webhook token
+  # https://discord.com/developers/docs/resources/webhook#edit-webhook-message
+  def token_edit_message(webhook_token, webhook_id, message_id, content = nil, embeds = nil, allowed_mentions = nil, components = nil)
+    Discordrb::API.request(
+      :webhooks_wid_messages,
+      webhook_id,
+      :patch,
+      "#{Discordrb::API.api_base}/webhooks/#{webhook_id}/#{webhook_token}/messages/#{message_id}",
+      { content: content, embeds: embeds, allowed_mentions: allowed_mentions, components: components }.to_json,
+      content_type: :json
+    )
+  end
+
+  # Delete a webhook message via webhook token.
+  # https://discord.com/developers/docs/resources/webhook#delete-webhook-message
+  def token_delete_message(webhook_token, webhook_id, message_id)
+    Discordrb::API.request(
+      :webhooks_wid_messages,
+      webhook_id,
+      :delete,
+      "#{Discordrb::API.api_base}/webhooks/#{webhook_id}/#{webhook_token}/messages/#{message_id}"
+    )
+  end
 end