onyxcord 2.0.13 → 3.2.0

data/lib/onyxcord/events/invite/delete.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/generic'
+
+module OnyxCord::Events
+  # Raised when an invite is deleted.
+  class InviteDeleteEvent < Event
+    # @return [Channel] The channel the deleted invite was for.
+    attr_reader :channel
+
+    # @return [Server, nil] The server the deleted invite was for.
+    attr_reader :server
+
+    # @return [String] The code of the deleted invite.
+    attr_reader :code
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+      @channel = bot.channel(data['channel_id'])
+      @server = bot.server(data['guild_id']) if data['guild_id']
+      @code = data['code']
+    end
+  end
+
+  # Event handler for InviteDeleteEvent
+  class InviteDeleteEventHandler < EventHandler
+    def matches?(event)
+      return false unless event.is_a? InviteDeleteEvent
+
+      [
+        matches_all(@attributes[:server], event.server) do |a, e|
+          a == case a
+               when String
+                 e.name
+               when Integer
+                 e.id
+               else
+                 e
+               end
+        end,
+        matches_all(@attributes[:channel], event.channel) do |a, e|
+          a == case a
+               when String
+                 e.name
+               when Integer
+                 e.id
+               else
+                 e
+               end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/onyxcord/events/invites.rb

@@ -1,127 +1,4 @@
 # frozen_string_literal: true
 
-module OnyxCord::Events
-  # Raised when an invite is created.
-  class InviteCreateEvent < Event
-    # @return [Invite] The invite that was created.
-    attr_reader :invite
-
-    # @return [Server, nil] The server the invite was created for.
-    attr_reader :server
-
-    # @return [Channel] The channel the invite was created for.
-    attr_reader :channel
-
-    # @!attribute [r] code
-    #   @return [String] The code for the created invite.
-    #   @see Invite#code
-    # @!attribute [r] created_at
-    #   @return [Time] The time the invite was created at.
-    #   @see Invite#created_at
-    # @!attribute [r] max_age
-    #   @return [Integer] The maximum age of the created invite.
-    #   @see Invite#max_age
-    # @!attribute [r] max_uses
-    #   @return [Integer] The maximum number of uses before the invite expires.
-    #   @see Invite#max_uses
-    # @!attribute [r] temporary
-    #   @return [true, false] Whether or not this invite grants temporary membership.
-    #   @see Invite#temporary
-    # @!attribute [r] inviter
-    #   @return [User] The user that created the invite.
-    #   @see Invite#inviter
-    delegate :code, :created_at, :max_age, :max_uses, :temporary, :inviter, to: :invite
-
-    alias temporary? temporary
-
-    # @!visibility private
-    def initialize(data, invite, bot)
-      @bot = bot
-      @invite = invite
-      @channel = bot.channel(data['channel_id'])
-      @server = bot.server(data['guild_id']) if data['guild_id']
-    end
-  end
-
-  # Raised when an invite is deleted.
-  class InviteDeleteEvent < Event
-    # @return [Channel] The channel the deleted invite was for.
-    attr_reader :channel
-
-    # @return [Server, nil] The server the deleted invite was for.
-    attr_reader :server
-
-    # @return [String] The code of the deleted invite.
-    attr_reader :code
-
-    # @!visibility private
-    def initialize(data, bot)
-      @bot = bot
-      @channel = bot.channel(data['channel_id'])
-      @server = bot.server(data['guild_id']) if data['guild_id']
-      @code = data['code']
-    end
-  end
-
-  # Event handler for InviteCreateEvent.
-  class InviteCreateEventHandler < EventHandler
-    def matches?(event)
-      return false unless event.is_a? InviteCreateEvent
-
-      [
-        matches_all(@attributes[:server], event.server) do |a, e|
-          a == case a
-               when String
-                 e.name
-               when Integer
-                 e.id
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:channel], event.channel) do |a, e|
-          a == case a
-               when String
-                 e.name
-               when Integer
-                 e.id
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:temporary], event.temporary?, &:==),
-        matches_all(@attributes[:inviter], event.inviter, &:==)
-      ].reduce(true, &:&)
-    end
-  end
-
-  # Event handler for InviteDeleteEvent
-  class InviteDeleteEventHandler < EventHandler
-    def matches?(event)
-      return false unless event.is_a? InviteDeleteEvent
-
-      [
-        matches_all(@attributes[:server], event.server) do |a, e|
-          a == case a
-               when String
-                 e.name
-               when Integer
-                 e.id
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:channel], event.channel) do |a, e|
-          a == case a
-               when String
-                 e.name
-               when Integer
-                 e.id
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'onyxcord/events/invite/create'
+require 'onyxcord/events/invite/delete'

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/generic'
+
+module OnyxCord::Events
+  # Common superclass for all lifetime events
+  class LifetimeEvent < Event
+    # @!visibility private
+    def initialize(bot)
+      @bot = bot
+    end
+  end
+
+  # @see OnyxCord::EventContainer#ready
+  class ReadyEvent < LifetimeEvent; end
+
+  # Event handler for {ReadyEvent}
+  class ReadyEventHandler < TrueEventHandler; end
+
+  # @see OnyxCord::EventContainer#disconnected
+  class DisconnectEvent < LifetimeEvent; end
+
+  # Event handler for {DisconnectEvent}
+  class DisconnectEventHandler < TrueEventHandler; end
+
+  # @see OnyxCord::EventContainer#heartbeat
+  class HeartbeatEvent < LifetimeEvent; end
+
+  # Event handler for {HeartbeatEvent}
+  class HeartbeatEventHandler < TrueEventHandler; end
+end

data/lib/onyxcord/events/lifetime.rb

@@ -1,31 +1,3 @@
 # frozen_string_literal: true
 
-require 'onyxcord/events/generic'
-
-module OnyxCord::Events
-  # Common superclass for all lifetime events
-  class LifetimeEvent < Event
-    # @!visibility private
-    def initialize(bot)
-      @bot = bot
-    end
-  end
-
-  # @see OnyxCord::EventContainer#ready
-  class ReadyEvent < LifetimeEvent; end
-
-  # Event handler for {ReadyEvent}
-  class ReadyEventHandler < TrueEventHandler; end
-
-  # @see OnyxCord::EventContainer#disconnected
-  class DisconnectEvent < LifetimeEvent; end
-
-  # Event handler for {DisconnectEvent}
-  class DisconnectEventHandler < TrueEventHandler; end
-
-  # @see OnyxCord::EventContainer#heartbeat
-  class HeartbeatEvent < LifetimeEvent; end
-
-  # Event handler for {HeartbeatEvent}
-  class HeartbeatEventHandler < TrueEventHandler; end
-end
+require 'onyxcord/events/lifetime/base'

data/lib/onyxcord/events/member/add.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/member/base'
+
+module OnyxCord::Events
+  # Member joins
+  # @see OnyxCord::EventContainer#member_join
+  class ServerMemberAddEvent < ServerMemberEvent; end
+
+  # Event handler for {ServerMemberAddEvent}
+  class ServerMemberAddEventHandler < ServerMemberEventHandler; end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/generic'
+require 'onyxcord/models'
+
+module OnyxCord::Events
+  # Generic subclass for server member events (add/update/delete)
+  class ServerMemberEvent < Event
+    # @return [Member] the member in question.
+    attr_reader :user
+    alias_method :member, :user
+
+    # @return [Array<Role>] the member's roles.
+    attr_reader :roles
+
+    # @return [Server] the server on which the event happened.
+    attr_reader :server
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+
+      @server = bot.server(data['guild_id'].to_i)
+      return unless @server
+
+      init_user(data, bot)
+      init_roles(data, bot)
+    end
+
+    private
+
+    # @!visibility private
+    def init_user(data, _)
+      user_id = data['user']['id'].to_i
+      @user = @server.member(user_id)
+    end
+
+    # @!visibility private
+    def init_roles(data, _)
+      @roles = [@server.role(@server.id)]
+      return unless data['roles']
+
+      data['roles'].each do |element|
+        role_id = element.to_i
+        @roles << @server.roles.find { |r| r.id == role_id }
+      end
+    end
+  end
+
+  # Generic event handler for member events
+  class ServerMemberEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? ServerMemberEvent
+
+      [
+        matches_all(@attributes[:username], event.user.name) do |a, e|
+          a == if a.is_a? String
+                 e.to_s
+               else
+                 e
+               end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/onyxcord/events/member/delete.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/member/base'
+
+module OnyxCord::Events
+  # Member leaves
+  # @see OnyxCord::EventContainer#member_leave
+  class ServerMemberDeleteEvent < ServerMemberEvent
+    # @!visibility private
+    # @note Override init_user to account for the deleted user on the server
+    def init_user(data, bot)
+      @user = OnyxCord::User.new(data['user'], bot)
+    end
+
+    # @return [User] the user in question.
+    attr_reader :user
+  end
+
+  # Event handler for {ServerMemberDeleteEvent}
+  class ServerMemberDeleteEventHandler < ServerMemberEventHandler; end
+end

data/lib/onyxcord/events/member/update.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'onyxcord/events/member/base'
+
+module OnyxCord::Events
+  # Member is updated (roles added or deleted)
+  # @see OnyxCord::EventContainer#member_update
+  class ServerMemberUpdateEvent < ServerMemberEvent
+    # @!visibility private
+    # @note Override init_user so we don't make requests all the time on large servers
+    def init_user(data, _)
+      @user_id = data['user']['id']
+    end
+
+    # @return [Member] the member in question.
+    def user
+      @server&.member(@user_id)
+    end
+
+    alias_method :member, :user
+  end
+
+  # Event handler for {ServerMemberUpdateEvent}
+  class ServerMemberUpdateEventHandler < ServerMemberEventHandler; end
+end

data/lib/onyxcord/events/members.rb

@@ -1,110 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/events/generic'
-require 'onyxcord/data'
-
-module OnyxCord::Events
-  # Generic subclass for server member events (add/update/delete)
-  class ServerMemberEvent < Event
-    # @return [Member] the member in question.
-    attr_reader :user
-    alias_method :member, :user
-
-    # @return [Array<Role>] the member's roles.
-    attr_reader :roles
-
-    # @return [Server] the server on which the event happened.
-    attr_reader :server
-
-    # @!visibility private
-    def initialize(data, bot)
-      @bot = bot
-
-      @server = bot.server(data['guild_id'].to_i)
-      return unless @server
-
-      init_user(data, bot)
-      init_roles(data, bot)
-    end
-
-    private
-
-    # @!visibility private
-    def init_user(data, _)
-      user_id = data['user']['id'].to_i
-      @user = @server.member(user_id)
-    end
-
-    # @!visibility private
-    def init_roles(data, _)
-      @roles = [@server.role(@server.id)]
-      return unless data['roles']
-
-      data['roles'].each do |element|
-        role_id = element.to_i
-        @roles << @server.roles.find { |r| r.id == role_id }
-      end
-    end
-  end
-
-  # Generic event handler for member events
-  class ServerMemberEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ServerMemberEvent
-
-      [
-        matches_all(@attributes[:username], event.user.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-
-  # Member joins
-  # @see OnyxCord::EventContainer#member_join
-  class ServerMemberAddEvent < ServerMemberEvent; end
-
-  # Event handler for {ServerMemberAddEvent}
-  class ServerMemberAddEventHandler < ServerMemberEventHandler; end
-
-  # Member is updated (roles added or deleted)
-  # @see OnyxCord::EventContainer#member_update
-  class ServerMemberUpdateEvent < ServerMemberEvent
-    # @!visibility private
-    # @note Override init_user so we don't make requests all the time on large servers
-    def init_user(data, _)
-      @user_id = data['user']['id']
-    end
-
-    # @return [Member] the member in question.
-    def user
-      @server&.member(@user_id)
-    end
-
-    alias_method :member, :user
-  end
-
-  # Event handler for {ServerMemberUpdateEvent}
-  class ServerMemberUpdateEventHandler < ServerMemberEventHandler; end
-
-  # Member leaves
-  # @see OnyxCord::EventContainer#member_leave
-  class ServerMemberDeleteEvent < ServerMemberEvent
-    # @!visibility private
-    # @note Override init_user to account for the deleted user on the server
-    def init_user(data, bot)
-      @user = OnyxCord::User.new(data['user'], bot)
-    end
-
-    # @return [User] the user in question.
-    attr_reader :user
-  end
-
-  # Event handler for {ServerMemberDeleteEvent}
-  class ServerMemberDeleteEventHandler < ServerMemberEventHandler; end
-end
+require 'onyxcord/events/member/base'
+require 'onyxcord/events/member/add'
+require 'onyxcord/events/member/update'
+require 'onyxcord/events/member/delete'