aleesa-bot/aleesa-telegram
0
Fork 0
Code Pull Requests Projects Releases Activity

1-st run fixes after refactor

Browse Source
This commit is contained in:
eleksir
2021-04-24 16:12:30 +03:00
parent a3f8b43f07
commit fbab0a4d88
11 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/BotLib/Image/Flickr.pm
View File

@@ -185,10 +185,10 @@ sub flickrAuthorization {
my $ua = Mojo::UserAgent->new->connect_timeout (5);
my $r = $ua->get ($url)->result;
if ($r->is_success) {
return $r->url;
if ($r->code == 302) {
return $r->content->headers->location;
} else {
say "Something went wrong: $r->code $r->message"; ## no critic (InputOutput::RequireCheckedSyscalls)
printf 'Something went wrong: %s %s', $r->code, $r->message;
return;
}
}
@@ -471,7 +471,7 @@ sub FlickrInit {
my $flickr_request_token_secret = $cache->get ('flickr_request_token_secret');
unless (defined $flickr_request_token || defined $flickr_request_token_secret) {
say "Looks like there is no request token or request token secret in config db."; ## no critic (InputOutput::RequireCheckedSyscalls)
say 'Looks like there is no request token or request token secret in config db.'; ## no critic (InputOutput::RequireCheckedSyscalls)
say 'Please remove verifier settings from config.json and run this script again.'; ## no critic (InputOutput::RequireCheckedSyscalls)
return 0;
}

17
lib/BotLib/Image/Imgur.pm
View File

@@ -19,6 +19,7 @@ use Exporter qw (import);
our @EXPORT_OK = qw (Imgur);
my $c = LoadConf ();
my $cachedir = $c->{cachedir};
sub Imgur {
my $tag = shift;
@@ -27,20 +28,20 @@ sub Imgur {
my $search_url = 'https://api.imgur.com/3/gallery/search/';
my $imgur_client_id = $c->{image}->{imgur}->{client_id} // do {
cluck "No client_id specified in config for imgur module";
cluck 'No client_id specified in config for imgur module';
return undef;
};
my $imgur_client_secret = $c->{image}->{imgur}->{client_secret} // do {
cluck "No client_secret specified in config for imgur module";
cluck 'No client_secret specified in config for imgur module';
return undef;
};
my $imgur_access_token = $c->{image}->{imgur}->{access_token} // do {
cluck "No access_token specified in config for imgur module";
cluck 'No access_token specified in config for imgur module';
return undef;
};
my $imgur_refresh_token = $c->{image}->{imgur}->{refresh_token} // do {
cluck "No refresh_token specified in config for imgur module";
}
cluck 'No refresh_token specified in config for imgur module';
};
# N.B. Both imgur_access_token and imgur_refresh_token time to time can change, so we need
# some place where we can store new values
@@ -81,7 +82,6 @@ sub Imgur {
unless ($r->is_success) {
cluck "Unable to refresh imgur token, please re-authorise app! or imgur experiencing api outage: $r->code $r->message";
untie %secret;
return undef;
}
@@ -89,12 +89,11 @@ sub Imgur {
if (defined $refresh) {
$imgur_refresh_token = $refresh->{refresh_token};
$secret{imgur_refresh_token} = $refresh->{refresh_token};
$cache->set ('refresh_token', $refresh->{refresh_token}, 'never');
$imgur_access_token = $refresh->{access_token};
$secret{imgur_access_token} = $refresh->{access_token};
$cache->set ('imgur_access_token', $refresh->{access_token}, 'never');
} else {
cluck "Unable to refresh imgur access_token, unable to decode json: $EVAL_ERROR";
untie %secret;
return undef;
}