discordrb 3.4.3 → 3.6.0

data/lib/discordrb/api/channel.rb

@@ -18,8 +18,8 @@ module Discordrb::API::Channel
 
   # Update a channel's data
   # 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 }
+  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, archived = nil, auto_archive_duration = nil, locked = nil, invitable = nil, flags = nil, applied_tags = 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, archived: archived, auto_archive_duration: auto_archive_duration, locked: locked, invitable: invitable, flags: flags, applied_tags: applied_tags }
     data[:permission_overwrites] = permission_overwrites unless permission_overwrites.nil?
     Discordrb::API.request(
       :channels_cid,
@@ -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, flags = nil, enforce_nonce = false)
+    body = { content: message, tts: tts, embeds: embeds, nonce: nonce, allowed_mentions: allowed_mentions, message_reference: message_reference, components: components&.to_a, flags: flags, enforce_nonce: enforce_nonce }
     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, flags = 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, allowed_mentions: mentions, embeds: embeds, components: components, flags: flags }.reject { |_, v| v == :undef }.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,
@@ -141,8 +142,20 @@ module Discordrb::API::Channel
     )
   end
 
+  # Crosspost a message
+  # https://discord.com/developers/docs/resources/message#crosspost-message
+  def crosspost_message(token, channel_id, message_id)
+    Discordrb::API.request(
+      :channels_cid_messages_mid,
+      channel_id,
+      :post,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/crosspost",
+      Authorization: token
+    )
+  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 +214,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 +236,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)
@@ -292,25 +319,26 @@ module Discordrb::API::Channel
   end
 
   # Get a list of pinned messages in a channel
-  # https://discord.com/developers/docs/resources/channel#get-pinned-messages
-  def pinned_messages(token, channel_id)
+  # https://discord.com/developers/docs/resources/message#get-channel-pins
+  def pinned_messages(token, channel_id, limit = 50, before = nil)
+    query = URI.encode_www_form({ limit: limit, before: before }.compact)
     Discordrb::API.request(
       :channels_cid_pins,
       channel_id,
       :get,
-      "#{Discordrb::API.api_base}/channels/#{channel_id}/pins",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/pins?#{query}",
       Authorization: token
     )
   end
 
   # Pin a message
-  # https://discordapp.com/developers/docs/resources/channel#add-pinned-channel-message
+  # https://discord.com/developers/docs/resources/message#pin-message
   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}",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/pins/#{message_id}",
       nil,
       Authorization: token,
       'X-Audit-Log-Reason': reason
@@ -318,19 +346,20 @@ 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/message#unpin-message
   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}",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/pins/#{message_id}",
       Authorization: token,
       'X-Audit-Log-Reason': reason
     )
   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(
@@ -345,6 +374,7 @@ 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(
@@ -365,6 +395,7 @@ 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(
@@ -379,6 +410,7 @@ 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(
@@ -392,6 +424,7 @@ 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(
@@ -430,4 +463,175 @@ 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
+
+  # Start a thread in a forum or media channel.
+  # https://discord.com/developers/docs/resources/channel#start-thread-in-forum-or-media-channel
+  def start_thread_in_forum_or_media_channel(token, channel_id, name, message, attachments = nil, rate_limit_per_user = nil, auto_archive_duration = nil, applied_tags = [], reason = nil)
+    body = { name: name, message: message, rate_limit_per_user: rate_limit_per_user, auto_archive_duration: auto_archive_duration, applied_tags: applied_tags }.compact
+
+    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, 'X-Audit-Log-Reason': reason }
+    headers[:content_type] = :json unless attachments
+
+    Discordrb::API.request(
+      :channels_cid_threads,
+      channel_id,
+      :post,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/threads",
+      body,
+      headers
+    )
+  end
 end

data/lib/discordrb/api/interaction.rb

@@ -0,0 +1,63 @@
+# 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, attachments = nil, choices = nil)
+    body = { tts: tts, content: content, embeds: embeds, allowed_mentions: allowed_mentions, flags: flags, components: components, choices: choices }.compact
+
+    body = if attachments
+             files = [*0...attachments.size].zip(attachments).to_h
+             { **files, payload_json: { type: type, data: body }.to_json }
+           else
+             { type: type, data: body }.to_json
+           end
+
+    headers = { content_type: :json } unless attachments
+
+    Discordrb::API.request(
+      :interactions_iid_token_callback,
+      interaction_id,
+      :post,
+      "#{Discordrb::API.api_base}/interactions/#{interaction_id}/#{interaction_token}/callback",
+      body,
+      headers
+    )
+  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, attachments = nil)
+    Discordrb::API::Webhook.token_edit_message(interaction_token, application_id, '@original', content, embeds, allowed_mentions, components, attachments)
+  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}#{'?with_counts=true' if counts}",
       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
     )