nakiircbot 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e6b769a530d14c8ec9a913a753d43d024abed583003e450c98fa8001bd9e65
-  data.tar.gz: 716cd2ebaaed6f05a3464d5834876e189f5cdfe99c91faf6426dada6b9a7c0fb
+  metadata.gz: 0a730c87c3b3d41670bf1a9b3be778c01ec4e92e66c996fc9673876b9ae3bced
+  data.tar.gz: b3aef7375122b38a2c352d746962b629200fe32d99648dd2d4ffe1e144a8d6e1
 SHA512:
-  metadata.gz: 25c03c973d93b85f7d722893fee1f806396bcaa1a56da028ce0b634f6e9f6b2f802234a4d85c6991a3905b18544f4f8ec0910ca72431c46e03d6b34578442c36
-  data.tar.gz: 31a6a42f98e43b8b11592abe5696305284c8413c2dc8acd212d7771bbf020b513ca9406a17f1a5db5e4659056ec81d177e36eb3a041b6af46ce895d3a35aa3d4
+  metadata.gz: e786766517a178e20a3de5eed2f1eeb51803eb9cc5b2bcfdf209a1de072509e57bad069289321f5a154fcf797483b2cca62ec8cff193b4697c41e7f741e2638c
+  data.tar.gz: 11ff7989502f426d5f3f8ba0fbe04d8f6dfad87b2fec57f8c991eece8be31a3c8b6496cc663f2105fe611ebff5ecb5a52782167cf63e751d2cd62db22bafe27d

data/lib/nakiircbot.rb

@@ -34,6 +34,7 @@ module NakiIRCBot
         socket.send str + "\n", 0
       end
       # socket.send "PASS #{password.strip}\n", 0 if twitch
+      socket_send.call "CAP REQ :sasl"
       socket_send.call "NICK #{bot_name}"
       socket_send.call "USER #{bot_name} #{bot_name} #{bot_name} #{bot_name}" #unless twitch
 
@@ -42,23 +43,23 @@ module NakiIRCBot
       loop do
         begin
           addr, msg = queue.shift
-          next unless addr && msg
+          next unless addr && msg   # TODO: how is it possible to have only one of them?
           addr = addr.codepoints.pack("U*")
           fail "I should not PRIVMSG myself" if addr == bot_name
           msg = msg.to_s.codepoints.pack("U*").chomp[/^(\x01*)(.*)/m,2].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
+          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 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 "#{bot_name}\0#{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/

data/nakiircbot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakiircbot"
-  spec.version      = "0.1.1"
+  spec.version      = "0.1.3"
   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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com