iirc 0.2.8 → 0.4.0

data/lib/iirc/sender.rb

@@ -1,7 +1,26 @@
 module IIRC
+  # A mixin which adds IRC hostmask introspection methods to strings.
+  #
+  # *CoolNick*, *:NickName*, <b>:nick!user@host</b>, *:server.name*, *another.server.name* forms are supported.
+  #
+  # A leading colon may be present in the string, and will be ignored.
+  #
+  # @example nick!user@example.com
+  #   sender = "nick!user@example.com".extend(IIRC::Sender)
+  #   sender.user? # => true
+  #   sender.host  # => "example.com"
+  # @example :irc.server
+  #   sender = ":irc.server".extend(IIRC::Sender)
+  #   sender.server? # => true
+  #   sender.host    # => "irc.server"
+  # @example JimBob
+  #   sender = "JimBob".extend(IIRC::Sender)
+  #   sender.user? # => true
+  #   sender.nick  # => "JimBob"
+
   module Sender
     def user
-      @user ||= User.from_sender(self)
+      @user ||= User.from_source(self)
     end
 
     def server?
@@ -14,16 +33,37 @@ module IIRC
 
     def nick; user&.nick end
     def username; user&.username end
-    def host; user&.host end
+    def host; server? ? without_leading_colon : user.host end
 
     def to_prefix
       ":#{self}"
     end
 
-    def to_s
+    def without_leading_colon
       delete_prefix(':')
     end
 
+    alias :to_s :without_leading_colon
     alias :inspect :to_prefix
   end
+
+  module_function
+    # Extends and returns a source string with the IIRC::Sender mixin.
+    # Duplicates first if the string is frozen. Returns nil if source is nil.
+    #
+    # @example :nick!user@host
+    #   v = IIRC.Sender(":JimmyWales!jim@wikipedia.org") # => "JimmyWales!jim@wikipedia.org"
+    #   v.nick    # => "JimmyWales"
+    #   v.host    # => "wikipedia.org"
+    #   v.user?   # => true
+    # @example server.name
+    #   IIRC.Sender("services.libera.chat").server? # => true
+
+    def Sender(source)
+      if source.nil?
+        nil
+      else
+        (source.frozen? ? source.dup : source).extend(Sender)
+      end
+    end
 end

data/lib/iirc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IIRC
-  VERSION = "0.2.8"
+  VERSION = "0.4.0"
 end

data/lib/iirc.rb

@@ -4,7 +4,10 @@ require_relative "iirc/event"
 require_relative "iirc/sender"
 require_relative "iirc/user"
 
+require_relative "iirc/numerics"
+
 require_relative "iirc/bot"
+require_relative "iirc/bot/accept_invites"
 require_relative "iirc/bot/ambient"
 require_relative "iirc/bot/autojoin"
 require_relative "iirc/bot/channels"
@@ -19,6 +22,7 @@ require_relative "iirc/bot/print_io"
 require_relative "iirc/bot/reading"
 require_relative "iirc/bot/redis"
 require_relative "iirc/bot/regex_hooks"
+require_relative "iirc/bot/reply_target"
 require_relative "iirc/bot/track_own_nick"
 require_relative "iirc/bot/verbs"
 
@@ -37,9 +41,14 @@ module IIRC
     include Configure
     include Pong
     include TrackOwnNick
+    include ReplyTarget
+
+    def self.run(host, port=6697, local_host: nil, local_port: nil, ssl_context: SSL.default_context, **user_params, &blk)
+      socket = IIRC.dial(host, port,
+        local_host: local_host, local_port: local_port,
+        ssl_context: ssl_context)
 
-    def self.run(host, port=6697, ssl_context: SSL.default_context, **user_params, &blk)
-      socket = IIRC.dial(host, port, ssl_context: ssl_context)
+      user_params[:nick] = self.name&.split('::').last if !user_params.key?(:nick)
 
       new(socket, **user_params).tap { |bot|
         bot.register!
@@ -62,7 +71,7 @@ module IIRC
     include Bot::Formatting
     include Bot::AutoJoin
     include Bot::Verbs
-    include Bot::AmbientVerbs
+    include Bot::Ambient
     include Bot::RegexHooks
   end
 
@@ -99,11 +108,13 @@ module IIRC
   end
 
   module_function
-    def dial(host, port=6697, ssl_context: SSL.default_context)
+    def dial(host, port=6697, local_host: nil, local_port: nil, ssl_context: SSL.default_context)
       require 'socket'
 
-      Socket.tcp(host, port).then { |socket|
+      Socket.tcp(host, port, local_host, local_port).then { |socket|
         if ssl_context
+          ssl_context = SSL.send(ssl_context) if ssl_context.is_a? Symbol
+
           OpenSSL::SSL::SSLSocket.new(socket, ssl_context).tap { |socket|
             socket.hostname = host
             socket.connect
@@ -117,4 +128,4 @@ end
 
 def IIRC(*args, **kwargs, &blk)
   Class.new(IIRC::Batteries, &blk)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iirc
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.4.0
 platform: ruby
 authors:
 - mooff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ircparser
@@ -46,6 +46,7 @@ files:
 - iirc.gemspec
 - lib/iirc.rb
 - lib/iirc/bot.rb
+- lib/iirc/bot/accept_invites.rb
 - lib/iirc/bot/ambient.rb
 - lib/iirc/bot/autojoin.rb
 - lib/iirc/bot/channels.rb
@@ -64,9 +65,11 @@ files:
 - lib/iirc/bot/reading.rb
 - lib/iirc/bot/redis.rb
 - lib/iirc/bot/regex_hooks.rb
+- lib/iirc/bot/reply_target.rb
 - lib/iirc/bot/track_own_nick.rb
 - lib/iirc/bot/verbs.rb
 - lib/iirc/event.rb
+- lib/iirc/numerics.rb
 - lib/iirc/sender.rb
 - lib/iirc/user.rb
 - lib/iirc/version.rb