General: Use just the first level of redirection for URL shortening serivces

diff --git a/videosite.pl b/videosite.pl
index 2926b0b..bd4d041 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -157,7 +157,7 @@ sub expand_url_shortener {
         'bit\.ly/[[:alnum:]]+',
         'tinyurl\.com/[[:alnum:]]+',
         );
-    my $ua = LWP::UserAgent->new(agent => 'Mozilla');
+    my $ua = LWP::UserAgent->new(agent => 'Mozilla', max_redirect => 0);
     my $i = 100;
 
     OUTER: while (($os ne $s) and ($i > 0)) {
@@ -174,8 +174,8 @@ sub expand_url_shortener {
 
                 write_debug("Found %s", $matched);
                 $res = $ua->head($matched);
-                if ($res->is_success()) {
-                    my $new = $res->request()->uri();
+                if ($res->is_redirect()) {
+                    my $new = $res->headers()->header("Location");
 
                     write_debug("Replacing %s with %s", $matched, $new);
                     $s =~ s/$matched/$new/;