Changeset 23947

Timestamp:

11/17/08 20:03:54 (5 years ago)

Author:

daisuke

Message:

fix error case

Files:

• lang/perl/Morris/trunk/lib/Morris/Plugin/Channel/PeekURL.pm (modified) (3 diffs)

lang/perl/Morris/trunk/lib/Morris/Plugin/Channel/PeekURL.pm

@@ -11 +11 @@
     is => 'rw',
     isa => 'LWP::UserAgent',
-    default => sub { LWP::UserAgent->new(agent => 'Morris IRCBot/peekURL plugin') },
+    default => sub { LWP::UserAgent->new(timeout => 10, agent => 'Morris IRCBot/peekURL plugin') },
 );
 
@@ -42 +42 @@
         my $res = $self->user_agent->get($uri);
         if (! $res->is_success ) {
-            $self->irc_notice($args->{message}->channel, $res->message);
+            $self->connection->irc_notice({
+                channel => $args->{message}->channel,
+                message => $res->message
+            });
+            next;
+        }
+
+        if ( $res->content_type !~ /\btext\/html\b/i) {
+            $self->connection->irc_notice({
+                channel => $args->{message}->channel, 
+                message => sprintf( "%s [%s]", $uri, $res->content_type )
+            });
             next;
         }
@@ -54 +65 @@
             );
             $p->strict_comment(1);
-            $p->parse_content($res->content);
+            $p->parse_content($res->decoded_content);
             my $title = $p->find_by_tag_name('title');
             if ($title) {