Changeset 716

Timestamp:

09/13/06 09:16:59 (6 years ago)

Author:

james

Message:

fix summoning ourselves #76, patch by znx

File:

• trunk/plugins/en/complex_summon.tcl (modified) (7 diffs)

trunk/plugins/en/complex_summon.tcl

@@ -16 +16 @@
 proc bMotion_plugin_complex_summon { nick host handle channel text } {
         global summon_privmsg_response
+        global botnicks
 
         # bMotion_putloglev d * "bMotion: (summon) entering"
@@ -39 +40 @@
                         # summon the best we can
                         if { ![onchan $name $channel] } {
+                                # the botnick could be non-existant
+                                if [regexp -nocase "^$botnicks\$" $name] {
+                                        bMotion_putloglev d * "bMotion: (summon) myself!"
+                                        bMotionDoAction $channel $nick "%VAR{summon_bot}"
+                                        return 1
+                                }
                                 bMotion_putloglev d * "bMotion: (summon) answering for someone not here"
                                 bMotionDoAction $channel $name "%VAR{summon_channel_response_notthere}"
                         } else {
+                                # the botnick could exist but be shorthand
+                                if [isbotnick $name || regexp -nocase "$botnicks" $name] {
+                                        bMotion_putloglev d * "bMotion: (summon) myself!"
+                                bMotionDoAction $channel $nick "%VAR{summon_bot}"
+                                return 1
+                        }
                                 bMotion_putloglev d * "bMotion: (summon) answering for someone here"
                                 if [isbotnick $name] {
@@ -48 +61 @@
                                 }
                                 bMotionDoAction $channel $name "%VAR{summon_channel_response}"
-                                set msg [pickRandom $summon_privmsg_response]
-                                # replacements
+                                #set msg [pickRandom $summon_privmsg_response]
+                                set msg [doInterpolation "%VAR{summon_privmsg_response}" $nick ""]
+                                # replacements (TODO: may not be needed after doInterpolation)
                                 regsub "%chan" $msg $channel msg 
                                 regsub "%%" $msg $nick msg
                                 # notify
-                                puthelp "NOTICE $name :$msg"
                                 puthelp "PRIVMSG $name :$msg"
                         }
@@ -68 +81 @@
 bMotion_plugin_add_complex "summon" "^!summon" 100 "bMotion_plugin_complex_summon" "en"
 
-set summon_channel_response_notthere {
+bMotion_abstract_register "summon_channel_response_notthere"
+bMotion_abstract_batchadd "summon_channel_response_notthere" {
         "yoooo hooooo! %%!"
         "hello there, %%?"
@@ -78 +92 @@
 }
 
-set summon_channel_response {
+bMotion_abstract_register "summon_channel_response"
+bMotion_abstract_batchadd "summon_channel_response" {
         "/prods at %% with %noun"
         "through my awesome powers of telepathy, I shall summon %%!!"
@@ -87 +102 @@
 }
 
-set summon_privmsg_response {
+bMotion_abstract_register "summon_privmsg_response"
+bMotion_abstract_batchadd "summon_privmsg_response" {
         "FYI: %% was looking for you on %chan"
         "just so you know %% was asking about you on %chan"
@@ -96 +112 @@
 }
 
-set summon_channel_idiot {
+bMotion_abstract_register "summon_channel_idiot"
+bMotion_abstract_batchadd "summon_channel_idiot" {
         "ANNOUNCEMENT: %% is an idiot. That is all."
         "Pay no attention to %%, the village idiot."