phlaym/APnutI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed avatar redirection handling

Browse Source
This commit is contained in:
aymm 2021-03-11 16:07:01 +00:00
parent 7017e720d7
commit 6b69e990e1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/APnutI.php
View File

@ -223,6 +223,10 @@ class APnutI
} }
if (!empty($response)) { if (!empty($response)) {
$response = $this->parseHeaders($response); $response = $this->parseHeaders($response);
if ($http_status == 302) {
#echo json_encode(preg_match_all('/^Location:(.*)$/mi', $response, $matches));
throw new HttpPnutRedirectException($response);
}
if (!empty($response)) { if (!empty($response)) {
$response = json_decode($response, true); $response = json_decode($response, true);
try { try {
@ -262,12 +266,7 @@ class APnutI
} }
} }
if ($http_status < 200 || $http_status >= 300) { if ($http_status < 200 || $http_status >= 300) {
if ($http_status == 302) { throw new HttpPnutException('HTTP error '.$http_status);
#echo json_encode(preg_match_all('/^Location:(.*)$/mi', $response, $matches));
throw new HttpPnutRedirectException($response);
} else {
throw new HttpPnutException('HTTP error '.$http_status);
}
} elseif (isset($response['meta'], $response['data'])) { } elseif (isset($response['meta'], $response['data'])) {
return $response['data']; return $response['data'];
} elseif (isset($response['access_token'])) { } elseif (isset($response['access_token'])) {
@ -514,7 +513,14 @@ class APnutI
public function getAvatar(int $user_id, array $args = []): string public function getAvatar(int $user_id, array $args = []): string
{ {
//get returns an array with the url at idx 0 //get returns an array with the url at idx 0
return $this->get('/users/'.$user_id.'/avatar', $args)[0]; $r = null;
try {
$r = $this->get('/users/'.$user_id.'/avatar', $args);
} catch (HttpPnutRedirectException $re) {
return $re->getMessage();
}
$this->logger->error('Could not fetch avatar: No redirection! ' . json_encode($r));
throw new PnutException('Could not fetch avatar: No redirection!');
} }
public function getAvatarUrl( public function getAvatarUrl(
@ -530,7 +536,7 @@ class APnutI
if (!empty($height)) { if (!empty($height)) {
$args['h'] = $height; $args['h'] = $height;
} }
return $this->get('/users/'.$user_id.'/avatar', $args)[0]; return $this->getAvatar($user_id, $args);
} }
public function updateAvatar( public function updateAvatar(