diff --git a/lib/sites/mixcloud.pm b/lib/sites/mixcloud.pm index 7ac0a017bf3cd44d682dd3759ed213fb5397330f..fd3c66c43d09b417264ffab057218f69cb0ca66a 100644 --- a/lib/sites/mixcloud.pm +++ b/lib/sites/mixcloud.pm @@ -14,7 +14,7 @@ my $inAuthor = 0; my %infos; -sub mixcloud { +sub get { my ($url) = @_; my $ua = LWP::UserAgent->new( diff --git a/lib/sites/parser.pm b/lib/sites/parser.pm index ae85f26acc2773ee6905e30f6b1ad96353ac0c43..4c78328cc4e5ed63d13eadb6979e991939f2c7c2 100644 --- a/lib/sites/parser.pm +++ b/lib/sites/parser.pm @@ -5,10 +5,10 @@ our @ISA = qw(Exporter); our @EXPORT_OK = qw(parse); use lib "$FindBin::Bin/lib/sites/"; -use youtube qw(youtube); -use soundcloud qw(soundcloud); -use mixcloud qw(mixcloud); -use zippy qw(zippy); +use youtube; +use soundcloud; +use mixcloud; +use zippy; sub parse { @@ -16,24 +16,24 @@ sub parse { my %content; if ($msg =~ m#(?:^|[^!])https?://(?:www.youtube.com/watch\?[a-zA-Z0-9_=&-]*v=|youtu.be/)([a-zA-Z0-9_-]+)#) { - eval { %content = youtube($1) }; + eval { %content = youtube::get($1) }; $content{'site'} = 'youtube'; $content{'url'} = 'https://www.youtube.com/watch?v='.$1; } elsif ($msg =~ m#(^|[^!])https?://soundcloud.com/([a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+)#) { my $url = 'https://www.soundcloud.com/'.$2; - eval { %content = soundcloud($url) }; + eval { %content = soundcloud::get($url) }; $content{'site'} = 'soundcloud'; } elsif ($msg =~ m#(^|[^!])https?://www.mixcloud.com/([a-zA-Z0-9-_]+/[a-zA-Z0-9-_]+)#) { my $url = 'https://www.mixcloud.com/'.$2; - eval { %content = mixcloud($url) }; + eval { %content = mixcloud::get($url) }; $content{'site'} = 'mixcloud'; } elsif ($msg =~ m#((^|[^!])http://www[0-9]+.zippyshare.com/v/[0-9]+/file.html)#) { my $url = $1; - eval { %content = zippy($url) }; + eval { %content = zippy::get($url) }; $content{'site'} = 'zippyshare'; } diff --git a/lib/sites/soundcloud.pm b/lib/sites/soundcloud.pm index c4198e21def16c21a0b3e824cd4ba50c03ea5053..890a04bf64c96bbb78a7d95ac23cfb1afcaf424b 100644 --- a/lib/sites/soundcloud.pm +++ b/lib/sites/soundcloud.pm @@ -12,7 +12,7 @@ my $root = 'http://api.soundcloud.com'; my $clientId = 'f4956716fe1a9dc9c3725af822963365'; -sub soundcloud { +sub get { my ($url) = @_; my $ua = LWP::UserAgent->new(timeout => 30); diff --git a/lib/sites/youtube.pm b/lib/sites/youtube.pm index cc5da5d05db07fcb78ca8570e9cb69e4ef7cc0ff..e0cad680ddeb4cc3c5f949affa1b7e1f763f3e29 100644 --- a/lib/sites/youtube.pm +++ b/lib/sites/youtube.pm @@ -6,7 +6,7 @@ require Exporter; our @ISA = qw(Exporter); our @EXPORT_OK = qw(youtube); -sub youtube { +sub get { my $id = shift; my $yt = new WebService::GData::YouTube(); diff --git a/lib/sites/zippy.pm b/lib/sites/zippy.pm index b8951d01c6c5a29fccc4711607f170c7e7ed34f4..7525e68c5e8a23ffe7fa5f43935765b035d88c35 100644 --- a/lib/sites/zippy.pm +++ b/lib/sites/zippy.pm @@ -14,7 +14,7 @@ my $inAuthor = 0; my %infos; -sub zippy { +sub get { my ($url) = @_; my $ua = LWP::UserAgent->new(