kag-gather 1.3.3 → 1.3.4

data/lib/kag/gather.rb

@@ -148,7 +148,7 @@ module KAG
       unless is_banned?(m.user)
         u = User(nick)
         if u and !u.unknown
-          KAG::Report.new(m,u)
+          KAG::Report.new(self,m,u)
         else
           reply m,"User #{nick} not found!"
         end
@@ -439,7 +439,7 @@ module KAG
       if is_admin(m.user)
         user = User(nick)
         if user and !user.unknown
-          KAG::Report.remove(user,m,self)
+          KAG::Report.remove(self,m,user)
         else
           reply m,"Could not find user #{nick}"
         end
@@ -451,7 +451,7 @@ module KAG
       if is_admin(m.user)
         user = User(nick)
         if user and !user.unknown
-          KAG::Report.ignore(user,m,self)
+          KAG::Report.ignore(self,m,user)
         else
           reply m,"Could not find user #{nick}"
         end
@@ -463,7 +463,7 @@ module KAG
       if is_admin(m.user)
         user = User(nick)
         if user and !user.unknown
-          KAG::Report.unignore(user,m,self)
+          KAG::Report.unignore(self,m,user)
         else
           reply m,"Could not find user #{nick}"
         end
@@ -496,9 +496,9 @@ module KAG
 
     def is_banned?(user)
       d = KAG::Config.data
+      KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
       if d
-        false
-        #d[:ignored].key?(user.host.to_sym)
+        d[:ignored].key?(user.host.to_sym)
       else
         false
       end

data/lib/kag/report.rb

@@ -5,13 +5,13 @@ require 'kag/config'
 module KAG
   class Report < SymbolTable
 
-    def initialize(m,user)
+    def initialize(gather,m,user)
       hash = {
         :nick => user.nick,
         :authname => user.authname,
         :host => user.host,
         :realname => user.realname,
-        :gather => self,
+        :gather => gather,
         :message => m,
         :count => 1
       }
@@ -25,7 +25,7 @@ module KAG
             up_report_count
           end
         else
-          self[:gather].reply self[:message],"You have already reported #{self[:nick]}. You can only report a user once."
+          self.gather.reply self.message,"You have already reported #{self[:nick]}. You can only report a user once."
         end
       else
         report
@@ -35,7 +35,7 @@ module KAG
     def can_report?
       r = _report
       if r and r[:reporters]
-        !r[:reporters].include?(self[:message].user.authname)
+        !r[:reporters].include?(self.message.user.authname)
       else
         true
       end
@@ -51,15 +51,15 @@ module KAG
     end
 
     def report
-      puts self[:message].inspect
+      puts self.message.inspect
       c = self.dup
       c.delete(:gather)
       c.delete(:message)
-      c[:reporters] = [self[:message].user[:authname]]
+      c[:reporters] = [self.message.user.authname]
       data[:reported][self[:host].to_sym] = c
       data.save
 
-      self[:gather].reply self[:message],"User #{self[:nick]} reported." if self[:gather].class == KAG::Gather
+      self.gather.reply self.message,"User #{self[:nick]} reported." if self.gather.class == KAG::Gather
     end
 
     def ignore
@@ -68,7 +68,7 @@ module KAG
       c.delete(:message)
       data[:ignored][self[:host].to_sym] = c
       data.save
-      self[:gather].reply self[:message],"User #{self[:nick]} ignored." if gather.class == KAG::Gather
+      self.gather.reply self.message,"User #{self[:nick]} ignored." if self.gather.class == KAG::Gather
     end
 
     def past_threshold?
@@ -78,13 +78,13 @@ module KAG
     def up_report_count
       _report[:count] = _report[:count].to_i + 1
       _report[:reporters] = [] unless _report[:reporters]
-      _report[:reporters] << self[:message].user.authname
+      _report[:reporters] << self.message.user.authname
       data.save
 
-      gather.reply message,"User #{self[:nick]} reported. #{self[:nick]} has now been reported #{data[:reported][self[:host].to_sym][:count]} times." if gather.class == KAG::Gather
+      self.gather.reply message,"User #{self[:nick]} reported. #{self[:nick]} has now been reported #{data[:reported][self[:host].to_sym][:count]} times." if self.gather.class == KAG::Gather
     end
 
-    def self.ignore(user,message,gather)
+    def self.ignore(gather,message,user)
       KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
       if KAG::Config.data[:ignored] and !KAG::Config.data[:ignored].key?(user.host.to_sym)
         c = SymbolTable.new({
@@ -107,7 +107,7 @@ module KAG
       end
     end
 
-    def self.remove(user,message,gather)
+    def self.remove(gather,message,user)
       if KAG::Config.data[:reported] and KAG::Config.data[:reported].key?(user.host.to_sym)
         KAG::Config.data[:reported].delete(user.host.to_sym)
         KAG::Config.data.save
@@ -120,7 +120,7 @@ module KAG
       end
     end
 
-    def self.unignore(user,message,gather)
+    def self.unignore(gather,message,user)
       if KAG::Config.data[:ignored] and KAG::Config.data[:ignored].key?(user.host.to_sym)
         KAG::Config.data[:ignored].delete(user.host.to_sym)
         KAG::Config.data.save

data/lib/kag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+description: A bot for starting and managing KAG Gather matches
 email:
 - splittingred@gmail.com
 executables: []