Changeset 310

Timestamp:

09/29/03 09:51:44 (8 years ago)

Author:

kevdadrum

Message:

Moved jms' real wellbeing code into a module called from the question handler. This should unbreak it ("what's X" was overriding it in some cases)

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• modules/extra/question.tcl (added)
• plugins/en/complex_questions.tcl (modified) (2 diffs)

trunk/CHANGELOG

@@ -6 +6 @@
 - = removed
 
+*  Kevin           moved the handling of jms' (real) wellbeing code into an extra module, and referenced it from complex question
 *  James           fixed spelling error in name of onjoin plugin
 *  James           fixed onjoin plugin to use new abstracts system

trunk/plugins/en/complex_questions.tcl

@@ -36 +36 @@
   ## wellbeing question targeted at me
   if { [regexp -nocase "^$botnicks,?:? how( a|')?re (you|ya)" $text] ||
-       [regexp -nocase "^how( a|')?re (you|ya).*$botnicks ?\\?" $text] } {
-    bMotion_plugin_complex_question_wellbeing $nick $channel $host
-    return 1
-  }
-
+       [regexp -nocase "^how( a|')?re (you|ya).*$botnicks ?\\?" $text] ||
+       [regexp -nocase "${botnicks}?:? ?(how('?s|z) it going|hoe gaat het|what'?s up|'?sup|how are you),?( ${botnicks})?\\?" $text]} {
+    bMotion_question_wellbeing $nick $channel $host
+    return 1
+  }
+  
+    
   bMotion_putloglev 3 * "Checking question for 'with/at/against'"
   ## With/at/against who question targeted at me
@@ -191 +193 @@
 }
 
-proc bMotion_plugin_complex_question_wellbeing { nick channel host } {
-  bMotion_putloglev 2 * "$nick wellbeing question"
-  bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerWellbeing}"
-  return 1
-}
-
 proc bMotion_plugin_complex_question_with { nick channel host prop } {
   bMotion_putloglev 2 * "$nick with question"