onyxcord-webhooks 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808c218136e136121ada58d4cc381d5de4ccad0a1f20ffe702aeba26dc0dea3b
-  data.tar.gz: f2c44b0b21bd64ac2c2ab9e03569d455a2a400d653513af53f7904f61bd40749
+  metadata.gz: e982f78ebf7f9a4d5d617e1cbe254864ff1917315ad1cd276b19c0b984ba3970
+  data.tar.gz: b1d2f272611a9b979ebb11449a3c3933ae93cf8f4ffa9ced85e0f876664e61b6
 SHA512:
-  metadata.gz: 0c529bf0c135a5671367238e2a16070966cb3f1242018b9e8c6d1295028745ed3deb5f39099dfa0aafbb8647cd97ecb2d8334ec005378b5e8b1c02c04b5a8a36
-  data.tar.gz: f8827403f0533f267e7427b9f5a06235f7e9f215f0f55debef75415985fe070bac3c2e221d6602af2c97e1c88b3c9c1f3edab51cdd25431ca45299a5c787bcba
+  metadata.gz: 144cff3d1f4f0a8905e52c4d4fbe1355a0c7a2414075e922ee7b21661b75a908ff10e711259def51512e3121b6c6080c8d053e119021f3d3ced93233c706dea8
+  data.tar.gz: 81dc22284b71cc4dea50f7ed99428f0adfc88eee0d3e10c989caa743e28a10d3deb4a7e3f89a65fc61a3707bffae11d5d69885f1c06a86c604bf185fcf571d33

data/lib/onyxcord/webhooks/version.rb

@@ -4,6 +4,6 @@
 module OnyxCord
   module Webhooks
     # The current version of onyxcord-webhooks.
-    VERSION = '1.1.2'
+    VERSION = '1.1.4'
   end
 end

data/lib/onyxcord/webhooks/view.rb

@@ -279,7 +279,9 @@ class OnyxCord::Webhooks::View
     # @param url [String] An `attachment://<filename>` reference to the attached file.
     # @param id [Integer, nil] The unique 32-bit ID of the file component.
     # @param spoiler [true, false] Whether or not to apply a spoiler label to the file.
-    def initialize(url:, id: nil, spoiler: false)
+    def initialize(url = nil, id: nil, spoiler: false, **kwargs)
+      url = kwargs.fetch(:url, url)
+
       @id = id
       @file = { url: }
       @spoiler = spoiler
@@ -296,10 +298,12 @@ class OnyxCord::Webhooks::View
     # Create a media gallery component.
     # @param id [Integer, nil] The unique 32-bit ID of the media gallery component.
     # @yieldparam builder [MediaGalleryBuilder] Yields the initialized media gallery component.
-    def initialize(id: nil)
+    def initialize(*items, id: nil)
       @id = id
       @items = []
 
+      items.each { |item| self.item(item) }
+
       yield self if block_given?
     end
 
@@ -307,14 +311,32 @@ class OnyxCord::Webhooks::View
     # @param url [String] The URL to the gallery item's media.
     # @param description [String, nil] The description of the gallery item.
     # @param spoiler [true, false] Whether or not to apply a spoiler label to the gallery item.
-    def item(url:, description: nil, spoiler: false)
-      @items << { media: { url: }, description: description, spoiler: spoiler }.compact
+    def item(item = nil, url: nil, description: nil, spoiler: nil)
+      url, description, spoiler = normalize_item(item, url, description, spoiler)
+      raise ArgumentError, 'media gallery item requires a url' if url.nil? || url.to_s.empty?
+
+      @items << { media: { url: url }, description: description, spoiler: spoiler }.compact
     end
 
     # @!visibility private
     def to_h
       { type: COMPONENT_TYPES[:media_gallery], id: @id, items: @items }.compact
     end
+
+    private
+
+    def normalize_item(item, url, description, spoiler)
+      if item.is_a?(Hash)
+        media = item[:media] || item['media'] || {}
+        url ||= item[:url] || item['url'] || media[:url] || media['url']
+        description = item[:description] || item['description'] if description.nil?
+        spoiler = item[:spoiler] || item['spoiler'] if spoiler.nil?
+      else
+        url ||= item
+      end
+
+      [url, description, spoiler.nil? ? false : spoiler]
+    end
   end
 
   # A section allows you to group together an accessory with text display components.
@@ -425,8 +447,8 @@ class OnyxCord::Webhooks::View
 
     # Add a media gallery component to the container.
     # @see MediaGalleryBuilder#initialize
-    def media_gallery(...)
-      @components << MediaGalleryBuilder.new(...)
+    def media_gallery(*items, id: nil, &block)
+      @components << MediaGalleryBuilder.new(*items, id: id, &block)
     end
 
     # Set the color of the container.
@@ -547,8 +569,8 @@ class OnyxCord::Webhooks::View
 
   # Add a media gallery component to the view.
   # @see MediaGalleryBuilder#initialize
-  def media_gallery(id: nil, &block)
-    builder = MediaGalleryBuilder.new(id: id)
+  def media_gallery(*items, id: nil, &block)
+    builder = MediaGalleryBuilder.new(*items, id: id)
     @components << builder
     yield builder if block_given?
     builder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord-webhooks
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Gustavo Silva
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A webhook client for OnyxCord, a Ruby Discord library based on discordrb
   and updated with Components V2 support.
 email: