Changeset 7099

Timestamp:

02/24/08 17:34:50 (5 years ago)

Author:

woremacx

Message:

lang/perl/POE-Component-Client-Nowa: support reply

Location:

lang/perl/POE-Component-Client-Nowa/trunk

Files:

• bin/nowa2ircd.pl (modified) (7 diffs)
• config.yaml-dist (modified) (2 diffs)

lang/perl/POE-Component-Client-Nowa/trunk/bin/nowa2ircd.pl

@@ -95 +95 @@
     $heap->{channel_nicknames} = {};
     $heap->{joined}    = 0;
-    $heap->{stack}     = [];
 
     undef;
@@ -104 +103 @@
 
     msg 'delay_nowa_recent';
-    $heap->{nowa}->yield('recent');
+    if ($heap->{joined}) {
+        $heap->{nowa}->yield('recent');
+    }
 }
 
@@ -167 +168 @@
         }
     }
-    $kernel->delay('delay_nowa_recent', 1200);
+    $heap->{nowa}->{topics} = $res;
+    $kernel->delay('delay_nowa_channels', 1200);
 }
 
@@ -177 +179 @@
     return if $heap->{nicknames}->{$nick};
     return if $nick eq $conf->{botname};
+    $heap->{ircd}->yield(add_spoofed_nick => { nick => $nick });
     if ($ch eq $conf->{channel}) {
         $heap->{joined} = 1;
         $heap->{nowa}->yield(update => 'hello, world') if $heap->{config}->{greeting};
 
-        for my $data (@{ $heap->{stack} }) {
-            $heap->{ircd}->yield(daemon_cmd_privmsg => $data->{name}, $conf->{channel}, $data->{text});
-        }
-        $heap->{stack} = [];
         $kernel->delay('delay_nowa_recent', 5);
     } else {
@@ -220 +219 @@
     my $conf = $heap->{config}->{irc};
 
-    my $nick = ( $user =~ m/^(.*)!/)[0];
-    unless ($channel eq $conf->{channel}) {
-        $text = "$channel $text";
-    }
-    $heap->{nowa}->yield(update => $text);
+    my $status = { status => $text };
+
+    if ($channel ne $conf->{channel}) {
+        $status->{status} = "$channel $status->{text}";
+
+    } elsif ($text =~ /^[\@\>]([a-z0-9\-]+):?\s+(.+)$/i) {
+        my ($nick, $body) = (lc($1), $2);
+        my %cache = map { $_->{user} => $_->{id} } reverse( @{ $heap->{previous_recent} } );
+
+        if ($cache{$nick}) {
+            $status = {
+                parent_id => $cache{$nick},
+                status    => $body,
+            };
+        } else {
+            $status->{status} = "$nick: $body",
+        }
+    }
+
+    $heap->{nowa}->yield(update => $status);
 }
 
@@ -248 +262 @@
             }
 
-#            next if $heap->{config}->{nowa}->{nowa_id} eq $name;
-            if ($heap->{joined}) {
+            if ($heap->{config}->{nowa}->{nowa_id} eq $name) {
+                $heap->{ircd}->yield(daemon_cmd_topic => $conf->{botname}, $conf->{channel}, $text);
+            } else {
                 $heap->{ircd}->yield(daemon_cmd_privmsg => $name, $conf->{channel}, $text);
-            } else {
-                push @{ $heap->{stack} }, { name => $name, text => $text }
             }
         }
 
         $heap->{previous_recent} = $ret;
+
+    } else {
+        $heap->{previous_recent} = [];
     }
 
@@ -285 +301 @@
             }
 
-#            next if $heap->{config}->{nowa}->{nowa_id} eq $name;
-            $heap->{ircd}->yield(daemon_cmd_privmsg => $name, $channel, $text);
+            if ($heap->{config}->{nowa}->{nowa_id} eq $name) {
+                $heap->{ircd}->yield(daemon_cmd_topic => $conf->{botname}, $channel, $text);
+            } else {
+                $heap->{ircd}->yield(daemon_cmd_privmsg => $name, $channel, $text);
+            }
         }
 

lang/perl/POE-Component-Client-Nowa/trunk/config.yaml-dist

@@ -3 +3 @@
   servername: nowa.localhost
   serverport: 6667
-  botname: nowa
+  botname: '[nowa]'
   nickname: woremacx
   password: your-ircd-pass
@@ -10 +10 @@
 
 nowa:
-  retry: 300
+  retry: 180
   nowa_id: your-nowa-id
   password: your-nowa-pass
+  api_pass: your-nowa-api-pass
   greeting: 0