nakiircbot 0.0.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8ca18800562c7c0fd329e997bee46f5b27d8dba
-  data.tar.gz: 20fa8cd1ceab4294bd91178fe65ebde49618d7ac
+SHA256:
+  metadata.gz: a672981dae3300506bc3d7579009d6bc2ada58a1b38ed0b4afbc39d471de2a03
+  data.tar.gz: 72997bb910adc17459132b1deef79bec1015c8ea523e041931496d678594225c
 SHA512:
-  metadata.gz: aeb84857a8086ec6cf62cc907968820aff82513b0795793c49b73567f47a18243a10130584e02086f34af04a35cfbe00c812f976e6d641db1779a090ada1a4d1
-  data.tar.gz: '0081fc35339b93b87d2e08dd0b6ee5855df5675fc44fa3b8c9d33a0c8bdbfc5a9808225162aa1b3f3864e1adb61ca616984ff7fe97807877b7b2e7c1896ab2be'
+  metadata.gz: c6669d5ac757e78e7c0856722f36f132cb3d7a2bfa0efb30e0dab7711bbf89c9b6bea39d86bceca93268440449add073924749666960098833e31eed885efa03
+  data.tar.gz: 69df584be01ac7a4e3077bed9e2699d605f250747ab5ee1fac041b0051ab3abadc92a95600107e0b27c813be9b707a89c4bf8a9029dc14c2e96ea546210294bf

data/lib/nakiircbot.rb

@@ -3,7 +3,7 @@ module NakiIRCBot
   # class << self
   #   attr_accessor :channels
   # end
-  def self.start server, port, bot_name, master_name, welcome001, *channels, password: nil, masterword: nil, processors: [], twitch: false
+  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
@@ -33,33 +33,33 @@ module NakiIRCBot
         logger.info "> #{str}"
         socket.send str + "\n", 0
       end
-      socket.send "PASS #{password.strip}\n", 0 if twitch
+      # 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
+      socket_send.call "USER #{bot_name} #{bot_name} #{bot_name} #{bot_name}" #unless twitch
 
       queue = []
       prev_socket_time = prev_privmsg_time = Time.now
       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.scrub!
-          msg.gsub! "\n", "  "
-          msg.gsub! "\r", "  "
+          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 = "PRIVMSG #{addr} :*flood*" if privmsg.bytes.size > 500 && addr.start_with?("#")
+          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
@@ -82,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/
@@ -104,7 +110,7 @@ module NakiIRCBot
           #   socket_send.call "NOTICE",$1,"\001PING #{rand 10000000000}\001"
           # when /^:([^!]+)!\S+ PRIVMSG #{Regexp.escape bot_name} :\001TIME\001$/
           #   socket_send.call "NOTICE",$1,"\001TIME 6:06:06, 6 Jun 06\001"
-          when /\A#{'\S+ ' if twitch}:(?<who>[^!]+)!\S+ PRIVMSG (?<where>\S+) :(?<what>.+)/
+          when /\A#{'\S+ ' if tags}:(?<who>[^!]+)!\S+ PRIVMSG (?<where>\S+) :(?<what>.+)/
             next( if processors.empty?
               queue.push [master_name, "nothing to reload"]
             else
@@ -112,7 +118,7 @@ module NakiIRCBot
                 queue.push [master_name, "reloading #{processor}"]
                 load File.absolute_path processor
               end
-            end ) if $~.named_captures == {"who"=>master_name, "where"=>bot_name, "what"=>"#{twitch ? "@#{bot_name} " : "#{masterword.strip} "}reload"}
+            end ) if $~.named_captures == {"who"=>master_name, "where"=>bot_name, "what"=>"#{masterword.strip} reload"}
         end
 
         begin

data/nakiircbot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakiircbot"
-  spec.version      = "0.0.2"
+  spec.version      = "0.1.4"
   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.0.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: IRC bot framework