[SimBot-commits] CVS: simbot simbot.pl,1.138,1.139

[Kevin S. <ks...@us...>]

Update of /cvsroot/simbot/simbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28911

Modified Files:
	simbot.pl 
Log Message:
Rearrange some of the events a little bit to fix some weird problems:
1) Private "out" events were not reporting the destination, rendering them generally useless.
2) The callbacks for action events were being selected from the list of plugins that wanted message events, but called with the correct event, meaning plugins wanting actions but not messages would never get called. This wasn't causing any visible problems because plugins that ask for actions usually want messages also.
3) The arguments to the "in" and "out" events for actions were not the same, causing plugins assuming them to be to lose the first word or duplicate the nickname.  The arguments now match those of the related normal message events.

Index: simbot.pl
===================================================================
RCS file: /cvsroot/simbot/simbot/simbot.pl,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -p -r1.138 -r1.139
--- simbot.pl	11 Aug 2005 15:39:28 -0000	1.138
+++ simbot.pl	26 Aug 2005 07:45:38 -0000	1.139
@@ -204,12 +204,14 @@ our %event_channel_invite      = (); # e
 ### Private Events ###
 # Private events get params:
 #  (kernel, from, eventname, text)
-our %event_private_message     = (); # eventname = PRIVMSG (text)
-our %event_private_message_out = (); # eventname = PRIVMSG (text)
-our %event_private_action      = (); # eventname = PRIVACTION (text)
-our %event_private_action_out  = (); # eventname = PRIVACTION (text)
-our %event_private_notice      = (); # eventname = NOTICE (text)
-our %event_private_notice_out  = (); # eventname = NOTICE (text)
+our %event_private_message     = (); # eventname = PRIVMSG ()
+our %event_private_action      = (); # eventname = PRIVACTION ()
+our %event_private_notice      = (); # eventname = NOTICE ()
+
+#  (kernel, from, dest, eventname, text)
+our %event_private_message_out = (); # eventname = PRIVMSG ()
+our %event_private_action_out  = (); # eventname = PRIVACTION ()
+our %event_private_notice_out  = (); # eventname = NOTICE ()
 
 ### Server Events ###
 # Server events get params:
@@ -1519,7 +1521,7 @@ sub send_message {
 		}
 	} else {
 		foreach(keys(%event_private_message_out)) {
-			&plugin_callback($_, $event_private_message_out{$_}, ($chosen_nick, 'PRIVMSG', $text));
+			&plugin_callback($_, $event_private_message_out{$_}, ($chosen_nick, $dest, 'PRIVMSG', $text));
 		}
 	}
 }
@@ -1544,12 +1546,12 @@ sub send_action {
 	&debug((3 + (!$public)), "[" . (@{$dest} ? "@{$dest}" : $dest) .
 		   ":$chosen_nick] [action] $chosen_nick $text\n");
     if($public) {
-		foreach(keys(%event_channel_message_out)) {
+		foreach(keys(%event_channel_action_out)) {
 			&plugin_callback($_, $event_channel_action_out{$_}, ($chosen_nick, $dest, 'ACTION', $text));
 		}
 	} else {
-		foreach(keys(%event_private_message_out)) {
-			&plugin_callback($_, $event_private_action_out{$_}, ($chosen_nick, 'PRIVACTION', $text));
+		foreach(keys(%event_private_action_out)) {
+			&plugin_callback($_, $event_private_action_out{$_}, ($chosen_nick, $dest, 'PRIVACTION', $text));
 		}
 	}
 }
@@ -1580,7 +1582,7 @@ sub send_notice {
 		}
 	} else {
 		foreach(keys(%event_private_notice_out)) {
-			&plugin_callback($_, $event_private_notice_out{$_}, ($chosen_nick, 'NOTICE', $text));
+			&plugin_callback($_, $event_private_notice_out{$_}, ($chosen_nick, $dest, 'NOTICE', $text));
 		}
 	}
 }
@@ -1810,12 +1812,12 @@ sub process_action {
 			&build_records($text,"ACTION");
 		}
 		foreach(keys(%event_channel_action)) {
-			&plugin_callback($_, $event_channel_action{$_}, ($nick, $channel, 'ACTION', "$nick $text"));
+			&plugin_callback($_, $event_channel_action{$_}, ($nick, $channel, 'ACTION', $text));
 		}
     } else {
 		&debug(DEBUG_INFO, "[private:$nick] [action] $nick $text\n");
 		foreach(keys(%event_private_action)) {
-			&plugin_callback($_, $event_private_action{$_}, ($nick, 'PRIVACTION', "$nick $text"));
+			&plugin_callback($_, $event_private_action{$_}, ($nick, 'PRIVACTION', $text));
 		}
     }
 }