onyxcord 3.2.8 → 4.0.0.beta.1

data/lib/onyxcord/internal/event_executor.rb

@@ -37,6 +37,11 @@ module OnyxCord
           raise ArgumentError, 'EventExecutor::Pool#post requires a block' unless block
           raise 'Event executor has been shut down' if @closed
 
+          if @queue.respond_to?(:max) && @queue.size >= @queue.max
+            OnyxCord::LOGGER.warn('Event executor queue is full — dropping event') if defined?(OnyxCord::LOGGER)
+            return
+          end
+
           @queue << block
         end
 
@@ -55,6 +60,8 @@ module OnyxCord
           @size.times { @queue << STOP }
           @workers.each do |w|
             w.join unless w == Thread.current
+          rescue Interrupt, SystemExit
+            raise
           rescue StandardError
             nil
           end

data/lib/onyxcord/internal/http.rb

@@ -135,7 +135,7 @@ module OnyxCord
       end
 
       def multipart_body(body, boundary)
-        output = (+'').b
+        output = String.new(encoding: Encoding::BINARY)
 
         multipart_parts(body).each do |part|
           key = part[:name]
@@ -159,7 +159,23 @@ module OnyxCord
       end
 
       def multipart_content_type(filename)
-        File.extname(filename).casecmp('.txt').zero? ? 'text/plain' : 'application/octet-stream'
+        ext = File.extname(filename).downcase
+        case ext
+        when '.txt' then 'text/plain'
+        when '.json' then 'application/json'
+        when '.xml' then 'application/xml'
+        when '.png' then 'image/png'
+        when '.jpg', '.jpeg' then 'image/jpeg'
+        when '.gif' then 'image/gif'
+        when '.webp' then 'image/webp'
+        when '.mp3' then 'audio/mpeg'
+        when '.mp4' then 'video/mp4'
+        when '.ogg' then 'audio/ogg'
+        when '.wav' then 'audio/wav'
+        when '.pdf' then 'application/pdf'
+        when '.zip' then 'application/zip'
+        else 'application/octet-stream'
+        end
       end
 
       def multipart?(body)

data/lib/onyxcord/internal/json.rb

@@ -2,49 +2,53 @@
 
 require 'oj'
 
-# Configure Oj in compat mode so that all stdlib JSON.parse / .to_json calls
-# are transparently accelerated. This is loaded early by the main onyxcord.rb
-# entry point so every module benefits automatically.
+# JSON utilities backed by Oj with *local* options.
+# We deliberately avoid `Oj.default_options` to keep the global process clean.
+
 module OnyxCord
   module Internal
     # Fast Oj-backed JSON wrapper providing compatibility with stdlib JSON methods.
     module JSON
-      Oj.default_options = { mode: :compat, symbol_keys: false }
+      # Default options for Oj. Kept local so that other libraries in the process
+      # are not affected by a global override.
+      OJ_OPTIONS = { mode: :compat, symbol_keys: false }.freeze
 
       module_function
 
-      # Fast JSON decode using Oj via stdlib JSON compatibility.
+      # Decode a JSON string into a Ruby object.
       # @param data [String] The JSON string to decode.
+      # @param args [Hash] Additional Oj.load options (merged with defaults).
       # @return [Hash, Array, String, Numeric, nil]
-      def decode(data, *args)
-        ::JSON.parse(data, *args)
+      def decode(data, **args)
+        Oj.load(data, **OJ_OPTIONS, **args)
       end
 
-      # Fast JSON encode using Oj via stdlib JSON compatibility.
+      # Encode a Ruby object as JSON.
       # @param data [Object] The object to encode as JSON.
+      # @param args [Hash] Additional Oj.dump options (merged with defaults).
       # @return [String]
-      def encode(data, *args)
-        ::JSON.generate(data, *args)
+      def encode(data, **args)
+        Oj.dump(data, **OJ_OPTIONS, **args)
       end
 
-      # Alias parse to decode for standard library compatibility
-      def parse(data, *args)
-        ::JSON.parse(data, *args)
+      # Alias parse to decode
+      def parse(data, **args)
+        decode(data, **args)
       end
 
-      # Alias generate to encode for standard library compatibility
-      def generate(data, *args)
-        ::JSON.generate(data, *args)
+      # Alias generate to encode
+      def generate(data, **args)
+        encode(data, **args)
       end
 
-      # Alias load to decode for Oj/JSON compatibility
-      def load(data, *args)
-        ::JSON.parse(data, *args)
+      # Alias load to decode (Oj/JSON compatibility)
+      def load(data, **args)
+        decode(data, **args)
       end
 
-      # Alias dump to encode for Oj/JSON compatibility
-      def dump(data, *args)
-        ::JSON.generate(data, *args)
+      # Alias dump to encode (Oj/JSON compatibility)
+      def dump(data, **args)
+        encode(data, **args)
       end
     end
   end

data/lib/onyxcord/internal/rate_limiter/async_rest.rb

@@ -21,8 +21,9 @@ module OnyxCord
         end
 
         def before_request(route, major_parameter)
-          wait_for(@global_lock)
+          # Acquire locks in consistent order (route → global) to prevent deadlock.
           wait_for(mutex_for(route, major_parameter))
+          wait_for(@global_lock) if @global_lock.locked?
         end
 
         def record_response(route, major_parameter, headers)
@@ -106,12 +107,12 @@ module OnyxCord
         def retry_after(response, headers)
           body = response.respond_to?(:body) ? response.body : response.to_s
           if body && !body.empty?
-            data = JSON.parse(body)
+            data = OnyxCord::Internal::JSON.parse(body)
             return data['retry_after'].to_f if data['retry_after']
           end
 
           (headers[:retry_after] || 0).to_f
-        rescue JSON::ParserError
+        rescue OnyxCord::Internal::JSON::ParseError
           (headers[:retry_after] || 0).to_f
         end
 

data/lib/onyxcord/internal/rate_limiter/rest.rb

@@ -49,7 +49,9 @@ module OnyxCord
 
         def handle_rate_limit(route, major_parameter, response)
           headers = normalize_headers(response.headers)
-          mutex = headers[:x_ratelimit_global] == 'true' || headers[:x_ratelimit_scope] == 'global' ? @global_mutex : mutex_for(route, major_parameter)
+          global = [true, 'true', 1, '1'].include?(headers[:x_ratelimit_global]) ||
+                   headers[:x_ratelimit_scope] == 'global'
+          mutex = global ? @global_mutex : mutex_for(route, major_parameter)
           wait_seconds = retry_after(response, headers)
 
           sync_wait(wait_seconds, mutex) if wait_seconds.positive?
@@ -103,12 +105,12 @@ module OnyxCord
         def retry_after(response, headers)
           body = response.respond_to?(:body) ? response.body : response.to_s
           if body && !body.empty?
-            data = JSON.parse(body)
+            data = OnyxCord::Internal::JSON.parse(body)
             return data['retry_after'].to_f if data['retry_after']
           end
 
           (headers[:retry_after] || 0).to_f
-        rescue JSON::ParserError
+        rescue OnyxCord::Internal::JSON::ParseError
           (headers[:retry_after] || 0).to_f
         end
 

data/lib/onyxcord/light/light_bot.rb

@@ -32,13 +32,13 @@ module OnyxCord::Light
     # @return [LightProfile] the details of the user this bot is connected to.
     def profile
       response = OnyxCord::REST::User.profile(@token)
-      LightProfile.new(JSON.parse(response), self)
+      LightProfile.new(OnyxCord::Internal::JSON.parse(response), self)
     end
 
     # @return [Array<LightServer>] the servers this bot is connected to.
     def servers
       response = OnyxCord::REST::User.servers(@token)
-      JSON.parse(response).map { |e| LightServer.new(e, self) }
+      OnyxCord::Internal::JSON.parse(response).map { |e| LightServer.new(e, self) }
     end
 
     # Joins a server using an instant invite.
@@ -52,7 +52,7 @@ module OnyxCord::Light
     # @return [Array<Connection>] this account's connections.
     def connections
       response = OnyxCord::REST::User.connections(@token)
-      JSON.parse(response).map { |e| Connection.new(e, self) }
+      OnyxCord::Internal::JSON.parse(response).map { |e| Connection.new(e, self) }
     end
   end
 end

data/lib/onyxcord/models/application.rb

@@ -236,7 +236,7 @@ module OnyxCord
         data[:flags] = ((@flags & ~to_flags.call(remove_flags)) | to_flags.call(add_flags))
       end
 
-      update_data(JSON.parse(REST::Application.update_current_application(@bot.token, **data)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Application.update_current_application(@bot.token, **data)))
       nil
     end
 

data/lib/onyxcord/models/channel.rb

@@ -418,7 +418,7 @@ module OnyxCord
     # Check if this channel is marked as NSFW.
     # @return [true, false] Whether or not this channel is marked as NSFW.
     def nsfw?
-      thread? ? parent.nsfw? : @nsfw
+      thread? ? (parent&.nsfw? || false) : @nsfw
     end
 
     # Get the time at when this channel was created at.
@@ -781,7 +781,7 @@ module OnyxCord
     # @return [Array<Message>] the retrieved messages.
     def history(amount, before_id = nil, after_id = nil, around_id = nil)
       logs = REST::Channel.messages(@bot.token, @id, amount, before_id, after_id, around_id)
-      JSON.parse(logs).map { |message| Message.new(message, @bot) }
+      OnyxCord::Internal::JSON.parse(logs).map { |message| Message.new(message, @bot) }
     end
 
     # Retrieves message history, but only message IDs for use with prune.
@@ -789,7 +789,7 @@ module OnyxCord
     # @!visibility private
     def history_ids(amount, before_id = nil, after_id = nil, around_id = nil)
       logs = REST::Channel.messages(@bot.token, @id, amount, before_id, after_id, around_id)
-      JSON.parse(logs).map { |message| message['id'].to_i }
+      OnyxCord::Internal::JSON.parse(logs).map { |message| message['id'].to_i }
     end
 
     # Returns a single message from this channel's history by ID.
@@ -799,7 +799,7 @@ module OnyxCord
       raise ArgumentError, 'message_id cannot be nil' if message_id.nil?
 
       response = REST::Channel.message(@bot.token, @id, message_id)
-      Message.new(JSON.parse(response), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(response), @bot)
     rescue OnyxCord::Errors::UnknownMessage
       nil
     end
@@ -812,7 +812,7 @@ module OnyxCord
     def pins(limit: 50)
       get_pins = proc do |fetch_limit, before = nil|
         resp = REST::Channel.pinned_messages(@bot.token, @id, fetch_limit, before&.iso8601)
-        JSON.parse(resp)['items'].map { |pin| Message.new(pin['message'].merge({ 'pinned_at' => pin['pinned_at'] }), @bot) }
+        OnyxCord::Internal::JSON.parse(resp)['items'].map { |pin| Message.new(pin['message'].merge({ 'pinned_at' => pin['pinned_at'] }), @bot) }
       end
 
       # Can be done without pagination.
@@ -905,7 +905,7 @@ module OnyxCord
     # @return [Invite] the created invite.
     def make_invite(max_age = 0, max_uses = 0, temporary = false, unique = false, reason = nil)
       response = REST::Channel.create_invite(@bot.token, @id, max_age, max_uses, temporary, unique, reason)
-      Invite.new(JSON.parse(response), @bot)
+      Invite.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     alias_method :invite, :make_invite
@@ -929,7 +929,7 @@ module OnyxCord
       raise ArgumentError, 'Tried to create a webhook in a non-server channel' unless server
 
       response = REST::Channel.create_webhook(@bot.token, @id, name, avatar, reason)
-      Webhook.new(JSON.parse(response), @bot)
+      Webhook.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     # Requests a list of Webhooks on the channel.
@@ -937,7 +937,7 @@ module OnyxCord
     def webhooks
       raise 'Tried to request webhooks from a non-server channel' unless server
 
-      webhooks = JSON.parse(REST::Channel.webhooks(@bot.token, @id))
+      webhooks = OnyxCord::Internal::JSON.parse(REST::Channel.webhooks(@bot.token, @id))
       webhooks.map { |webhook_data| Webhook.new(webhook_data, @bot) }
     end
 
@@ -946,7 +946,7 @@ module OnyxCord
     def invites
       raise 'Tried to request invites from a non-server channel' unless server
 
-      invites = JSON.parse(REST::Channel.invites(@bot.token, @id))
+      invites = OnyxCord::Internal::JSON.parse(REST::Channel.invites(@bot.token, @id))
       invites.map { |invite_data| Invite.new(invite_data, @bot) }
     end
 
@@ -957,7 +957,7 @@ module OnyxCord
     def follow(target, reason: nil)
       raise 'Cannot follow a non-announcement channel' unless news?
 
-      JSON.parse(REST::Channel.follow_channel(@bot.token, @id, target.resolve_id, reason))['webhook_id'].to_i
+      OnyxCord::Internal::JSON.parse(REST::Channel.follow_channel(@bot.token, @id, target.resolve_id, reason))['webhook_id'].to_i
     end
 
     # Returns the last message or forum post created in this channel.
@@ -990,7 +990,7 @@ module OnyxCord
                REST::Channel.start_thread_without_message(@bot.token, @id, name, auto_archive_duration, type)
              end
 
-      @bot.ensure_channel(JSON.parse(data))
+      @bot.ensure_channel(OnyxCord::Internal::JSON.parse(data))
     end
 
     # Start a thread in a forum or media channel.
@@ -1026,7 +1026,7 @@ module OnyxCord
       builder = builder.to_json_hash
 
       message = { content: builder[:content], embeds: builder[:embeds], allowed_mentions: builder[:allowed_mentions], components: components, sticker_ids: stickers&.map(&:resolve_id), flags: flags }
-      response = JSON.parse(REST::Channel.start_thread_in_forum_or_media_channel(@bot.token, @id, name, message.compact, attachments, rate_limit_per_user, auto_archive_duration, tags&.map(&:resolve_id), reason))
+      response = OnyxCord::Internal::JSON.parse(REST::Channel.start_thread_in_forum_or_media_channel(@bot.token, @id, name, message.compact, attachments, rate_limit_per_user, auto_archive_duration, tags&.map(&:resolve_id), reason))
 
       Message.new(response['message'].merge!('channel_id' => response['id'], 'thread' => response), @bot)
     end
@@ -1040,7 +1040,7 @@ module OnyxCord
     # @return [ChannelTag, nil] The tag that was found or `nil` if it couldn't be found.
     def tag(id)
       id = id.resolve_id
-      @available_tags.find { |tag| tag == id }
+      @available_tags.find { |t| t.id == id }
     end
 
     # Check if a specific tag has been applied to this thread.
@@ -1056,9 +1056,11 @@ module OnyxCord
     #   be applied onto threads created in this channel will be returned instead.
     # @return [Array<ChannelTag>] The available or set channel tags for this channel.
     def tags
-      return @available_tags if forum? || !thread_only?
+      return @available_tags if thread_only?
 
-      @applied_tags.filter_map { |tag_id| parent&.tag(tag_id) }
+      return @applied_tags.filter_map { |tag_id| parent&.tag(tag_id) } if thread?
+
+      []
     end
 
     # Add one or more tags to this thread channel.
@@ -1207,7 +1209,7 @@ module OnyxCord
         data[:flags] = ((@flags & ~to_flags.call(remove_flags)) | to_flags.call(add_flags))
       end
 
-      update_data(JSON.parse(REST::Channel.update!(@bot.token, @id, **data, reason: reason)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Channel.update!(@bot.token, @id, **data, reason: reason)))
       nil
     end
 
@@ -1249,7 +1251,7 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def update_data(new_data = nil)
-      new_data ||= JSON.parse(REST::Channel.resolve(@bot.token, @id))
+      new_data ||= OnyxCord::Internal::JSON.parse(REST::Channel.resolve(@bot.token, @id))
       @type = new_data['type'] || 0
       @topic = new_data['topic']
       @bitrate = new_data['bitrate']

data/lib/onyxcord/models/component.rb

@@ -171,11 +171,11 @@ module OnyxCord
         attr_reader :emoji
 
         # @!visibility private
-        def initialize(data)
+        def initialize(data, bot = nil)
           @label = data['label']
           @value = data['value']
           @description = data['description']
-          @emoji = Emoji.new(data['emoji'], @bot) if data['emoji']
+          @emoji = Emoji.new(data['emoji'], bot) if data['emoji']
         end
       end
 
@@ -209,7 +209,7 @@ module OnyxCord
         @max_values = data['max_values']
         @min_values = data['min_values']
         @placeholder = data['placeholder']
-        @options = data['options']&.map { |option| Option.new(option) } || []
+        @options = data['options']&.map { |option| Option.new(option, bot) } || []
       end
     end
 

data/lib/onyxcord/models/interaction.rb

@@ -182,7 +182,7 @@ module OnyxCord
       response = OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:channel_message], data[:content], tts, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, nil, wait, data[:poll])
       return unless wait
 
-      Interactions::Message.new(JSON.parse(response)['resource']['message'], @bot, self)
+      Interactions::Message.new(OnyxCord::Internal::JSON.parse(response)['resource']['message'], @bot, self)
     end
 
     # Defer an interaction, setting a temporary response that can be later overriden by {Interaction#send_message}.
@@ -255,7 +255,7 @@ module OnyxCord
       response = OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:update_message], data[:content], tts, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, nil, wait, data[:poll])
       return unless wait
 
-      Interactions::Message.new(JSON.parse(response)['resource']['message'], @bot, self)
+      Interactions::Message.new(OnyxCord::Internal::JSON.parse(response)['resource']['message'], @bot, self)
     end
 
     # Edit the original response to this interaction.
@@ -281,7 +281,7 @@ module OnyxCord
       data = builder.to_json_hash
       resp = OnyxCord::REST::Interaction.edit_original_interaction_response(@token, @application_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll])
 
-      Interactions::Message.new(JSON.parse(resp), @bot, self)
+      Interactions::Message.new(OnyxCord::Internal::JSON.parse(resp), @bot, self)
     end
 
     # Delete the original interaction response.
@@ -318,7 +318,7 @@ module OnyxCord
       resp = OnyxCord::REST::Webhook.token_execute_webhook(
         @token, @application_id, true, data[:content], nil, nil, tts, nil, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, data[:poll]
       )
-      Interactions::Message.new(JSON.parse(resp), @bot, self)
+      Interactions::Message.new(OnyxCord::Internal::JSON.parse(resp), @bot, self)
     end
 
     alias edit_original edit_response
@@ -348,7 +348,7 @@ module OnyxCord
       resp = OnyxCord::REST::Webhook.token_edit_message(
         @token, @application_id, message.resolve_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll]
       )
-      Interactions::Message.new(JSON.parse(resp), @bot, self)
+      Interactions::Message.new(OnyxCord::Internal::JSON.parse(resp), @bot, self)
     end
 
     # @param message [Integer, String, InteractionMessage, Message] The message created by this interaction to be deleted.

data/lib/onyxcord/models/member.rb

@@ -471,7 +471,7 @@ module OnyxCord
 
       if (user = data['user'])
         @user.update_global_name(user['global_name']) if user['global_name']
-        @user.avatar_id = user['avatar'] if user.key('avatar')
+        @user.avatar_id = user['avatar'] if user.key?('avatar')
         @user.update_avatar_decoration(user['avatar_decoration_data']) if user.key?('avatar_decoration_data')
         @user.update_collectibles(user['collectibles']) if user.key?('collectibles')
         @user.update_primary_server(user['primary_guild']) if user.key?('primary_guild')
@@ -512,17 +512,17 @@ module OnyxCord
 
     # @!visibility private
     def update_member_data(new_data)
-      update_data(JSON.parse(REST::Server.update_member(@bot.token, @server_id, @user.id, **new_data)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update_member(@bot.token, @server_id, @user.id, **new_data)))
     end
 
     # @!visibility private
     def update_current_member_data(new_data)
-      update_data(JSON.parse(REST::Server.update_current_member(@bot.token, @server_id,
-                                                                new_data.key?(:nick) ? new_data[:nick] : :undef,
-                                                                new_data[:reason],
-                                                                new_data.key?(:bio) ? new_data[:bio] : :undef,
-                                                                new_data.key?(:banner) ? new_data[:banner] : :undef,
-                                                                new_data.key?(:avatar) ? new_data[:avatar] : :undef)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update_current_member(@bot.token, @server_id,
+                                                                                    new_data.key?(:nick) ? new_data[:nick] : :undef,
+                                                                                    new_data[:reason],
+                                                                                    new_data.key?(:bio) ? new_data[:bio] : :undef,
+                                                                                    new_data.key?(:banner) ? new_data[:banner] : :undef,
+                                                                                    new_data.key?(:avatar) ? new_data[:avatar] : :undef)))
     end
   end
 end

data/lib/onyxcord/models/message.rb

@@ -317,7 +317,7 @@ module OnyxCord
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, new_components)
 
       response = REST::Channel.edit_message(@bot.token, @channel.id, @id, new_content, :undef, new_embeds, new_components, flags)
-      Message.new(JSON.parse(response), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     # Deletes this message.
@@ -347,7 +347,7 @@ module OnyxCord
     # @return [Message] the updated message object.
     def crosspost
       response = REST::Channel.crosspost_message(@bot.token, @channel.id, @id)
-      Message.new(JSON.parse(response), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     # Add an {Await} for a message with the same user and channel.
@@ -420,7 +420,7 @@ module OnyxCord
     def suppress_embeds
       flags = @flags | (1 << 2)
       response = REST::Channel.edit_message(@bot.token, @channel.id, @id, :undef, :undef, :undef, :undef, flags)
-      Message.new(JSON.parse(response), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     # Check if this message mentions a specific user or role.
@@ -459,7 +459,7 @@ module OnyxCord
 
       get_reactions = proc do |fetch_limit, after_id = nil|
         resp = REST::Channel.get_reactions(@bot.token, @channel.id, @id, reaction, nil, after_id, fetch_limit, type)
-        JSON.parse(resp).map { |d| User.new(d, @bot) }
+        OnyxCord::Internal::JSON.parse(resp).map { |d| User.new(d, @bot) }
       end
 
       # Can be done without pagination
@@ -515,7 +515,7 @@ module OnyxCord
 
     # The inspect method is overwritten to give more useful output
     def inspect
-      "<Message content=\"#{@content}\" id=#{@id} timestamp=#{@timestamp} author=#{@author} channel=#{@channel}>"
+      "<Message content=\"#{@content}\" id=#{@id} timestamp=#{creation_time} author=#{@author} channel=#{@channel}>"
     end
 
     # @return [String] a URL that a user can use to navigate to this message in the client

data/lib/onyxcord/models/poll.rb

@@ -91,7 +91,7 @@ module OnyxCord
     def close
       raise OnyxCord::Errors::NoPermission, 'Cannot close the poll' if !@message.from_bot? || closed?
 
-      Message.new(JSON.parse(REST::Channel.end_poll(@bot.token, @message.channel.id, @message.id)), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(REST::Channel.end_poll(@bot.token, @message.channel.id, @message.id)), @bot)
     end
 
     # Check if two poll objects are equivalent.
@@ -188,7 +188,7 @@ module OnyxCord
 
         get_users = lambda do |limit, after|
           data = REST::Channel.get_poll_voters(@bot.token, channel_id, @message_id, @id, after:, limit:)
-          JSON.parse(data)['users'].collect { |poll_voter_data| @bot.ensure_user(poll_voter_data) }
+          OnyxCord::Internal::JSON.parse(data)['users'].collect { |poll_voter_data| @bot.ensure_user(poll_voter_data) }
         end
 
         return get_users.call(limit, after_time) if limit && limit <= 100

data/lib/onyxcord/models/profile.rb

@@ -70,10 +70,10 @@ module OnyxCord
 
     # @!visibility private
     def update_profile_data(new_data)
-      update_data(JSON.parse(REST::User.update_current_user(@bot.token,
-                                                            new_data[:username] || :undef,
-                                                            new_data.key?(:avatar) ? new_data[:avatar] : :undef,
-                                                            new_data.key?(:banner) ? new_data[:banner] : :undef)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::User.update_current_user(@bot.token,
+                                                                                new_data[:username] || :undef,
+                                                                                new_data.key?(:avatar) ? new_data[:avatar] : :undef,
+                                                                                new_data.key?(:banner) ? new_data[:banner] : :undef)))
     end
   end
 end

data/lib/onyxcord/models/role.rb

@@ -431,7 +431,7 @@ module OnyxCord
         }
       end
 
-      update_data(JSON.parse(REST::Server.update_role!(@bot.token, @server.id, @id, **data)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update_role!(@bot.token, @server.id, @id, **data)))
       nil
     end
 

data/lib/onyxcord/models/scheduled_event.rb

@@ -191,7 +191,7 @@ module OnyxCord
         builder[:recurrence_rule] = builder.to_h
       end
 
-      update_data(JSON.parse(REST::Server.update_scheduled_event(@bot.token, @server_id, @id, **data)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update_scheduled_event(@bot.token, @server_id, @id, **data)))
       nil
     end
 
@@ -207,7 +207,7 @@ module OnyxCord
     # Get the total amount of users who are subscribed to the scheduled event.
     # @return [Integer] The total amount of users who are currently subscribed to the scheduled event.
     def user_count
-      @user_count ||= JSON.parse(REST::Server.get_scheduled_event(@bot.token, @server_id, @id, with_user_count: true))['user_count']
+      @user_count ||= OnyxCord::Internal::JSON.parse(REST::Server.get_scheduled_event(@bot.token, @server_id, @id, with_user_count: true))['user_count']
     end
 
     alias_method :subscriber_count, :user_count
@@ -218,7 +218,7 @@ module OnyxCord
     # @return [Array<User, Member>] the users or members that have subscribed to the scheduled event.
     def users(limit: 100, member: false)
       get_users = proc do |fetch_limit, after = nil|
-        response = JSON.parse(REST::Server.get_scheduled_event_users(@bot.token, @server_id, @id, limit: fetch_limit, with_member: member, after: after))
+        response = OnyxCord::Internal::JSON.parse(REST::Server.get_scheduled_event_users(@bot.token, @server_id, @id, limit: fetch_limit, with_member: member, after: after))
         response.map { |data| data['member'] ? Member.new(data['member'], server, @bot).tap { |member| server&.cache_member(member) } : User.new(data['user'], @bot) }
       end