@@ -43,7 +43,12 @@ sub speak {
my @output;
if ($target =~ /^#/) {
# public
- push @output, ":$global_setting{nickname}!~$global_setting{nickname}\@$global_setting{hostname} PRIVMSG $target :$nick: $_" foreach (split(/\n/, $message));
+ if ($nick){
+ $nick = "$nick:";
+ } else {
+ $nick = "";
+ }
+ push @output, ":$global_setting{nickname}!~$global_setting{nickname}\@$global_setting{hostname} PRIVMSG $target :$nick $_" foreach (split(/\n/, $message));
} else {
# private
push @output, "PRIVMSG $nick :$_" foreach (split(/\n/, $message));
@@ -55,6 +60,10 @@ sub error_log {
print STDERR "[$$] !! @_\n";
}
+sub message_log {
+ print STDERR "[$$] ## @_\n";
+}
+
sub register_message_func
{
my ($command, $func) = @_;
@@ -66,11 +75,9 @@ sub install_message_module
{
my @module_file = grep (-x, glob("$Bin/modules/*"));
foreach (sort @module_file) {
-# print STDERR "[$$] ## Loading module $_\n";
eval {require $_;};
- print STDERR "[$$] ## Error on loading module $_: $@" if $@;
+ &error_log("Error on loading module $_: $@") if $@;
}
- #print STDERR Dumper(\%global_message_func);
}
sub extract_nick
@@ -85,30 +92,41 @@ sub start_message_loop
{
while (<>) {
s/(\r|\n)$//g;
+ if (m{^\.}) {
+# Control Message
+ &message_log(">> ctrl_recv: $_");
+ my ($command, $argument) = split(/\s+/, $_, 2);
+ my @arguments;
+ @arguments = split(/\s+/, $argument) if $argument;
+ if ($command && exists $global_message_func{$command}) {
+ my $funcs = $global_message_func{$command};
+ for (my $index = 0; $index < @$funcs; $index++) {
+ eval {
+ $funcs->[$index]->(@arguments);
+ };
+ &error_log("$@") if $@;
+ }
+ }
+ } else {
+# IRC Message
+ &message_log("[$$] >> irc_recv: $_");
# message template: :pratchett.freenode.net 001 merlin2 :Welcome to the freenode IRC Network merlin2
# message template: :merlin2!~merlin2@jianing-macbook.local JOIN :#jianingy
# message tempalte: PING :not.configured
- print STDERR "[$$] >> irc_recv: $_"."\n";
- m{
- ^(.)? # if it is a control command
- (?::(\S+))? # from
- (?:^|\s)(\S+) # command
- \s(\S+) # target
- (?:\s:(.+))? # message
- }xs;
- my ($is_control, $from, $command, $target, $message) = ($1, $2, $3, $4, $5);
- #print STDERR "!! $is_control:$from:$command:$target:$message\n";
- #print STDERR Dumper(\%global_message_func);
- if ($is_control) {
-# control message
- } else {
+ m{
+ (?:^:(\S+))? # from
+ (?:^|\s)(\S+) # command
+ \s(\S+) # target
+ (?:\s:(.+))? # message
+ }xs;
+ my ($from, $command, $target, $message) = ($1, $2, $3, $4, $5);
if ($command && exists $global_message_func{$command}) {
my $funcs = $global_message_func{$command};
for (my $index = 0; $index < @$funcs; $index++) {
eval {
$funcs->[$index]->($from, $command, $target, $message);
};
- print STDERR "!! $@\n" if $@;
+ &error_log("$@") if $@;
}
}
}
droids/merlin/core
@@ -25,9 +25,16 @@ sub base_nick_in_use {
&send_message(["NICK ".&get_nickname()]);
}
+sub base_ctrl_speak {
+ my $target = shift;
+ my $message = join(" ", @_);
+ &speak($target, undef, $message);
+}
+
®ister_message_func('376', \&base_join_channel);
®ister_message_func('433', \&base_nick_in_use);
®ister_message_func('PING', \&base_ping);
+®ister_message_func('.SPEAK', \&base_ctrl_speak);
1;
droids/merlin/modules/00-base
66e8e53f318784fbbe64b7b07ab02f27f536ccc9
Jianing Yang
jianingy.yang@gmail.com
http://github.com/jianingy/idroid/commit/2c39e049c7ef91f7288f7b0c728fc8c1088b69fd
2c39e049c7ef91f7288f7b0c728fc8c1088b69fd
2009-10-31T18:55:46-07:00
2009-10-31T18:55:46-07:00
added ctrl command support
55925e7e4aae21157059bb0587220df120086408
Jianing Yang
jianingy.yang@gmail.com