Changeset 5833

Timestamp:

07/04/09 19:42:22 (3 years ago)

Author:

submersible_toaster

Message:

WORKS

Location:

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm

Files:

• Service/Chat.pm (modified) (1 diff)
• Transport/IRC.pm (modified) (6 diffs)

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Service/Chat.pm

@@ -8 +8 @@
 use Padre::Swarm::Service ();
 
-my $marshal = JSON::XS->new->allow_blessed->convert_blessed;
+my $marshal = 
+JSON::XS
+    ->new
+    ->allow_blessed
+    ->convert_blessed
+    ->utf8;
     
 our @ISA = 'Padre::Swarm::Service';

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Transport/IRC.pm

@@ -14 +14 @@
    };
    
-use Carp;
+use Carp qw( carp );
 
 our @ISA = 'Padre::Swarm::Transport';
-
+use Data::Dumper;
 
 
@@ -61 +61 @@
           }
 
-        $con->register( 
-          $self->nickname,
-          'Padre-Swarm-Transport-IRC',
-          , getlogin() 
-        );
+#       $con->register( 
+#         $self->nickname,
+#         'Padre-Swarm-Transport-IRC',
+#         , getlogin() 
+#       );
         
        },
@@ -73 +73 @@
        },
        registered => sub {
-        warn "REGISTERED!!";
         $self->update_channels;
        }
@@ -83 +82 @@
           my $nick = $con->nick;
           
-          my $body = join (' ',@{ $ircmsg->{params} } );
+          my ($sender,$body) =  @{ $ircmsg->{params} };
+          
            my $frame = {
-               address => $handle,
+               entity => $sender,
                channel => $channel,
+               timestamp => time, 
            };
-           $body =~ s/\Q$channel\E //;
-           warn "Publick message in $channel '$body'";
            push @{ $self->{incoming_buffer}{$channel} }, [$body,$frame];
             
        }
+    );
+    
+    $con->reg_cb(
+        error => sub {
+            my ($con,$code, $message, $ircmsg) = @_;
+            warn "ERROR:[$code] - $message\n";
+            
+        }
+
     );
 
@@ -134 +142 @@
 }
 
-use Data::Dumper;
+
 sub receive_from_channel {
     my ($self,$channel) = @_;
-    warn "Search for $channel";
     return unless exists $self->{incoming_buffer}{$channel};
     
     my @queue = @{ delete $self->{incoming_buffer}{$channel} };
     my $d = shift @queue;
-    $self->{incoming_buffer}{$channel} = \@queue
-        if @queue;
-    my ($msg,$frame) = @$d;
+    if ( @queue ) {
+        $self->{incoming_buffer}{$channel} = \@queue
+    }
+    else { warn "Drained '$channel' buffer" }
+    
+    return @$d;
 }
 
@@ -150 +160 @@
     my ($self,$channel,$payload) = @_;
     my $con = $self->connection;
+    carp "Tell $channel - $payload";
+    my $irc_chan = '#padre_swarm_'.$channel;
     
-    $con->send_chan( '#padre', 'PRIVMSG',
-        '#padre',
+    $con->send_msg( PRIVMSG => $irc_chan,
         $payload
     );
+    
+    #$con->send_chan($irc_chan, $payload );
 }
 1;