Changeset 11630

Timestamp:

05/15/08 14:24:25 (5 years ago)

Author:

kan

Message:

Component::Wassr can send messages.

Location:

lang/perl/XIRCD/trunk/lib/XIRCD

Files:

• Component/Wassr.pm (modified) (5 diffs)
• Server.pm (modified) (4 diffs)

lang/perl/XIRCD/trunk/lib/XIRCD/Component/Wassr.pm

@@ -24 +24 @@
 );
 
+has 'jid' => (
+    isa     => 'Str',
+    is      => 'rw',
+);
+
 sub debug(@) { ## no critic.
     print @_ if $ENV{XIRCD_DEBUG};
@@ -35 +40 @@
     my $self = shift;
 
-    $self->alias('jabber');
+    $self->alias('wassr');
 
     debug "start wassr\n";
@@ -58 +63 @@
     );
 
-    POE::Kernel->post( ircd => 'join_channel', $self->config->{channel} );
+    POE::Kernel->post( ircd => 'join_channel', $self->config->{channel}, $self->alias );
     POE::Kernel->post( jabber => 'connect' );
 }
@@ -69 +74 @@
         debug "init finished\n";
         $self->jid($self->jabber->jid);
-        #$heap->{sid} = $sender->ID;
 
         POE::Kernel->post(jabber => 'output_handler', POE::Filter::XML::Node->new('presence'));
@@ -82 +86 @@
     debug "recv:", $node->to_str, "\n\n";
 
-    my ($body) = $node->get_tag('body');
+    my ($body,) = $node->get_tag('body');
+
     if ($body && $node->attr('from') =~ /^wassr-bot\@wassr\.jp/) {
-        my ($nick, $text) = $body =~ /^(\w+): (.*)/s;
-        POE::Kernel->post( ircd => 'publish_message', $nick, $self->config->{channel}, $text ) if $nick;
+        my ($nick, $text) = $body->data =~ /^([A-Za-z0-9_.-]+): (.*)/s;
+        if ($nick && $text) {
+            POE::Kernel->post( ircd => 'publish_message', $nick, $self->config->{channel}, $text );
+        } else {
+            POE::Kernel->post( ircd => 'publish_notice', $self->config->{channel}, $body->data );
+        }
+    }
+};
+
+event send_message => sub {
+    my $self = shift;
+    my ($message,) = get_args(@_);
+
+    my $node = POE::Filter::XML::Node->new('message');
+
+    $node->attr('to', 'wassr-bot@wassr.jp');
+    $node->attr('from', $self->{jid} );
+    $node->attr('type', 'chat');
+    $node->insert_tag('body')->data( $message );
+
+    debug "send:", $node->to_str, "\n\n";
+
+    POE::Kernel->post( jabber => output_handler => $node );
+};
+
+event error_handler => sub {
+    my $self = shift;
+    my ($error,) = get_args(@_);
+
+    if ( $error == +PCJ_SOCKETFAIL or $error == +PCJ_SOCKETDISCONNECT or $error == +PCJ_CONNECTFAIL ) {
+        print "Reconnecting!\n";
+        POE::Kernel->post( jabber => 'reconnect' );
+    }
+    elsif ( $error == +PCJ_SSLFAIL ) {
+        print "TLS/SSL negotiation failed\n";
+    }
+    elsif ( $error == +PCJ_AUTHFAIL ) {
+        print "Failed to authenticate\n";
+    }
+    elsif ( $error == +PCJ_BINDFAIL ) {
+        print "Failed to bind a resource\n";
+    }
+    elsif ( $error == +PCJ_SESSIONFAIL ) {
+        print "Failed to establish a session\n";
     }
 };

lang/perl/XIRCD/trunk/lib/XIRCD/Server.pm

@@ -20 +20 @@
 
 has 'nicknames' => (
+    isa => 'HashRef',
+    is  => 'rw',
+    default => sub { {} },
+);
+
+has 'components' => (
     isa => 'HashRef',
     is  => 'rw',
@@ -52 +58 @@
 
 event ircd_daemon_public => sub {
-    my ($self, $user, $channel, $text) = @_;
+    my $self = shift;
+    my($nick, $channel, $text) = get_args(@_);
     my $encoding = $self->config->{client_encoding};
 
-    POE::Kernel->post( im => send_message => decode( $encoding, $text ) );
-    POE::Kernel->post( ustream => say => decode( $encoding, $text ) );
+    debug "public [$channel] $nick : $text";
+
+    my $component = $self->components->{$channel};
+    return unless $component;
+
+    POE::Kernel->post( $component => send_message => decode( $encoding, $text ) );
 };
 
@@ -72 +83 @@
     }
 
-    $message = encode( $self->config->{client_encoding}, $message );
+    #$message = encode( $self->config->{client_encoding}, $message );
 
     $self->ircd->yield( daemon_cmd_privmsg => $nick => $channel, $_ )
@@ -78 +89 @@
 };
 
+event publish_notice => sub {
+    my $self = shift;
+    my ($channel, $message) = get_args(@_);
+
+    debug "notice to irc: [$channel] $message \n\n";
+
+    #$message = encode( $self->config->{client_encoding}, $message );
+
+    $self->ircd->yield( daemon_cmd_notice => $self->config->{server_nick} => $channel, $_ )
+        for split /\r?\n/, $message;
+};
+
 event join_channel => sub {
     my $self = shift;
-    my ($channel,) = get_args(@_);
+    my ($channel, $component) = get_args(@_);
 
     debug "join channel: $channel";
+    debug "register: $channel => $component";
 
+    $self->components->{$channel} = $component;
     $self->ircd->yield( daemon_cmd_join => $self->config->{server_nick}, $channel );
 };