nakiircbot 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ee5e5b5a294eb86f735eddd3f8fe9e556dc8b630e77f03cc7b3be118f01d69
-  data.tar.gz: 2ee18ee0686a4a53a777f107846b538860d330b495c5294f1e0efd0612c1dbaa
+  metadata.gz: 58ddd0e5e6e4ba6390c88f5846cba690eef07e0d0797c20733a0513e191f8d45
+  data.tar.gz: ba40e4e00615a7c0c7c05b946606e54619eee7241c5c1f605bf5d0f56a9db416
 SHA512:
-  metadata.gz: cdf6b65b35360cb21889ef9969a2f166ad3e928a20ca128970b0b49734fd3a547a412f87280b112e675014a97bd906c7f7f6a0df3b9429ff6c0397f544400f5f
-  data.tar.gz: fe10d2e4c2966e00242f9f17b6fae3342250da520074afb6e5871d0f2d02c5a2aa8030197765855899d264d2bfdfd42950960b62dfac3fab25a5884fca9d7561
+  metadata.gz: 4a37e9868f86c9d2e335cb51180a8c583bf9ce9b4f61e44e778cf472aacddb79f917e6f6adf75db7c55b7bc68b221239a24944998042450653cb6fc3818e8777
+  data.tar.gz: e27684b814fb88ff2708e52bbaacb771b454c6a8e093cea5eb7d81ac8b37c0d2f4892988d351d952b62939ada17e12eaa5b79cfe89f5d18933b1ebcfb44ea0fa

data/lib/nakiircbot.rb

@@ -1,9 +1,9 @@
 module NakiIRCBot
-  # @@channels = []
-  # class << self
-  #   attr_accessor :channels
-  # end
-  def self.start server, port, bot_name, master_name, welcome001, *channels, password: nil, masterword: nil, processors: [], tags: false
+  class << self
+    attr_accessor :queue
+  end
+  self.queue = []
+  def self.start server, port, bot_name, master_name, welcome001, *channels, identity: nil, password: nil, masterword: nil, processors: [], tags: false
     # @@channels.replace channels.dup
 
     abort "matching bot_name and master_name may cause infinite recursion" if bot_name == master_name
@@ -34,31 +34,32 @@ module NakiIRCBot
         socket.send str + "\n", 0
       end
       # socket.send "PASS #{password.strip}\n", 0 if twitch
+      socket_send.call "CAP REQ :sasl" if password
       socket_send.call "NICK #{bot_name}"
       socket_send.call "USER #{bot_name} #{bot_name} #{bot_name} #{bot_name}" #unless twitch
 
-      queue = []
+      self.queue = []
       prev_socket_time = prev_privmsg_time = Time.now
       loop do
         begin
-          addr, msg = queue.shift
-          next unless addr && msg
-          addr = addr.codepoints.pack("U*")
+          addr, msg = self.queue.shift
+          next unless addr && msg   # TODO: how is it possible to have only one of them?
+          addr = addr.codepoints.pack("U*").tr("\x00\x0A\x0D", "")
           fail "I should not PRIVMSG myself" if addr == bot_name
-          msg = msg.to_s.codepoints.pack("U*").chomp[/[^\x01].*/m].gsub("\x00", "[NUL]").gsub("\x0A", "[LF]").gsub("\x0D", "[CR]")
-          privmsg = "PRIVMSG #{addr} :#{msg}"[0,513]
-          privmsg[-4..-1] = "..." until privmsg.bytesize <= 475   # Libera in fact cuts last ~31 bytes
+          msg = msg.to_s.codepoints.pack("U*").chomp[/^(\x01*)(.*)/m,2].gsub("\x00", "[NUL]").gsub("\x0A", "[LF]").gsub("\x0D", "[CR]")
+          privmsg = "PRIVMSG #{addr} :#{msg}"
+          privmsg[-4..-1] = "..." until privmsg.bytesize <= 475
           prev_socket_time = prev_privmsg_time = Time.now
           socket_send.call privmsg
           break
-        end until queue.empty? if prev_privmsg_time + 5 < Time.now
+        end until self.queue.empty? if prev_privmsg_time + 5 < Time.now || server == "localhost"
 
         unless _ = Kernel::select([socket], nil, nil, 1)
           break if Time.now - prev_socket_time > 300
           next
         end
         prev_socket_time = Time.now
-        socket_str = _[0][0].gets(chomp: true)
+        socket_str = _[0][0].gets chomp: true
         break unless socket_str
         str = socket_str.force_encoding("utf-8").scrub
         if /\A:\S+ 372 /.match? str   # MOTD
@@ -81,20 +82,26 @@ module NakiIRCBot
             # we join only when we are sure we are on the correct server
             # TODO: maybe abort if the server is wrong?
             next socket_send.call "JOIN #{channels.join ","}"
+
           when /\A:tmi.twitch.tv 001 #{Regexp.escape bot_name} :Welcome, GLHF!\z/
             socket_send.call "JOIN #{channels.join ","}"
             socket_send.call "CAP REQ :twitch.tv/membership twitch.tv/tags twitch.tv/commands"
             next
-          when /\A:NickServ!NickServ@services\. NOTICE #{Regexp.escape bot_name} :This nickname is registered. Please choose a different nickname, or identify via \x02\/msg NickServ identify <password>\x02\.\z/
+          when /\A:NickServ!NickServ@services\. NOTICE #{Regexp.escape bot_name} :This nickname is registered. Please choose a different nickname, or identify via \x02\/msg NickServ identify <password>\x02\.\z/,
+               /\A:NickServ!NickServ@services\.libera\.chat NOTICE #{Regexp.escape bot_name} :This nickname is registered. Please choose a different nickname, or identify via \x02\/msg NickServ IDENTIFY #{Regexp.escape bot_name} <password>\x02\z/
             abort "no password" unless password
             logger.info "password"
-            # next socket.send "PASS #{password.strip}\n", 0
             next socket.send "PRIVMSG NickServ :identify #{bot_name} #{password.strip}\n", 0
-          # TODO: get rid of this Libera hard code
-          when /\A:NickServ!NickServ@services\.libera\.chat NOTICE #{Regexp.escape bot_name} :This nickname is registered. Please choose a different nickname, or identify via \x02\/msg NickServ IDENTIFY #{Regexp.escape bot_name} <password>\x02\z/
-            abort "no password" unless password
+          # when /\A:[a-z]+\.libera\.chat CAP \* LS :/
+          #   next socket_send "CAP REQ :sasl" if $'.split.include? "sasl"
+          when /\A:[a-z]+\.libera\.chat CAP \* ACK :sasl\z/
+            next socket_send.call "AUTHENTICATE PLAIN"
+          when /\AAUTHENTICATE \+\z/
             logger.info "password"
-            next socket.send "PRIVMSG NickServ :identify #{bot_name} #{password.strip}\n", 0
+            next socket.send "AUTHENTICATE #{Base64.strict_encode64 "\0#{identity || bot_name}\0#{password}"}\n", 0
+          when /\A:[a-z]+\.libera\.chat 903 #{bot_name} :SASL authentication successful\z/
+            next socket_send.call "CAP END"
+
           when /\APING :/
             next socket.send "PONG :#{$'}\n", 0   # Quakenet uses timestamp, Freenode and Twitch use server name
           when /\A:([^!]+)!\S+ PRIVMSG #{Regexp.escape bot_name} :\x01VERSION\x01\z/
@@ -105,20 +112,20 @@ module NakiIRCBot
           #   socket_send.call "NOTICE",$1,"\001TIME 6:06:06, 6 Jun 06\001"
           when /\A#{'\S+ ' if tags}:(?<who>[^!]+)!\S+ PRIVMSG (?<where>\S+) :(?<what>.+)/
             next( if processors.empty?
-              queue.push [master_name, "nothing to reload"]
+              self.queue.push [master_name, "nothing to reload"]
             else
               processors.each do |processor|
-                queue.push [master_name, "reloading #{processor}"]
+                self.queue.push [master_name, "reloading #{processor}"]
                 load File.absolute_path processor
               end
             end ) if $~.named_captures == {"who"=>master_name, "where"=>bot_name, "what"=>"#{masterword.strip} reload"}
         end
 
         begin
-          yield str, ->(where, what){ queue.push [where, what] }
+          yield str, ->(where, what){ self.queue.push [where, what] }
         rescue => e
           puts e.full_message
-          queue.push [master_name, "yield error: #{e}"]
+          self.queue.push [master_name, "yield error: #{e}"]
         end
 
       rescue => e
@@ -128,7 +135,7 @@ module NakiIRCBot
           sleep 5
           break
         else
-          queue.push [master_name, "unhandled error: #{e}"]
+          self.queue.push [master_name, "unhandled error: #{e}"]
           sleep 5
         end
       end

data/nakiircbot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakiircbot"
-  spec.version      = "0.1.0"
+  spec.version      = "0.1.5"
   spec.summary      = "IRC bot framework"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.license      = "MIT"
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/nakiircbot"}
 
-  spec.required_ruby_version = ">=2.5"  # for Exception#full_message and block rescue
+  spec.required_ruby_version = ">=2.5"  # at least for Exception#full_message and block rescue
 
   spec.files        = %w{ LICENSE nakiircbot.gemspec lib/nakiircbot.rb }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nakiircbot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com