kag-gather 1.5.6 → 1.5.7

data/lib/kag/bans/report.rb

@@ -87,8 +87,9 @@ module KAG
       end
 
       def self.ignore(gather,message,user)
+        user.refresh
         KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
-        if KAG::Config.data[:ignored] and !KAG::Config.data[:ignored].key?(user.authname.to_sym)
+        if KAG::Config.data[:ignored] and user.authname and !KAG::Config.data[:ignored].key?(user.authname.to_sym)
           c = SymbolTable.new({
             :nick => user.nick,
             :authname => user.authname,
@@ -101,16 +102,17 @@ module KAG
           KAG::Config.data[:ignored][user.authname.to_sym] = c
           KAG::Config.data.save
 
-          gather.reply message,"User #{user.nick} added to ignore list." if gather.class == KAG::Gather
+          gather.reply message,"User #{user.authname} added to ignore list." if gather.class == KAG::Gather
           true
         else
-          gather.reply message,"User #{user.nick} already in ignore list!" if gather.class == KAG::Gather
+          gather.reply message,"User #{user.authname} already in ignore list!" if gather.class == KAG::Gather
           false
         end
       end
 
       def self.remove(gather,message,user)
-        if KAG::Config.data[:reported] and KAG::Config.data[:reported].key?(user.authname.to_sym)
+        user.refresh
+        if KAG::Config.data[:reported] and user.authname and KAG::Config.data[:reported].key?(user.authname.to_sym)
           KAG::Config.data[:reported].delete(user.authname.to_sym)
           KAG::Config.data.save
 
@@ -123,7 +125,8 @@ module KAG
       end
 
       def self.unignore(gather,message,user)
-        if KAG::Config.data[:ignored] and KAG::Config.data[:ignored].key?(user.authname.to_sym)
+        user.refresh
+        if KAG::Config.data[:ignored] and user.authname and KAG::Config.data[:ignored].key?(user.authname.to_sym)
           KAG::Config.data[:ignored].delete(user.authname.to_sym)
           KAG::Config.data.save
 
@@ -136,7 +139,8 @@ module KAG
       end
 
       def self.reports(user)
-        if KAG::Config.data[:reported] and KAG::Config.data[:reported].key?(user.authname.to_sym)
+        user.refresh
+        if KAG::Config.data[:reported] and user.authname and KAG::Config.data[:reported].key?(user.authname.to_sym)
           KAG::Config.data[:reported][user.authname.to_sym][:count]
         else
           false

data/lib/kag/irc/plugin.rb

@@ -88,48 +88,73 @@ module KAG
         end
       end
 
-      command :op,{nick: :string},
+      command :op,{nick: :string,channel: :string},
         summary: "Op a user",
         admin: true
-      def op(m,nick)
+      def op(m,nick,channel = nil)
         if is_admin(m.user)
-          m.channel.op(nick)
+          if channel
+            c = Channel(channel)
+            c.op(nick) if c
+          else
+            m.channel.op(nick)
+          end
         end
       end
 
-      command :deop,{nick: :string},
+      command :deop,{nick: :string,channel: :string},
         summary: "Deop a user",
         admin: true
-      def deop(m,nick)
+      def deop(m,nick,channel = nil)
         if is_admin(m.user)
-          m.channel.deop(nick)
+          if channel
+            c = Channel(channel)
+            c.deop(nick) if c
+          else
+            m.channel.deop(nick)
+          end
         end
       end
 
-      command :voice,{nick: :string},
+      command :voice,{nick: :string,channel: :string},
         summary: "Voice a user",
         admin: true
-      def voice(m,nick)
+      def voice(m,nick,channel = nil)
         if is_admin(m.user)
-          m.channel.voice(nick)
+          if channel
+            c = Channel(channel)
+            c.voice(nick) if c
+          else
+            m.channel.voice(nick)
+          end
         end
       end
 
-      command :devoice,{nick: :string,reason: :string},
+      command :devoice,{nick: :string,channel: :string},
         summary: "Devoice a user",
         admin: true
-      def devoice(m,nick,reason = '')
+      def devoice(m,nick,channel = nil)
         if is_admin(m.user)
-          m.channel.devoice(nick)
+          if channel
+            c = Channel(channel)
+            c.devoice(nick) if c
+          else
+            m.channel.devoice(nick)
+          end
         end
       end
 
-      command :kick,{nick: :string,reason: :string},
+      command :kick,{nick: :string,reason: :string,channel: :string},
         summary: "Kick a user",
         admin: true
-      def kick(m,nick,reason)
+      def kick(m,nick,reason = "",channel = nil)
         if is_admin(m.user)
-          m.channel.kick(nick,reason)
+          if channel
+            c = Channel(channel)
+            c.kick(nick,reason) if c
+          else
+            m.channel.kick(nick,reason)
+          end
         end
       end
     end

data/lib/kag/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: kag-gather
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Shaun McCormick