onyxcord 2.0.13 → 3.2.0

data/lib/onyxcord/{data → models}/profile.rb

@@ -70,10 +70,10 @@ module OnyxCord
 
     # @!visibility private
     def update_profile_data(new_data)
-      update_data(JSON.parse(API::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(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/{data → models}/role.rb

@@ -227,7 +227,7 @@ module OnyxCord
     # @param format ['webp', 'png', 'jpeg']
     # @return [String] URL to the icon on Discord's CDN.
     def icon_url(format = 'webp')
-      API.role_icon_url(@id, @icon, format) if @icon
+      REST.role_icon_url(@id, @icon, format) if @icon
     end
 
     # Get the icon that a role has displayed.
@@ -288,7 +288,7 @@ module OnyxCord
     # Deletes this role. This cannot be undone without recreating the role!
     # @param reason [String] the reason for this role's deletion
     def delete(reason = nil)
-      API::Server.delete_role(@bot.token, @server.id, @id, reason)
+      REST::Server.delete_role(@bot.token, @server.id, @id, reason)
       @server.delete_role(@id)
     end
 
@@ -308,17 +308,13 @@ module OnyxCord
     # @param reason [String, nil] The audit log reason to show for moving the role.
     # @return [Integer] The new position of the role.
     def move(bottom: nil, above: nil, below: nil, offset: 0, reason: nil)
-      if [bottom, above, below].count(&:itself) > 1
-        raise ArgumentError, "'bottom', 'above', and 'below' are mutually exclusive"
-      end
+      raise ArgumentError, "'bottom', 'above', and 'below' are mutually exclusive" if [bottom, above, below].count(&:itself) > 1
 
       if (above || below) && !(target = @server.role(above || below))
         raise ArgumentError, "The given 'above' or 'below' options are not valid"
       end
 
-      if (below && target&.id == @server.id) || (@id == target&.id)
-        raise ArgumentError, 'The target role that was provded is not valid'
-      end
+      raise ArgumentError, 'The target role that was provded is not valid' if (below && target&.id == @server.id) || (@id == target&.id)
 
       roles = @server.roles.sort_by { |role| [role.position, role.id] }
 
@@ -394,9 +390,7 @@ module OnyxCord
       permissions: :undef, reason: nil
     )
       if display_icon != :undef
-        if icon != :undef || unicode_emoji != :undef
-          raise ArgumentError, "'display_icon' is mutually exclusive with 'icon' and 'unicode_emoji'"
-        end
+        raise ArgumentError, "'display_icon' is mutually exclusive with 'icon' and 'unicode_emoji'" if icon != :undef || unicode_emoji != :undef
 
         if display_icon.nil?
           icon = nil
@@ -437,7 +431,7 @@ module OnyxCord
         }
       end
 
-      update_data(JSON.parse(API::Server.update_role!(@bot.token, @server.id, @id, **data)))
+      update_data(JSON.parse(REST::Server.update_role!(@bot.token, @server.id, @id, **data)))
       nil
     end
 

data/lib/onyxcord/{data → models}/scheduled_event.rb

@@ -93,7 +93,7 @@ module OnyxCord
     # @param size [Integer, nil] The URL will default to `4096`. You can otherwise specify any number that's a power of two to override this.
     # @return [String, nil] The URL to the scheduled event's cover image, or `nil` if the scheduled event doesn't have a cover image set.
     def cover_url(format: 'webp', size: 4096)
-      API.scheduled_event_cover_url(@id, @cover_id, format, size) if @cover_id
+      REST.scheduled_event_cover_url(@id, @cover_id, format, size) if @cover_id
     end
 
     # @!method scheduled?
@@ -191,7 +191,7 @@ module OnyxCord
         builder[:recurrence_rule] = builder.to_h
       end
 
-      update_data(JSON.parse(API::Server.update_scheduled_event(@bot.token, @server_id, @id, **data)))
+      update_data(JSON.parse(REST::Server.update_scheduled_event(@bot.token, @server_id, @id, **data)))
       nil
     end
 
@@ -199,7 +199,7 @@ module OnyxCord
     # @param reason [String, nil] The reason to show in the audit log for deleting the scheduled event.
     # @return [nil]
     def delete(reason: nil)
-      API::Server.delete_scheduled_event(@bot.token, @server_id, @id, reason: reason)
+      REST::Server.delete_scheduled_event(@bot.token, @server_id, @id, reason: reason)
       @server&.delete_scheduled_event(@id)
       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(API::Server.get_scheduled_event(@bot.token, @server_id, @id, with_user_count: true))['user_count']
+      @user_count ||= 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(API::Server.get_scheduled_event_users(@bot.token, @server_id, @id, limit: fetch_limit, with_member: member, after: after))
+        response = 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
 

data/lib/onyxcord/{data → models}/server.rb

@@ -14,7 +14,7 @@ module OnyxCord
     #   or `png` to override this.
     # @return [String, nil] The URL to the server's icon, or `nil` if the server hasn't set an icon.
     def icon_url(format: 'webp')
-      API.icon_url(@id, @icon_id, format) if @icon_id
+      REST.icon_url(@id, @icon_id, format) if @icon_id
     end
   end
 
@@ -172,7 +172,7 @@ module OnyxCord
     #  end
     # @return [Hash<Integer => Integer>] A hash mapping role IDs to their respective member counts.
     def role_member_counts
-      response = JSON.parse(API::Server.role_member_counts(@bot.token, @id))
+      response = JSON.parse(REST::Server.role_member_counts(@bot.token, @id))
       response.transform_keys!(&:to_i)
       response.tap { |hash| hash[@id] = @member_count }
     end
@@ -226,7 +226,7 @@ module OnyxCord
     # @return [Array<Integration>] an array of the integrations in this server.
     # @note If the server has more than 50 integrations, they cannot be accessed.
     def integrations
-      integration = JSON.parse(API::Server.integrations(@bot.token, @id))
+      integration = JSON.parse(REST::Server.integrations(@bot.token, @id))
       integration.map { |element| Integration.new(element, @bot, self) }
     end
 
@@ -241,14 +241,14 @@ module OnyxCord
       action = AuditLogs::ACTIONS.key(action)
       user = user.resolve_id if user
       before = before.resolve_id if before
-      AuditLogs.new(self, @bot, JSON.parse(API::Server.audit_logs(@bot.token, @id, limit, user, action, before)))
+      AuditLogs.new(self, @bot, JSON.parse(REST::Server.audit_logs(@bot.token, @id, limit, user, action, before)))
     end
 
     # @note For internal use only
     # @!visibility private
     def cache_widget_data(data = nil)
       data ||= if bot.permission?(:manage_server)
-                 JSON.parse(API::Server.widget(@bot.token, @id))
+                 JSON.parse(REST::Server.widget(@bot.token, @id))
                else
                  return update_data(nil)
                end
@@ -315,7 +315,7 @@ module OnyxCord
     def modify_widget(enabled, channel, reason = nil)
       cache_widget_data if @widget_enabled.nil?
       channel_id = channel ? channel.resolve_id : @widget_channel_id
-      cache_widget_data(JSON.parse(API::Server.modify_widget(@bot.token, @id, enabled, channel_id, reason)))
+      cache_widget_data(JSON.parse(REST::Server.modify_widget(@bot.token, @id, enabled, channel_id, reason)))
     end
     alias_method :modify_embed, :modify_widget
 
@@ -344,7 +344,7 @@ module OnyxCord
     def add_member_using_token(user, access_token, nick: nil, roles: [], deaf: false, mute: false)
       user_id = user.resolve_id
       roles = roles.is_a?(Array) ? roles.map(&:resolve_id) : [roles.resolve_id]
-      response = API::Server.add_member(@bot.token, @id, user_id, access_token, nick, roles, deaf, mute)
+      response = REST::Server.add_member(@bot.token, @id, user_id, access_token, nick, roles, deaf, mute)
       return nil if response.empty?
 
       add_member Member.new(JSON.parse(response), self, @bot)
@@ -357,7 +357,7 @@ module OnyxCord
     def prune_count(days)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = JSON.parse API::Server.prune_count(@bot.token, @id, days)
+      response = JSON.parse REST::Server.prune_count(@bot.token, @id, days)
       response['pruned']
     end
 
@@ -369,7 +369,7 @@ module OnyxCord
     def begin_prune(days, reason = nil)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = JSON.parse API::Server.begin_prune(@bot.token, @id, days, reason)
+      response = JSON.parse REST::Server.begin_prune(@bot.token, @id, days, reason)
       response['pruned']
     end
 
@@ -405,7 +405,7 @@ module OnyxCord
     def widget_url
       update_data if @widget_enabled.nil?
 
-      API.widget_url(@id) if @widget_enabled
+      REST.widget_url(@id) if @widget_enabled
     end
 
     # @param style [Symbol] The style the picture should have. Possible styles are:
@@ -419,7 +419,7 @@ module OnyxCord
     def widget_banner_url(style)
       update_data if @widget_enabled.nil?
 
-      API.widget_url(@id, style) if @widget_enabled
+      REST.widget_url(@id, style) if @widget_enabled
     end
 
     # Utility method to get a server's splash URL.
@@ -427,7 +427,7 @@ module OnyxCord
     #   override this.
     # @return [String, nil] The URL to the server's splash image, or `nil` if the server doesn't have a splash image.
     def splash_url(format: 'webp')
-      API.splash_url(@id, @splash_id, format) if @splash_id
+      REST.splash_url(@id, @splash_id, format) if @splash_id
     end
 
     # Utility method to get a server's banner URL.
@@ -435,14 +435,14 @@ module OnyxCord
     #   override this.
     # @return [String, nil] The URL to the server's banner image, or `nil` if the server doesn't have a banner image.
     def banner_url(format: 'webp')
-      API.banner_url(@id, @banner_id, format) if @banner_id
+      REST.banner_url(@id, @banner_id, format) if @banner_id
     end
 
     # Utility method to get a server's discovery splash URL.
     # @param format [String] The URL will default to `webp`. You can otherwise specify one of `jpg` or `png` to override this.
     # @return [String, nil] The URL to the server's discovery splash image, or `nil` if the server doesn't have a discovery splash image.
     def discovery_splash_url(format: 'webp')
-      API.discovery_splash_url(@id, @discovery_splash_id, format) if @discovery_splash_id
+      REST.discovery_splash_url(@id, @discovery_splash_id, format) if @discovery_splash_id
     end
 
     # @return [String] a URL that a user can use to navigate to this server in the client
@@ -581,7 +581,7 @@ module OnyxCord
       total = nil
 
       get_messages = lambda do |query|
-        data = JSON.parse(API::Server.search_messages(@bot.token, @id, **options, **query.compact))
+        data = JSON.parse(REST::Server.search_messages(@bot.token, @id, **options, **query.compact))
         total ||= data['total_results']
 
         data['threads']&.each do |thread|
@@ -636,7 +636,7 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def update_role_positions(role_positions, reason: nil)
-      response = JSON.parse(API::Server.update_role_positions(@bot.token, @id, role_positions, reason))
+      response = JSON.parse(REST::Server.update_role_positions(@bot.token, @id, role_positions, reason))
       response.each { |data| role(data['id'].to_i)&.update_data(data) }
     end
 
@@ -738,7 +738,7 @@ module OnyxCord
 
       permission_overwrites.map! { |e| e.is_a?(Overwrite) ? e.to_hash : e } if permission_overwrites.is_a?(Array)
       parent_id = parent.respond_to?(:resolve_id) ? parent.resolve_id : nil
-      response = API::Server.create_channel(@bot.token, @id, name, type, topic, bitrate, user_limit, permission_overwrites, parent_id, nsfw, rate_limit_per_user, position, reason)
+      response = REST::Server.create_channel(@bot.token, @id, name, type, topic, bitrate, user_limit, permission_overwrites, parent_id, nsfw, rate_limit_per_user, position, reason)
       Channel.new(JSON.parse(response), @bot)
     end
 
@@ -782,7 +782,7 @@ module OnyxCord
         icon = OnyxCord.encode64(display_icon)
       end
 
-      response = API::Server.create_role(@bot.token, @id, name, nil, hoist, mentionable, permissions&.to_s, reason, colours, icon, unicode_emoji)
+      response = REST::Server.create_role(@bot.token, @id, name, nil, hoist, mentionable, permissions&.to_s, reason, colours, icon, unicode_emoji)
 
       role = Role.new(JSON.parse(response), @bot, self)
       @roles[role.id] = role
@@ -797,7 +797,7 @@ module OnyxCord
     def add_emoji(name, image, roles = [], reason: nil)
       image = image.respond_to?(:read) ? OnyxCord.encode64(image) : image
 
-      data = JSON.parse(API::Server.add_emoji(@bot.token, @id, image, name, roles.map(&:resolve_id), reason))
+      data = JSON.parse(REST::Server.add_emoji(@bot.token, @id, image, name, roles.map(&:resolve_id), reason))
       new_emoji = Emoji.new(data, @bot, self)
       @emoji[new_emoji.id] = new_emoji
     end
@@ -806,7 +806,7 @@ module OnyxCord
     # @param emoji [Emoji, String, Integer] The emoji or emoji ID to be deleted.
     # @param reason [String] The reason the for the deletion of this emoji.
     def delete_emoji(emoji, reason: nil)
-      API::Server.delete_emoji(@bot.token, @id, emoji.resolve_id, reason)
+      REST::Server.delete_emoji(@bot.token, @id, emoji.resolve_id, reason)
     end
 
     # Changes the name and/or role whitelist of an emoji on this server.
@@ -817,7 +817,7 @@ module OnyxCord
     # @return [Emoji] The edited emoji.
     def edit_emoji(emoji, name: nil, roles: nil, reason: nil)
       emoji = @emoji[emoji.resolve_id]
-      data = JSON.parse(API::Server.edit_emoji(@bot.token, @id, emoji.resolve_id, name || emoji.name, (roles || emoji.roles).map(&:resolve_id), reason))
+      data = JSON.parse(REST::Server.edit_emoji(@bot.token, @id, emoji.resolve_id, name || emoji.name, (roles || emoji.roles).map(&:resolve_id), reason))
       new_emoji = Emoji.new(data, @bot, self)
       @emoji[new_emoji.id] = new_emoji
     end
@@ -842,7 +842,7 @@ module OnyxCord
     # @param limit [Integer] The maximum number of members between 1-1000 to return. Returns 1 member by default.
     # @return [Array<Member>, nil] An array of member objects that match the given parameters, or nil for no members.
     def search_members(name:, limit: nil)
-      response = JSON.parse(API::Server.search_guild_members(@bot.token, @id, name, limit))
+      response = JSON.parse(REST::Server.search_guild_members(@bot.token, @id, name, limit))
       return nil if response.empty?
 
       response.map { |mem| Member.new(mem, self, @bot) }
@@ -854,7 +854,7 @@ module OnyxCord
     # @param after_id [Integer] Consider only users after given user id.
     # @return [Array<ServerBan>] a list of banned users on this server and the reason they were banned.
     def bans(limit: nil, before_id: nil, after_id: nil)
-      response = JSON.parse(API::Server.bans(@bot.token, @id, limit, before_id, after_id))
+      response = JSON.parse(REST::Server.bans(@bot.token, @id, limit, before_id, after_id))
       response.map do |e|
         ServerBan.new(self, @bot.ensure_user(e['user']), e['reason'])
       end
@@ -875,7 +875,7 @@ module OnyxCord
       f_before = before.is_a?(Time) ? IDObject.synthesize(before) : before&.resolve_id
 
       get_bans = lambda do |before: nil, after: nil|
-        data = API::Server.bans(@bot.token, @id, f_limit, before&.id || f_before, after&.id || f_after)
+        data = REST::Server.bans(@bot.token, @id, f_limit, before&.id || f_before, after&.id || f_after)
         JSON.parse(data).map { |ban| ServerBan.new(self, @bot.ensure_user(ban['user']), ban['reason']) }
       end
 
@@ -902,14 +902,14 @@ module OnyxCord
                           message_seconds || 0
                         end
 
-      API::Server.ban_user!(@bot.token, @id, user.resolve_id, delete_messages, reason)
+      REST::Server.ban_user!(@bot.token, @id, user.resolve_id, delete_messages, reason)
     end
 
     # Unbans a previously banned user from this server.
     # @param user [User, String, Integer] The user to unban.
     # @param reason [String] The reason the user is being unbanned.
     def unban(user, reason = nil)
-      API::Server.unban_user(@bot.token, @id, user.resolve_id, reason)
+      REST::Server.unban_user(@bot.token, @id, user.resolve_id, reason)
     end
 
     # Ban up to 200 users from this server in one go.
@@ -922,7 +922,7 @@ module OnyxCord
 
       return ban(users.first, 0, message_seconds: message_seconds, reason: reason) if users.size == 1
 
-      response = API::Server.bulk_ban(@bot.token, @id, users.map(&:resolve_id), message_seconds, reason)
+      response = REST::Server.bulk_ban(@bot.token, @id, users.map(&:resolve_id), message_seconds, reason)
       BulkBan.new(JSON.parse(response), self, reason)
     end
 
@@ -930,7 +930,7 @@ module OnyxCord
     # @param user [User, String, Integer] The user to kick.
     # @param reason [String] The reason the user is being kicked.
     def kick(user, reason = nil)
-      API::Server.remove_member(@bot.token, @id, user.resolve_id, reason)
+      REST::Server.remove_member(@bot.token, @id, user.resolve_id, reason)
     end
 
     # Forcibly moves a user into a different voice channel.
@@ -938,12 +938,12 @@ module OnyxCord
     # @param user [User, String, Integer] The user to move.
     # @param channel [Channel, String, Integer, nil] The voice channel to move into. (If nil, the user is disconnected from the voice channel)
     def move(user, channel)
-      API::Server.update_member(@bot.token, @id, user.resolve_id, channel_id: channel&.resolve_id)
+      REST::Server.update_member(@bot.token, @id, user.resolve_id, channel_id: channel&.resolve_id)
     end
 
     # Leave the server.
     def leave
-      API::User.leave_server(@bot.token, @id)
+      REST::User.leave_server(@bot.token, @id)
     end
 
     # Sets the server's name.
@@ -958,7 +958,7 @@ module OnyxCord
 
       @available_voice_regions = {}
 
-      data = JSON.parse API::Server.regions(@bot.token, @id)
+      data = JSON.parse REST::Server.regions(@bot.token, @id)
       @available_voice_regions = data.map { |e| VoiceRegion.new e }
     end
 
@@ -971,7 +971,7 @@ module OnyxCord
     # Moves the server to another region. This will cause a voice interruption of at most a second.
     # @param region [String] The new region the server should be in.
     def region=(region)
-      update_data(JSON.parse(API::Server.update!(@bot.token, @id, region: region.to_s)))
+      update_data(JSON.parse(REST::Server.update!(@bot.token, @id, region: region.to_s)))
     end
 
     # Sets the server's icon.
@@ -1127,14 +1127,14 @@ module OnyxCord
     # Requests a list of Webhooks on the server.
     # @return [Array<Webhook>] webhooks on the server.
     def webhooks
-      webhooks = JSON.parse(API::Server.webhooks(@bot.token, @id))
+      webhooks = JSON.parse(REST::Server.webhooks(@bot.token, @id))
       webhooks.map { |webhook| Webhook.new(webhook, @bot) }
     end
 
     # Requests a list of Invites to the server.
     # @return [Array<Invite>] invites to the server.
     def invites
-      invites = JSON.parse(API::Server.invites(@bot.token, @id))
+      invites = JSON.parse(REST::Server.invites(@bot.token, @id))
       invites.map { |invite| Invite.new(invite, @bot) }
     end
 
@@ -1143,7 +1143,7 @@ module OnyxCord
     #   should be ignored and re-fetched via an HTTP request.
     # @return [Array<ScheduledEvent>] The scheduled events on the server.
     def scheduled_events(bypass_cache: false)
-      process_scheduled_events(JSON.parse(API::Server.list_scheduled_events(@bot.token, @id, with_user_count: true))) if bypass_cache
+      process_scheduled_events(JSON.parse(REST::Server.list_scheduled_events(@bot.token, @id, with_user_count: true))) if bypass_cache
 
       @scheduled_events.values
     end
@@ -1157,7 +1157,7 @@ module OnyxCord
       return @scheduled_events[id] if @scheduled_events[id]
       return nil unless request
 
-      event = JSON.parse(API::Server.get_scheduled_event(@bot.token, @id, id, with_user_count: true))
+      event = JSON.parse(REST::Server.get_scheduled_event(@bot.token, @id, id, with_user_count: true))
       scheduled_event = ScheduledEvent.new(event, self, @bot)
       @scheduled_events[scheduled_event.id] = scheduled_event
     rescue StandardError
@@ -1193,7 +1193,7 @@ module OnyxCord
         recurrence_rule: block_given? ? builder.to_h : recurrence_rule&.to_h
       }
 
-      event = JSON.parse(API::Server.create_scheduled_event(@bot.token, @id, **options, reason: reason))
+      event = JSON.parse(REST::Server.create_scheduled_event(@bot.token, @id, **options, reason: reason))
       scheduled_event = ScheduledEvent.new(event, self, @bot)
       @scheduled_events[scheduled_event.id] = scheduled_event
     end
@@ -1305,7 +1305,7 @@ module OnyxCord
           channel_id: widget_channel == :undef ? widget_channel : widget_channel&.resolve_id
         }
 
-        cache_widget_data(JSON.parse(API::Server.update_widget(@bot.token, @id, **widget_data, reason: reason)))
+        cache_widget_data(JSON.parse(REST::Server.update_widget(@bot.token, @id, **widget_data, reason: reason)))
       end
 
       if invites_disabled_until != :undef || dms_disabled_until != :undef
@@ -1314,12 +1314,12 @@ module OnyxCord
           invites_disabled_until: invites_disabled_until == :undef ? @invites_disabled_until&.iso8601 : invites_disabled_until&.iso8601
         }
 
-        process_incident_actions(JSON.parse(API::Server.update_incident_actions(@bot.token, @id, **incidents_data, reason: reason)))
+        process_incident_actions(JSON.parse(REST::Server.update_incident_actions(@bot.token, @id, **incidents_data, reason: reason)))
       end
 
       return unless data.any? { |_, value| value != :undef }
 
-      update_data(JSON.parse(API::Server.update!(@bot.token, @id, **data, reason: reason)))
+      update_data(JSON.parse(REST::Server.update!(@bot.token, @id, **data, reason: reason)))
       nil
     end
 
@@ -1327,7 +1327,7 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def update_data(new_data = nil)
-      new_data ||= JSON.parse(API::Server.resolve(@bot.token, @id))
+      new_data ||= JSON.parse(REST::Server.resolve(@bot.token, @id))
       @name = new_data['name']
       @icon_id = new_data['icon']
       @splash_id = new_data['splash']

data/lib/onyxcord/{data → models}/server_preview.rb

@@ -55,14 +55,14 @@ module OnyxCord
     # @param format [String] the URL will default to `webp`. You can otherwise specify one of `jpg` or `png` to override this.
     # @return [String, nil] the URL to the server's splash image, or `nil` if the server doesn't have a splash image.
     def splash_url(format = 'webp')
-      API.splash_url(@id, @splash_id, format) if @splash_id
+      REST.splash_url(@id, @splash_id, format) if @splash_id
     end
 
     # Utility method to get a server preview's discovery splash URL.
     # @param format [String] the URL will default to `webp`. You can otherwise specify one of `jpg` or `png` to override this.
     # @return [String, nil] the URL to the server's discovery splash image, or `nil` if the server doesn't have a discovery splash image.
     def discovery_splash_url(format = 'webp')
-      API.discovery_splash_url(@id, @discovery_splash_id, format) if @discovery_splash_id
+      REST.discovery_splash_url(@id, @discovery_splash_id, format) if @discovery_splash_id
     end
   end
 end

data/lib/onyxcord/{data → models}/team.rb

@@ -32,7 +32,7 @@ module OnyxCord
     # @param format [String] The URL will default to `webp`. You can otherwise specify one of `webp`, `jpg`, or `png` to override this.
     # @return [String, nil] the URL to the icon image (nil if no image is set).
     def icon_url(format = 'webp')
-      API.team_icon_url(@id, @icon_id, format) if @icon_id
+      REST.team_icon_url(@id, @icon_id, format) if @icon_id
     end
 
     # A member that has been invited to a team.

data/lib/onyxcord/{data → models}/user.rb

@@ -92,12 +92,12 @@ module OnyxCord
     # TODO: Maybe change this method again after discriminator removal ?
     def avatar_url(format = nil)
       unless @avatar_id
-        return API::User.default_avatar(@discriminator, legacy: true) if @discriminator && @discriminator != '0'
+        return REST::User.default_avatar(@discriminator, legacy: true) if @discriminator && @discriminator != '0'
 
-        return API::User.default_avatar(@id)
+        return REST::User.default_avatar(@id)
       end
 
-      API::User.avatar_url(@id, @avatar_id, format)
+      REST::User.avatar_url(@id, @avatar_id, format)
     end
 
     # @return [Integer] the public flags on a user's account
@@ -114,7 +114,7 @@ module OnyxCord
     # You can otherwise specify one of `webp`, `jpg`, `png`, or `gif` to override this.
     # @return [String, nil] the URL to the banner image or nil if the user doesn't have one.
     def banner_url(format = nil)
-      API::User.banner_url(@id, banner_id, format) if banner_id
+      REST::User.banner_url(@id, banner_id, format) if banner_id
     end
   end
 
@@ -193,7 +193,7 @@ module OnyxCord
     # @return [String, nil] the ID of this user's current banner, can be used to generate a banner URL.
     # @see #banner_url
     def banner_id
-      @banner_id ||= JSON.parse(API::User.resolve(@bot.token, @id))['banner']
+      @banner_id ||= JSON.parse(REST::User.resolve(@bot.token, @id))['banner']
     end
 
     # Set the user's username

data/lib/onyxcord/{data → models}/webhook.rb

@@ -2,7 +2,7 @@
 
 require 'onyxcord/webhooks/builder'
 require 'onyxcord/webhooks/view'
-require 'onyxcord/message_components'
+require 'onyxcord/internal/message_payload'
 
 module OnyxCord
   # A webhook on a server channel
@@ -95,9 +95,9 @@ module OnyxCord
     # @param reason [String] The reason the webhook is being deleted.
     def delete(reason = nil)
       if token?
-        API::Webhook.token_delete_webhook(@token, @id, reason)
+        REST::Webhook.token_delete_webhook(@token, @id, reason)
       else
-        API::Webhook.delete_webhook(@bot.token, @id, reason)
+        REST::Webhook.delete_webhook(@bot.token, @id, reason)
       end
     end
 
@@ -151,7 +151,7 @@ module OnyxCord
       components ||= view
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
 
-      resp = API::Webhook.token_execute_webhook(@token, @id, wait, data[:content], data[:username], data[:avatar_url], data[:tts], data[:file], data[:embeds], data[:allowed_mentions], flags, components.to_a)
+      resp = REST::Webhook.token_execute_webhook(@token, @id, wait, data[:content], data[:username], data[:avatar_url], data[:tts], data[:file], data[:embeds], data[:allowed_mentions], flags, components.to_a)
 
       Message.new(JSON.parse(resp), @bot) if wait
     end
@@ -161,7 +161,7 @@ module OnyxCord
     def delete_message(message)
       raise OnyxCord::Errors::UnauthorizedWebhook unless @token
 
-      API::Webhook.token_delete_message(@token, @id, message.resolve_id)
+      REST::Webhook.token_delete_message(@token, @id, message.resolve_id)
     end
 
     # Edit a message created by this webhook.
@@ -178,7 +178,7 @@ module OnyxCord
     def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, builder: nil, components: nil, flags: 0, has_components: false, components_v2: false)
       raise OnyxCord::Errors::UnauthorizedWebhook unless @token
 
-      params = { content: content, embeds: embeds, allowed_mentions: allowed_mentions }.compact
+      params = { allowed_mentions: allowed_mentions }.compact
 
       builder ||= Webhooks::Builder.new
       view ||= Webhooks::View.new
@@ -189,16 +189,18 @@ module OnyxCord
       components ||= view
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
 
-      resp = API::Webhook.token_edit_message(@token, @id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, nil, flags)
+      edit_content = content == OnyxCord::MessagePayload::KEEP || !content.nil? ? content : data[:content]
+      edit_embeds = embeds == OnyxCord::MessagePayload::KEEP || !embeds.nil? ? embeds : data[:embeds]
+      resp = REST::Webhook.token_edit_message(@token, @id, message.resolve_id, edit_content, edit_embeds, data[:allowed_mentions], components.to_a, nil, flags)
       Message.new(JSON.parse(resp), @bot)
     end
 
     # Utility function to get a webhook's avatar URL.
     # @return [String] the URL to the avatar image
     def avatar_url
-      return API::User.default_avatar(@id) unless @avatar
+      return REST::User.default_avatar(@id) unless @avatar
 
-      API::User.avatar_url(@id, @avatar)
+      REST::User.avatar_url(@id, @avatar)
     end
 
     # The `inspect` method is overwritten to give more useful output.
@@ -227,9 +229,9 @@ module OnyxCord
     def update_webhook(new_data)
       reason = new_data.delete(:reason)
       data = JSON.parse(if token?
-                          API::Webhook.token_update_webhook(@token, @id, new_data, reason)
+                          REST::Webhook.token_update_webhook(@token, @id, new_data, reason)
                         else
-                          API::Webhook.update_webhook(@bot.token, @id, new_data, reason)
+                          REST::Webhook.update_webhook(@bot.token, @id, new_data, reason)
                         end)
       # Only update cache if API call worked
       update_internal(data) if data['name']