kag-gather 1.2.0 → 1.2.1

data/lib/kag/bot.rb

@@ -15,7 +15,12 @@ module KAG
           c.nick = config[:nick].to_s != "" ? config[:nick] : "KAGatherer"
           c.realname = config[:realname].to_s != "" ? config[:realname] : "KAG Gatherer"
           c.messages_per_second = 1
+          c.server_queue_size = 1
           c.plugins.plugins = [KAG::Gather]
+          if config[:sasl]
+            c.sasl.username = config[:sasl][:username]
+            c.sasl.password = config[:sasl][:password]
+          end
         end
       end
 

data/lib/kag/gather.rb

@@ -65,8 +65,10 @@ module KAG
       if match
         match.remove_player(m.user.nick)
         send_channels_msg "#{nick} has left the match at #{match.server[:key]}! Find a sub!"
-      elsif @queue.key?(user)
-        remove_user_from_queue(m.user.nick)
+      elsif @queue.key?(m.user.nick)
+        unless remove_user_from_queue(m.user.nick)
+          debug "#{nick} is not in the queue."
+        end
       end
     end
 
@@ -101,7 +103,7 @@ module KAG
       end
     end
 
-    def add_user_to_queue(m,nick)
+    def add_user_to_queue(m,nick,send_msg = true)
       unless @queue.key?(nick) or get_match_in(nick)
         @queue[nick] = SymbolTable.new({
             :user => User(nick),
@@ -109,15 +111,18 @@ module KAG
             :message => m.message,
             :joined_at => Time.now
         })
-        send_channels_msg "Added #{nick} to queue (#{KAG::Match.type_as_string}) [#{@queue.length}]"
+        send_channels_msg "Added #{nick} to queue (#{KAG::Match.type_as_string}) [#{@queue.length}]" if send_msg
         check_for_new_match
       end
     end
 
-    def remove_user_from_queue(nick)
+    def remove_user_from_queue(nick,send_msg = true)
       if @queue.key?(nick)
         @queue.delete(nick)
-        send_channels_msg "Removed #{nick} from queue (#{KAG::Match.type_as_string}) [#{@queue.length}]"
+        send_channels_msg "Removed #{nick} from queue (#{KAG::Match.type_as_string}) [#{@queue.length}]" if send_msg
+        true
+      else
+        false
       end
     end
 
@@ -221,6 +226,16 @@ module KAG
       end
     end
 
+    match /rem_silent (.+)/, method: :evt_rem_silent_admin
+    def evt_rem_silent_admin(m, arg)
+      if is_admin(m.user)
+        arg = arg.split(" ")
+        arg.each do |nick|
+          remove_user_from_queue(nick,false)
+        end
+      end
+    end
+
     match /add (.+)/, method: :evt_add_admin
     def evt_add_admin(m, arg)
       if is_admin(m.user)
@@ -235,6 +250,20 @@ module KAG
       end
     end
 
+    match /add_silent (.+)/, method: :evt_add_silent_admin
+    def evt_add_silent_admin(m, arg)
+      if is_admin(m.user)
+        arg = arg.split(" ")
+        arg.each do |nick|
+          if m.channel.has_user?(nick)
+            add_user_to_queue(m,nick,false)
+          else
+            reply m,"User #{nick} is not in this channel!"
+          end
+        end
+      end
+    end
+
     match /is_admin (.+)/, method: :evt_am_i_admin
     def evt_am_i_admin(m,nick)
       u = User(nick)

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
   def self.version
     VERSION
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors: