diff --git a/CHANGELOG b/CHANGELOG index 6ede789..0bd4b7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.410.1 + - drop JSON::XS::VersionOneAndTwo + 0.410.0 - add yt-dlp update (credits @https://github.com/ElFishi) diff --git a/plugin/API.pm b/plugin/API.pm index 06aa2e2..af38ece 100644 --- a/plugin/API.pm +++ b/plugin/API.pm @@ -4,7 +4,7 @@ use strict; use Digest::MD5 qw(md5_hex); use File::Spec::Functions qw(catdir); -use JSON::XS::VersionOneAndTwo; +use JSON::XS qw(decode_json); use List::Util qw(min max); use URI::Escape qw(uri_escape uri_escape_utf8); use MIME::Base64 qw(decode_base64); @@ -148,7 +148,7 @@ sub _call { Slim::Networking::SimpleAsyncHTTP->new( sub { my $response = shift; - my $result = eval { from_json($response->content) }; + my $result = eval { decode_json($response->content) }; if ($@) { $log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug; diff --git a/plugin/Oauth2.pm b/plugin/Oauth2.pm index 08e6e3c..21a7a08 100644 --- a/plugin/Oauth2.pm +++ b/plugin/Oauth2.pm @@ -8,7 +8,7 @@ use Slim::Utils::Prefs; use Slim::Utils::Log; use Slim::Utils::Cache; use Slim::Utils::Strings qw(string cstring); -use JSON::XS::VersionOneAndTwo; +use JSON::XS qw(decode_json); my $log = logger('plugin.youtube'); my $prefs = preferences('plugin.youtube'); @@ -33,7 +33,7 @@ sub getToken { my $http = Slim::Networking::SimpleAsyncHTTP->new( sub { my $response = shift; - my $result = eval { from_json($response->content) }; + my $result = eval { decode_json($response->content) }; if ($@) { $log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug; @@ -80,7 +80,7 @@ sub getCode { my $http = Slim::Networking::SimpleAsyncHTTP->new( sub { my $response = shift; - my $result = eval { from_json($response->content) }; + my $result = eval { decode_json($response->content) }; if ($@) { $log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug; diff --git a/plugin/Plugin.pm b/plugin/Plugin.pm index 43ed038..53c5bb8 100644 --- a/plugin/Plugin.pm +++ b/plugin/Plugin.pm @@ -9,7 +9,6 @@ use base qw(Slim::Plugin::OPMLBased); use List::Util qw(first); use Encode qw(encode decode); -use JSON::XS::VersionOneAndTwo; use HTML::Entities; use File::Spec; use File::Spec::Functions;