--- trunk/bin/irc-logger.pl	2008/03/07 10:35:04	93
+++ trunk/bin/irc-logger.pl	2008/03/07 11:16:05	95
@@ -55,7 +55,6 @@
 
 # don't pull rss feeds more often than this
 my $rss_min_delay = 60;
-$rss_min_delay = 15;
 
 my $http_port = $NICK =~ m/-dev/ ? 8001 : 8000;
 
@@ -228,9 +227,9 @@
 		if ( $@ || ! $sth->rows ) {
 			$sth = $dbh->prepare(qq{ insert into meta (value,nick,channel,name,changed) values (?,?,?,?,now()) });
 			$sth->execute( $value, $nick, $channel, $name );
-			_log "created $nick/$channel/$name = $value";
+			warn "## created $nick/$channel/$name = $value\n";
 		} else {
-			_log "updated $nick/$channel/$name = $value ";
+			warn "## updated $nick/$channel/$name = $value\n";
 		}
 
 		return $value;
@@ -240,7 +239,7 @@
 		my $sth = $dbh->prepare(qq{ select value,changed from meta where nick = ? and channel = ? and name = ? });
 		$sth->execute( $nick, $channel, $name );
 		my ($v,$c) = $sth->fetchrow_array;
-		_log "fetched $nick/$channel/$name = $v [$c]";
+		warn "## fetched $nick/$channel/$name = $v [$c]\n";
 		return ($v,$c) if wantarray;
 		return $v;
 
@@ -644,11 +643,22 @@
 			return $txt . $var if $var;
 		}
 
+		# fix absolute and relative links to feed entries
+		my $link = $entry->link;
+		if ( $link =~ m!^/! ) {
+			my $host = $args->{url};
+			$host =~ s!^(http://[^/]+).*$!$1!;	#!vim
+			$link = "$host/$link";
+		} elsif ( $link !~ m!^http! ) {
+			$link = $args->{url} . $link;
+		}
+		$link =~ s!//+!/!g;
+
 		my $msg;
 		$msg .= prefix( 'From: ' , $args->{name} || $feed->title );
 		$msg .= prefix( ' by ' , $entry->author );
 		$msg .= prefix( ' | ' , $entry->title );
-		$msg .= prefix( ' | ' , $entry->link );
+		$msg .= prefix( ' | ' , $link );
 #		$msg .= prefix( ' id ' , $entry->id );
 
 		if ( $args->{kernel} && $send_rss_msgs ) {
@@ -693,10 +703,11 @@
 
 sub rss_check_updates {
 	my $kernel = shift;
-	my $last_t = $_rss->{last_poll} || time();
-	my $t = time();
-	if ( $t - $last_t > $rss_min_delay ) {
-		$_rss->{last_poll} = $t;
+	$_rss->{last_poll} ||= time();
+	my $dt = time() - $_rss->{last_poll};
+	warn "## rss_check_updates $dt > $rss_min_delay\n";
+	if ( $dt > $rss_min_delay ) {
+		$_rss->{last_poll} = time();
 		_log rss_fetch_all( $kernel );
 	}
 }
@@ -729,6 +740,7 @@
 
 		save_message( channel => $channel, me => 0, nick => $nick, message => $msg);
 		meta( $nick, $channel, 'last-msg', $msg );
+		rss_check_updates( $kernel );
     },
     irc_ctcp_action => sub {
 		my $kernel = $_[KERNEL];
@@ -914,7 +926,6 @@
 #				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 = ? },
-				
 			};
 			if (my $q = $sql->{$1} ) {
 				my $sth = $dbh->prepare( $q );