--- trunk/bin/irc-logger.pl	2008/03/08 17:38:30	102
+++ trunk/bin/irc-logger.pl	2008/03/09 19:22:16	106
@@ -465,6 +465,8 @@
 #			$row->{nick} = $nick;
 #		}
 
+		$append = 0 if $row->{me};
+
 		if ($last_row->{nick} ne $nick) {
 			# obfu way to find format for me_nick if needed or fallback to default
 			my $fmt = $row->{me} ? ( $args->{fmt}->{me_nick} || $args->{fmt}->{nick} ) : $args->{fmt}->{nick};
@@ -679,7 +681,11 @@
 
 		if ( $args->{kernel} && $send_rss_msgs ) {
 			$send_rss_msgs--;
-			$sth_insert_log->execute( $args->{channel}, 1, $NICK, $msg, 'now()' );
+			if ( ! $args->{private} ) {
+				# FIXME bug! should be save_message
+#				save_message( channel => $args->{channel}, me => 1, nick => $NICK, message => $msg );
+				$sth_insert_log->execute( $args->{channel}, 1, $NICK, $msg, 'now()' );
+			}
 			my ( $type, $to ) = ( 'notice', $args->{channel} );
 			( $type, $to ) = ( 'privmsg', $args->{nick} ) if $args->{private};
 			_log(">> $type $to |", $msg);
@@ -945,7 +951,7 @@
 			$channel = $nick if $sub eq 'private';
 
 			my $sql = {
-				add		=> qq{ insert into feeds (url,name,channel,nick,private) values (?,?,?,?,?) },
+				add	=> qq{ insert into feeds (url,name,channel,nick,private) values (?,?,?,?,?) },
 #				remove	=> qq{ delete from feeds				where url = ? and name = ? },
 				start	=> qq{ update feeds set active = true	where url = ? },
 				stop	=> qq{ update feeds set active = false	where url = ? },
@@ -979,33 +985,42 @@
 		rss_check_updates( $_[KERNEL] );
 	},
 	irc_477 => sub {
-		_log "# irc_477: ",$_[ARG1];
+		_log "<< irc_477: ",$_[ARG1];
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "register $NICK" );
 	},
 	irc_505 => sub {
-		_log "# irc_505: ",$_[ARG1];
+		_log "<< irc_505: ",$_[ARG1];
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "register $NICK" );
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "set hide email on" );
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "set email dpavlin\@rot13.org" );
 	},
 	irc_registered => sub {
-		_log "## registrated $NICK";
+		_log "## registrated $NICK, /msg nickserv IDENTIFY $NICK";
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
 	},
 	irc_disconnected => sub {
-		_log "## disconnected, reconnecting again";
-		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+		_log "## disconnected.. sleeping for $sleep_on_error seconds and reconnecting again";
+		sleep($sleep_on_error);
+		$_[KERNEL]->post( $IRC_ALIAS => connect => $CONNECT);
 	},
 	irc_socketerr => sub {
 		_log "## socket error... sleeping for $sleep_on_error seconds and retry";
 		sleep($sleep_on_error);
-		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+		$_[KERNEL]->post( $IRC_ALIAS => connect => $CONNECT);
 	},
 #	irc_433 => sub {
 #		print "# irc_433: ",$_[ARG1], "\n";
 #		warn "## indetify $NICK\n";
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
 #	},
+#	irc_451	# please register
+	irc_snotice => sub {
+		_log "<< snotice",$_[ARG0];
+		if ( $_[ARG0] =~ m!/(QUOTE)\s+(PASS\s+\d+)!i ) {
+			warn ">> $1 | $2\n";
+			$_[KERNEL]->post( $IRC_ALIAS => lc($1) => $2);
+		}
+	},
     _child => sub {},
     _default => sub {
 		_log sprintf "sID:%s %s %s",