Changeset 1002 for trunk/plugins/en/irc_join.tcl

Timestamp:

04/22/09 14:00:16 (3 years ago)

Author:

james

Message:

fix broken debug output
fix not greeting unknown users due to multiple handles matching '*'

File:

• trunk/plugins/en/irc_join.tcl (modified) (5 diffs)

trunk/plugins/en/irc_join.tcl

@@ -14 +14 @@
   #if the user isban then dont bother
   if {[ischanban $nick $channel] == 1 } {
-    bMotion_putloglev 2 d "dropping greeting for $nick on $channel as user is banned"
+    bMotion_putloglev d * "dropping greeting for $nick on $channel as user is banned"
     return 0
   }
@@ -24 +24 @@
         #if 0, someone has said something since
         if {$lasttalk == 1} {
-                bMotion_putloglev 2 d "dropping greeting for $nick on $channel because it's too idle"
+                bMotion_putloglev d * "dropping greeting for $nick on $channel because it's too idle"
                 return 0
         }
 
-        # check if the user is already in the channel - probably means they've joined a 2nd client
-        # or that they're about to ping out or something
-        set count 0
-        foreach n [chanlist $channel] {
-                if {[nick2hand $n $channel] == $handle} {
+        # skip this check if handle is * as it's pointless
+        if {$handle == "*"} {
+                # check if the user is already in the channel - probably means they've joined a 2nd client
+                # or that they're about to ping out or something
+                set count 0
+                foreach n [chanlist $channel] {
+                        if {[nick2hand $n $channel] == $handle} {
                         # we have a match
-                        incr count
+                                incr count
+                        }
                 }
-        }
-        
-        if {$count >= 2} {
-                bMotion_putloglev d * "$nick has $count matching handles in $channel, so not greeting"
-                return 1
+
+                if {$count >= 2} {
+                        bMotion_putloglev d * "$nick has $count matching handles in $channel, so not greeting"
+                        return 1
+                }
         }
 
         #we must also see if we're next to greet
         if {![bMotion_interbot_me_next $channel]} {
+                bMotion_putloglev 1 * "we're not next for $channel, so not greeting"
                 return 1
         }
@@ -50 +54 @@
         if {[bMotion_setting_get "friendly"] == "2"} {
                 # don't greet anyone
+                bMotion_putloglev 1 * "we're friendly==2 so not greeting $nick in $channel"
                 return 0
         }
@@ -60 +65 @@
         if {$handle == "*"} {
                 if {[bMotion_setting_get "friendly"] != "1"} {
+                        bMotion_putloglev d * "$nick has no handle and friendly!=1 so not greeting"
                         return 0
                 }
@@ -71 +77 @@
                 if {![rand 10]} {
                         set greetings "insult_joins"
+                        bMotion_putloglev d * "decided to be rude to $nick on join as i know them"
                 }
                 bMotionGetHappy