onyxcord 4.0.0.beta.3 → 4.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901e2f688c9dbdba460be0bc9ca04241d8e8d941a956456e43b7169936f9986d
-  data.tar.gz: b3e2fedd82bf7611f6db22fd7545c33ba6d6ad28356ceb25b3f8dbe00958a507
+  metadata.gz: 8c1aef8e235629f3e51f37d82e63ef079cf50a6f88366cc2d97baa4db0db55a2
+  data.tar.gz: cf28816af87907143044fa3c58e8a0f1766270d6683da28cd172dc04d450cf45
 SHA512:
-  metadata.gz: c6d0ad6d5d2f001a0812247dc63848785f576ec095301984e73d6e35cbfa2b4abf37cad7b0194e13226ee565add9b3b2f3a5a163cd2c6d821aa22afc8cb8e46a
-  data.tar.gz: ad0d421321d472b94c254347ca48931921fbe4c8e9bc7a27c9d622c7af5a3ba0e98b1e47c5ec950ae6aedd470ccb3a2344ab41bee482f9d0cca405b7e6550ca0
+  metadata.gz: fa754a8ea4ef26e1a8dbd77d463df3b41f22b2265579ac9fb0c9f592abd96e39ead4c0bd39877be04c3f96749e0afcaf77420dcd25b3ffd579f9cafd0a564058
+  data.tar.gz: fc089a83c0bb67875b4252de1f841f1a170f661c7f2aef70a1efe7943e7b327b06c2747ec3692a62648e64b20eea02b50721722ca10ff42520d8bf15f70d61a3

data/lib/onyxcord/core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnyxCord
-  VERSION = '4.0.0.beta.3'
+  VERSION = '4.0.0.beta.5'
 end

data/lib/onyxcord/events/message/base.rb

@@ -9,19 +9,28 @@ module OnyxCord::Events
     # @return [Channel] the channel in which this event occurred
     attr_reader :channel
 
-    # Sends a message to the channel this message was sent in, right now. It is usually preferable to use {#<<} instead
-    # because it avoids rate limiting problems
-    # @param content [String] The message to send to the channel
-    # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
-    # @param embed [Hash, OnyxCord::Webhooks::Embed, nil] The rich embed to append to this message.
-    # @param attachments [Array<File>] Files that can be referenced in embeds via `attachment://file.png`
-    # @param allowed_mentions [Hash, OnyxCord::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
-    # @param message_reference [Message, String, Integer, nil] The message, or message ID, to reply to if any.
-    # @param components [View, Array<Hash>, nil] A collection of components to attach to the message.
-    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2), SUPPRESS_NOTIFICATIONS (1 << 12), and IS_COMPONENTS_V2 (1 << 15) can be set.
+    # Sends a message to the channel this message was sent in, right now.
+    # Supports both positional and keyword arguments:
+    #
+    #   event.send_message('Hello')
+    #   event.send_message('Hello', false, { title: 'Hi' })
+    #   event.send_message('Hello', embed: { title: 'Hi' })
+    #   event.send_message(embed: { title: 'Hi' })
+    #
     # @return [OnyxCord::Message] the message that was sent
-    def send_message(content, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, message_reference = nil, components = nil, flags = 0)
-      channel.send_message(content, tts, embed, attachments, allowed_mentions, message_reference, components, flags)
+    def send_message(content = nil, tts = false, embed = nil, attachments = nil,
+                     allowed_mentions = nil, message_reference = nil,
+                     components = nil, flags = 0,
+                     embeds: nil, **_kwargs)
+      # Support keyword args: event.send_message('text', embed: { ... })
+      embeds = Array(embed) if embed && !embeds
+      embeds ||= []
+
+      # Use first embed for backward-compatible positional API
+      first_embed = embeds.first
+
+      channel.send_message(content || '', tts, first_embed, attachments,
+                           allowed_mentions, message_reference, components, flags)
     end
 
     # The same as {#send_message}, but yields a {Webhooks::Embed} for easy building of embedded content inside a block.

data/lib/onyxcord/interactions/internal/message.rb

@@ -143,6 +143,9 @@ module OnyxCord
 
       alias_method :message, :to_message
 
+      # Discord.js-compatible aliases
+      alias reply respond
+
       # @!visibility private
       def inspect
         "<Interaction::Message content=#{@content.inspect} embeds=#{@embeds.inspect} channel_id=#{@channel_id} server_id=#{@server_id} author=#{@author.inspect}>"

data/lib/onyxcord/models/interaction.rb

@@ -325,6 +325,16 @@ module OnyxCord
     alias delete_original delete_response
     alias followup send_message
 
+    # Discord.js-compatible aliases
+    alias reply respond
+    alias deferReply defer
+    alias editReply edit_response
+    alias deleteReply delete_response
+    alias followUp send_message
+    alias update update_message
+    alias deferUpdate defer_update
+    alias showModal show_modal
+
     # @param message [String, Integer, InteractionMessage, Message] The message created by this interaction to be edited.
     # @param content [String] The message content.
     # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.3
+  version: 4.0.0.beta.5
 platform: ruby
 authors:
 - Gustavo Silva