allow per-channel addressCharacter

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1165 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/files/sample/blootbot.chan b/files/sample/blootbot.chan
index 8dba2f66aac2b242ea05a6993e671d0a9e5af36f..7e6e47cc044674f44b8462f7f2dc4dd23863f8ae 100644 (file)
--- a/files/sample/blootbot.chan
+++ b/files/sample/blootbot.chan
@@ -1,4 +1,4 @@
-#v1: blootbot -- infobot -- written Fri Feb 18 08:39:35 2005
+#v1: blootbot -- infobot -- written Tue Feb 22 05:10:22 2005
 
 #botpark
     +RootWarn
@@ -41,6 +41,7 @@ _default
     +W3Search
     +Weather
     +Zippy
+    addressCharacter ~
     +allowConv
     +allowTelling
     +babelfish

diff --git a/files/sample/blootbot.config b/files/sample/blootbot.config
index 4570cdf966637dbeb2989fa50959b5f4dd2ede1f..bb71a63c2c0ec33ef752cad3069dd2f3b93baff9 100644 (file)
--- a/files/sample/blootbot.config
+++ b/files/sample/blootbot.config
@@ -125,9 +125,6 @@ set allowTelling    1
 #                 addressing.
 set addressing         REQUIRE
 
-# [char] One-character easy recognition.
-set addressCharacter   ~
-
 # [str] how the bot should send messages.
 #   PRIVATE    -- reply to private messages only, rejecting public msgs.
 #   DEFAULT    -- reply to public _and_ private queries.

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index e620b2202bfa8e85d1e152abd5b2c56d3bd47e1d..13f44695b800463a2ff98383c909f2b59055f6d4 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -91,12 +91,19 @@ sub hookMsg {
     if ($msgType =~ /private/) {
        # private messages.
        $addressed = 1;
+       if (&IsChanConf('addressCharacter')) {
+           $addressCharacter = getChanConf('addressCharacter');
+           if ($message =~ s/^\Q$addressCharacter\E//) {
+               &msg($who, "please don't use the the addressCharacter when private messaging");
+           }
+       }
     } else {
        # public messages.
        # addressing revamped by the xk.
        ### below needs to be fixed...
-       if (&IsParam("addressCharacter")) {
-           if ($message =~ s/^\Q$param{'addressCharacter'}\E//) {
+       if (&IsChanConf('addressCharacter')) {
+           $addressCharacter = getChanConf('addressCharacter');
+           if ($message =~ s/^\Q$addressCharacter\E//) {
                $addrchar  = 1;
                $addressed = 1;
            }