onyxcord 2.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df2a03d17ca81fd7a31574dbb8f94a53fc18b602a87ccd77d8390c472bb8a89b
-  data.tar.gz: 970063416e35a36c1f1f8c97d706a9e6a4895b5d7c1ec44eb19ab1e923b0fdcc
+  metadata.gz: 8bfaa918dc2547c727fdfb9efb1bc4515448dfc0462fa08def060b249b3b8eb7
+  data.tar.gz: 182ba7a3c195c8d57db22ca1faf6e65260ad93450912342a8d65891c031ae1c1
 SHA512:
-  metadata.gz: 96fd63b818d4e7abcd493f747444692951ec8c2c45a17efdb7772ae5de0aee444f3a22dc410067b8585ad803baa300d52d54856dd3efeddd8938a207d0aa3037
-  data.tar.gz: 37d0a1e7c88edc3ced210a92a9bceefd9f980a9280f0802538efed8b4b0de17f92120924a1c2a0121a55d07a33aa9915a2cafca2b915f1630f47e4e7f3049828
+  metadata.gz: aaf98711f9cb28e4c0c15769e95c13cb834c9cb3bb8c25cb10219e3f524c9f7e7db04562ff8663628e467e4cbd60a431930ad96e5a70505753170ceec2872cbc
+  data.tar.gz: 5d9fa5dd930a3918e1cf8770cea07cbbeee77002edb1116277582e3d0c3292b9a561bfa87c1d240b10662b625100eb8b6fd7f7e5d421a1ec4a40b5d2df376621

data/lib/onyxcord/application_commands/command.rb

@@ -1,102 +1,9 @@
 # frozen_string_literal: true
 
+require 'onyxcord/interactions/internal/application_command'
+
 module OnyxCord
   module ApplicationCommands
-    class Command
-      attr_reader :name, :description, :type, :attributes, :options, :block
-
-      TYPES = {
-        chat_input: 1,
-        user: 2,
-        message: 3
-      }.freeze
-
-      def self.chat_input(name, description:, **attributes, &block)
-        new(name, description: description, type: :chat_input, **attributes, &block)
-      end
-
-      def self.user(name, **attributes, &block)
-        new(name, description: '', type: :user, **attributes, &block)
-      end
-
-      def self.message(name, **attributes, &block)
-        new(name, description: '', type: :message, **attributes, &block)
-      end
-
-      def initialize(name, description: '', type: :chat_input, **attributes, &block)
-        @name = name.to_s
-        @description = description
-        @type = type
-        @attributes = attributes
-        @options = []
-        @block = block
-        @executor = nil
-        @default_member_permissions = attributes[:default_member_permissions]
-        @nsfw = attributes[:nsfw]
-        @contexts = attributes[:contexts]
-      end
-
-      def parse(&block)
-        instance_eval(&block) if block
-        self
-      end
-
-      def execute(&block)
-        @executor = block
-      end
-
-      def call(context)
-        return unless @executor
-
-        @executor.call(context)
-      end
-
-      def to_h
-        data = {
-          name: @name,
-          type: TYPES[@type] || @type
-        }
-
-        data[:description] = @description if @type == :chat_input
-        data[:options] = @options.map(&:to_h) unless @options.empty?
-        data[:default_member_permissions] = @default_member_permissions if @default_member_permissions
-        data[:nsfw] = @nsfw if @nsfw
-        data[:contexts] = @contexts if @contexts
-
-        data
-      end
-
-      Option::OPTION_METHODS.each do |method_name, option_type|
-        define_method(method_name) do |name, description = '', **attrs, &blk|
-          opt = Option.new(name, description, option_type, **attrs, &blk)
-          @options << opt
-          opt
-        end
-      end
-
-      def subcommand(name, description, &block)
-        sub = Option.new(name, description, :subcommand, &block)
-        @options << sub
-        sub
-      end
-
-      def subcommand_group(name, description, &block)
-        group = Option.new(name, description, :subcommand_group, &block)
-        @options << group
-        group
-      end
-
-      def method_missing(method_name, *args, **kwargs, &block)
-        if @block && @block.arity.positive?
-          @block.call(Context::Proxy.new(self, method_name, args, kwargs, block))
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method_name, include_private = false)
-        true
-      end
-    end
+    Command = Interactions::Command
   end
-end
+end

data/lib/onyxcord/application_commands/context.rb

@@ -1,99 +1,9 @@
 # frozen_string_literal: true
 
+require 'onyxcord/interactions/context'
+
 module OnyxCord
   module ApplicationCommands
-    class Context
-      attr_reader :event, :command
-
-      def initialize(event, command)
-        @event = event
-        @command = command
-      end
-
-      def bot
-        event.bot
-      end
-
-      def user
-        event.user
-      end
-
-      def member
-        event.user
-      end
-
-      def guild
-        event.server
-      end
-
-      def guild_id
-        event.server_id
-      end
-
-      def channel
-        event.channel
-      end
-
-      def channel_id
-        event.channel_id
-      end
-
-      def server
-        event.server
-      end
-
-      def server_id
-        event.server_id
-      end
-
-      def options
-        return {} unless event.data
-
-        if event.data['options']
-          result = {}
-          event.data['options'].each do |opt|
-            key = opt['name'].to_sym
-            result[key] = opt['value']
-          end
-          result
-        else
-          {}
-        end
-      end
-
-      def respond(...)
-        event.respond(...)
-      end
-
-      def defer(...)
-        event.defer(...)
-      end
-
-      def edit_original(...)
-        event.edit_response(...)
-      end
-
-      def delete_original
-        event.delete_response
-      end
-
-      def followup(...)
-        event.send_message(...)
-      end
-
-      class Proxy
-        def initialize(command, method_name, args, kwargs, block)
-          @command = command
-          @method_name = method_name
-          @args = args
-          @kwargs = kwargs
-          @block = block
-        end
-
-        def to_h
-          {}
-        end
-      end
-    end
+    Context = Interactions::Context
   end
-end
+end

data/lib/onyxcord/application_commands/option.rb

@@ -1,80 +1,9 @@
 # frozen_string_literal: true
 
+require 'onyxcord/interactions/option'
+
 module OnyxCord
   module ApplicationCommands
-    class Option
-      attr_reader :name, :description, :type, :attributes, :options
-
-      OPTION_TYPES = {
-        subcommand: 1,
-        subcommand_group: 2,
-        string: 3,
-        integer: 4,
-        boolean: 5,
-        user: 6,
-        channel: 7,
-        role: 8,
-        mentionable: 9,
-        number: 10,
-        attachment: 11
-      }.freeze
-
-      OPTION_METHODS = OPTION_TYPES.each_with_object({}) do |(name, value), hash|
-        next if %i[subcommand subcommand_group].include?(name)
-
-        hash[name] = value
-      end.freeze
-
-      def initialize(name, description, type, **attributes, &block)
-        @name = name.to_s
-        @description = description
-        @type = type
-        @attributes = attributes
-        @options = []
-        @block = block
-
-        instance_eval(&@block) if @block && type == :subcommand
-      end
-
-      def to_h
-        data = {
-          name: @name,
-          description: @description,
-          type: OPTION_TYPES[@type] || @type
-        }
-
-        data[:required] = @attributes[:required] unless @attributes[:required].nil?
-        data[:min_length] = @attributes[:min_length] if @attributes[:min_length]
-        data[:max_length] = @attributes[:max_length] if @attributes[:max_length]
-        data[:min_value] = @attributes[:min_value] if @attributes[:min_value]
-        data[:max_value] = @attributes[:max_value] if @attributes[:max_value]
-        data[:autocomplete] = @attributes[:autocomplete] unless @attributes[:autocomplete].nil?
-        data[:channel_types] = @attributes[:channel_types] if @attributes[:channel_types]
-
-        if @attributes[:choices]
-          data[:choices] = @attributes[:choices].map do |name, value|
-            { name: name.to_s, value: value }
-          end
-        end
-
-        data[:options] = @options.map(&:to_h) unless @options.empty?
-
-        data
-      end
-
-      def subcommand(name, description, **attrs, &block)
-        sub = Option.new(name, description, :subcommand, **attrs, &block)
-        @options << sub
-        sub
-      end
-
-      OPTION_METHODS.each do |method_name, option_type|
-        define_method(method_name) do |name, description = '', **attrs, &blk|
-          opt = Option.new(name, description, option_type, **attrs, &blk)
-          @options << opt
-          opt
-        end
-      end
-    end
+    Option = Interactions::Option
   end
-end
+end

data/lib/onyxcord/application_commands/registry.rb

@@ -1,50 +1,9 @@
 # frozen_string_literal: true
 
+require 'onyxcord/interactions/registry'
+
 module OnyxCord
   module ApplicationCommands
-    class Registry
-      attr_reader :bot, :commands
-
-      def initialize(bot)
-        @bot = bot
-        @commands = {}
-      end
-
-      def slash(name, description:, **attributes, &block)
-        register(Command.chat_input(name, description: description, **attributes, &block))
-      end
-
-      def user(name, **attributes, &block)
-        register(Command.user(name, **attributes, &block))
-      end
-
-      def message(name, **attributes, &block)
-        register(Command.message(name, **attributes, &block))
-      end
-
-      def register(command)
-        @commands[command.name] = command
-        wire_handler(command)
-        command
-      end
-
-      def sync!(server_id: nil, delete_unknown: false)
-        payload = @commands.values.map(&:to_h)
-
-        if server_id
-          @bot.bulk_overwrite_guild_application_commands(server_id, payload)
-        else
-          @bot.bulk_overwrite_global_application_commands(payload)
-        end
-      end
-
-      private
-
-      def wire_handler(command)
-        @bot.application_command(command.name) do |event|
-          command.call(Context.new(event, command))
-        end
-      end
-    end
+    Registry = Interactions::Registry
   end
-end
+end

data/lib/onyxcord/application_commands.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-require 'onyxcord/application_commands/option'
-require 'onyxcord/application_commands/command'
-require 'onyxcord/application_commands/context'
-require 'onyxcord/application_commands/registry'
+require 'onyxcord/interactions'
 
 module OnyxCord
   module ApplicationCommands
+    Command = Interactions::Command
+    Option = Interactions::Option
+    Context = Interactions::Context
+    Registry = Interactions::Registry
+    OptionBuilder = Interactions::OptionBuilder
+    PermissionBuilder = Interactions::PermissionBuilder
   end
-end
+end