--- trunk/bin/irc-logger.pl	2008/03/07 09:50:53	90
+++ trunk/bin/irc-logger.pl	2008/03/07 17:13:30	99
@@ -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;
 
@@ -118,11 +117,11 @@
 		# protect HTML from wiki modifications
 		sub e {
 			my $t = shift;
-			return 'uri_unescape{' . uri_escape($t) . '}';
+			return 'uri_unescape{' . uri_escape($t, '^a-zA-Z0-9') . '}';
 		}
 
 		$m =~ s/($escape_re)/$escape{$1}/gs;
-		$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs ||
+		$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs;
 		$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
 		$m =~ s#$tag_regex#e(qq{<a href="$url?tag=$1" class="tag">$1</a>})#egs;
 		$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
@@ -179,12 +178,15 @@
 	name text,
 	delay interval not null default '5 min',
 	active boolean default true,
+	channel text not null,
+	nick text not null,
+	private boolean default false,
 	last_update timestamp default 'now()',
 	polls int default 0,
 	updates int default 0
 );
 create unique index feeds_url on feeds(url);
-insert into feeds (url,name) values ('http://wiki.razmjenavjestina.org/feed/workspace/razmjenavjestina?category=Recent%20Changes','wiki');
+insert into feeds (url,name,channel,nick) values ('http://wiki.razmjenavjestina.org/feed/workspace/razmjenavjestina?category=Recent%20Changes','wiki','$CHANNEL','dpavlin');
 	},
 };
 
@@ -228,9 +230,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 +242,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;
 
@@ -628,30 +630,47 @@
 		_log("can't fetch RSS ", $args->{url});
 		return;
 	}
+
 	my ( $total, $updates ) = ( 0, 0 );
 	for my $entry ($feed->entries) {
 		$total++;
 
 		# seen allready?
-		return if $_rss->{$feed->link}->{seen}->{$entry->id}++ > 0;
+		next if $_rss->{$args->{channel}}->{$feed->link}->{$entry->id}++ > 0;
 
 		sub prefix {
 			my ($txt,$var) = @_;
+			$var =~ s/\s+/ /gs;
 			$var =~ s/^\s+//g;
+			$var =~ s/\s+$//g;
 			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->link );
+		$msg .= prefix( ' | ' , $entry->title );
+		$msg .= prefix( ' | ' , $link );
 #		$msg .= prefix( ' id ' , $entry->id );
 
 		if ( $args->{kernel} && $send_rss_msgs ) {
 			$send_rss_msgs--;
-			_log('RSS', $msg);
-			$sth_insert_log->execute( $CHANNEL, 1, $NICK, $msg, undef );
-			$args->{kernel}->post( $IRC_ALIAS => notice => $CHANNEL, $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);
+			$args->{kernel}->post( $IRC_ALIAS => $type => $to, $msg );
 			$updates++;
 		}
 	}
@@ -669,7 +688,7 @@
 sub rss_fetch_all {
 	my $kernel = shift;
 	my $sql = qq{
-		select id, url, name
+		select id, url, name, channel, nick, private
 		from feeds
 		where active is true
 	};
@@ -689,10 +708,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 );
 	}
 }
@@ -725,6 +745,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];
@@ -897,21 +918,44 @@
 			$_rss = undef;
 			$dbh->do( qq{ update feeds set last_update = now() - delay } );
 			$res = "OK, cleaned RSS cache";
-		} elsif ($msg =~ m!^rss-(add|remove|stop|start)\s+(http://\S+)\s*(.*)!) {
+		} elsif ($msg =~ m/^rss-list/) {
+			my $sth = $dbh->prepare(qq{ select url,name,last_update,active,channel,nick,private from feeds });
+			$sth->execute;
+			while (my @row = $sth->fetchrow_array) {
+				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, join(' | ',@row) );
+			}
+			$res = '';
+		} elsif ($msg =~ m!^rss-(add|remove|stop|start)(?:-(private))?\s+(http://\S+)\s*(.*)!) {
+			my ( $command, $sub, $url, $arg ) = ( $1,$2,$3,$4 );
+
+			my $channel = $1 if ( $arg =~ s/\s*(#\S+)\s*// );
+			$channel = $nick if $sub eq 'private';
+
 			my $sql = {
-				add		=> qq{ insert into feeds (url,name) 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 = ? -- ? },
-				
+				start	=> qq{ update feeds set active = true	where url = ? },
+				stop	=> qq{ update feeds set active = false	where url = ? },
 			};
-			if (my $q = $sql->{$1} ) {
+
+			if ( $command eq 'add' && ! $channel ) {
+				$res = "ERROR: got '$msg' which doesn't have #channel in it, ignoring!";
+			} elsif (my $q = $sql->{$command} ) {
 				my $sth = $dbh->prepare( $q );
-				warn "## SQL $q ( $2 | $3 )\n";
-				eval { $sth->execute( $2, $3 ) };
+				my @data = ( $url );
+				if ( $command eq 'add' ) {
+					push @data, ( $arg, $channel, $nick, $sub eq 'private' ? 1 : 0 );
+				}
+				warn "## $command SQL $q with ",dump( @data ),"\n";
+				eval { $sth->execute( @data ) };
+				if ($@) {
+					$res = "ERROR: $@";
+				} else {
+					$res = "OK, RSS [$command|$sub|$url|$arg]";
+				}
+			} else {
+				$res = "ERROR: don't know what to do with: $msg";
 			}
-
-			$res = "OK, RSS $1 : $2 - $3";
 		}
 
 		if ($res) {
@@ -1115,6 +1159,13 @@
 				$feed->add_entry( $feed_entry );
 			}
 
+			my $feed_entry = XML::Feed::Entry->new($type);
+			$feed_entry->title( "Internal stats" );
+			$feed_entry->content(
+				'<![CDATA[<pre>' . dump( $_rss ) . '</pre>]]>'
+			);
+			$feed->add_entry( $feed_entry );
+
 		} else {
 			_log "unknown rss request ",$request->url;
 			return RC_DENY;