Merge branch 'shardlab:main' into message-components

Author: Droid00000

.circleci/config.yml

@@ -6,7 +6,7 @@ commands:
     steps:
       - run:
           name: Install OS packages
-          command: apk add git build-base ruby-dev ruby-etc ruby-json libsodium-dev
+          command: apk add git build-base ruby-dev libsodium-dev
       - checkout
       - run:
           name: "Ruby version"

discordrb.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ffi', '>= 1.9.24'
   spec.add_dependency 'opus-ruby'
   spec.add_dependency 'rest-client', '>= 2.0.0'
-  spec.add_dependency 'websocket-client-simple', '>= 0.3.0'
+  spec.add_dependency 'websocket-client-simple', '>= 0.9.0'
 
   spec.add_dependency 'discordrb-webhooks', '~> 3.5.0'
 
@@ -41,11 +41,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'redcarpet', '~> 3.5' # YARD markdown formatting
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.5'
-  spec.add_development_dependency 'rspec-prof', '~> 0.0'
-  spec.add_development_dependency 'rubocop', '~> 1.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.0'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.6.0'
+  spec.add_development_dependency 'rspec-prof', '~> 0.0.7'
+  spec.add_development_dependency 'rubocop', '~> 1.77.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.25.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.21'
-  spec.add_development_dependency 'yard', '~> 0.9'
+  spec.add_development_dependency 'yard', '~> 0.9.37'
 end

lib/discordrb.rb

@@ -46,10 +46,13 @@ module Discordrb
   NO_INTENTS = 0
 
   # Compares two objects based on IDs - either the objects' IDs are equal, or one object is equal to the other's ID.
-  def self.id_compare(one_id, other)
+  def self.id_compare?(one_id, other)
     other.respond_to?(:resolve_id) ? (one_id.resolve_id == other.resolve_id) : (one_id == other)
   end
 
+  # @deprecated Please use {Discordrb.id_compare?}
+  singleton_class.alias_method :id_compare, :id_compare?
+
   # The maximum length a Discord message can have
   CHARACTER_LIMIT = 2000
 

lib/discordrb/api.rb

@@ -241,6 +241,11 @@ def nameplate_url(nameplate_asset, format = 'webm')
     "#{cdn_url}/assets/collectibles/#{nameplate_asset.delete_suffix('/')}/asset.#{format}"
   end
 
+  # make a server tag badge URL from a server ID and badge ID.
+  def server_tag_badge_url(server_id, badge_id, format = 'webp')
+    "#{cdn_url}/guild-tag-badges/#{server_id}/#{badge_id}.#{format}"
+  end
+
   # Create an OAuth application
   def create_oauth_application(token, name, redirect_uris)
     request(

lib/discordrb/api/application.rb

@@ -199,4 +199,16 @@ def batch_edit_command_permissions(token, application_id, guild_id, permissions)
       content_type: :json
     )
   end
+
+  # Get the permissions for a specific command in a guild.
+  # https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
+  def get_application_command_permissions(token, application_id, guild_id, command_id)
+    Discordrb::API.request(
+      :applications_aid_guilds_gid_commands_cid_permissions,
+      guild_id,
+      :get,
+      "#{Discordrb::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}/permissions",
+      Authorization: token
+    )
+  end
 end

lib/discordrb/api/channel.rb

@@ -319,39 +319,40 @@ def start_typing(token, channel_id)
   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://discord.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
     )
   end
 
   # Unpin a message
-  # https://discord.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
     )

lib/discordrb/api/invite.rb

@@ -11,7 +11,7 @@ def resolve(token, invite_code, counts = true)
       :invite_code,
       nil,
       :get,
-      "#{Discordrb::API.api_base}/invites/#{invite_code}#{counts ? '?with_counts=true' : ''}",
+      "#{Discordrb::API.api_base}/invites/#{invite_code}#{'?with_counts=true' if counts}",
       Authorization: token
     )
   end

lib/discordrb/bot.rb

@@ -1101,10 +1101,11 @@ def update_guild_member(data)
       server_id = data['guild_id'].to_i
       server = self.server(server_id)
 
-      if (member = server.member(data['user']['id'].to_i))
+      # Only attempt to update members that're already cached
+      if (member = server.member(data['user']['id'].to_i, false))
         member.update_data(data)
       else
-        Discordrb::LOGGER.warn("update_guild_member attempted to access a member which doesn't exist! Not sure what happened here, ignoring.")
+        ensure_user(data['user'])
       end
     end
 
@@ -1301,12 +1302,21 @@ def handle_dispatch(type, data)
           return
         end
 
+        if !should_parse_self && profile.id == data['author']['id'].to_i
+          debug('Ignored message from the current bot')
+          return
+        end
+
         # If create_message is overwritten with a method that returns the parsed message, use that instead, so we don't
         # parse the message twice (which is just thrown away performance)
         message = create_message(data)
         message = Message.new(data, self) unless message.is_a? Message
 
-        return if message.from_bot? && !should_parse_self
+        # Update the existing member if it exists in the cache.
+        if data['member']
+          member = message.channel.server&.member(data['author']['id'].to_i, false)
+          member&.update_data(data['member'])
+        end
 
         # Dispatch a ChannelCreateEvent for channels we don't have cached
         if message.channel.private? && @pm_channels[message.channel.recipient.id].nil?
@@ -1330,18 +1340,27 @@ def handle_dispatch(type, data)
       when :MESSAGE_UPDATE
         update_message(data)
 
+        if !should_parse_self && profile.id == data['author']['id'].to_i
+          debug('Ignored message from the current bot')
+          return
+        end
+
         message = Message.new(data, self)
 
         event = MessageUpdateEvent.new(message, self)
         raise_event(event)
 
-        return if message.from_bot? && !should_parse_self
-
-        unless message.author
+        if data['author'].nil?
           LOGGER.debug("Edited a message with nil author! Content: #{message.content.inspect}, channel: #{message.channel.inspect}")
           return
         end
 
+        # Update the existing member if it exists in the cache.
+        if data['member']
+          member = message.channel.server&.member(data['author']['id'].to_i, false)
+          member&.update_data(data['member'])
+        end
+
         event = MessageEditEvent.new(message, self)
         raise_event(event)
       when :MESSAGE_DELETE
@@ -1379,6 +1398,12 @@ def handle_dispatch(type, data)
 
         return if profile.id == data['user_id'].to_i && !should_parse_self
 
+        if data['member']
+          server = self.server(data['guild_id'].to_i)
+
+          server&.cache_member(Member.new(data['member'], server, self))
+        end
+
         event = ReactionAddEvent.new(data, self)
         raise_event(event)
       when :MESSAGE_REACTION_REMOVE
@@ -1559,6 +1584,10 @@ def handle_dispatch(type, data)
           event = ServerEmojiUpdateEvent.new(server, old_emoji_data[e], new_emoji_data[e], self)
           raise_event(event)
         end
+      when :APPLICATION_COMMAND_PERMISSIONS_UPDATE
+        event = ApplicationCommandPermissionsUpdateEvent.new(data, self)
+
+        raise_event(event)
       when :INTERACTION_CREATE
         event = InteractionCreateEvent.new(data, self)
         raise_event(event)

lib/discordrb/cache.rb

@@ -199,7 +199,7 @@ def request_chunks(id)
     # @return [String] Only the code for the invite.
     def resolve_invite_code(invite)
       invite = invite.code if invite.is_a? Discordrb::Invite
-      invite = invite[invite.rindex('/') + 1..] if invite.start_with?('http', 'discord.gg')
+      invite = invite[(invite.rindex('/') + 1)..] if invite.start_with?('http', 'discord.gg')
       invite
     end
 

lib/discordrb/commands/parser.rb

@@ -211,7 +211,7 @@ def execute_bare(event)
         b_level -= 1
         next unless b_level.zero?
 
-        nested = @chain[b_start + 1..index - 1]
+        nested = @chain[(b_start + 1)..(index - 1)]
         subchain = CommandChain.new(nested, @bot, true)
         result += subchain.execute(event)
       end
@@ -245,8 +245,8 @@ def execute_bare(event)
         command = command.gsub hacky_delim, @attributes[:chain_delimiter]
 
         first_space = command.index ' '
-        command_name = first_space ? command[0..first_space - 1] : command
-        arguments = first_space ? command[first_space + 1..] : ''
+        command_name = first_space ? command[0..(first_space - 1)] : command
+        arguments = first_space ? command[(first_space + 1)..] : ''
 
         # Append a previous sign if none is present
         arguments += @attributes[:previous] unless arguments.include? @attributes[:previous]
@@ -318,7 +318,7 @@ def divide_chain(chain)
           arg.split ' '
         end
 
-        chain = chain[chain_args_index + 1..]
+        chain = chain[(chain_args_index + 1)..]
       end
 
       [chain_args, chain]