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

Improved poll error handling

Browse Source
This commit is contained in:
aymm 2021-03-27 10:18:05 +00:00
parent d3f85ad779
commit 437591b297
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/APnutI.php
View File

@ -491,8 +491,13 @@ class APnutI
public function getPollFromToken(int $poll_id, ?string $poll_token = null): Poll public function getPollFromToken(int $poll_id, ?string $poll_token = null): Poll
{ {
$poll_token_query = empty($poll_token) ? '' : '?poll_token=' . $poll_token; $poll_token_query = empty($poll_token) ? '' : '?poll_token=' . $poll_token;
$res = $this->get('/polls/' . $poll_id . $poll_token_query); try {
return $this->getPollFromResponse($res); $res = $this->get('/polls/' . $poll_id . $poll_token_query);
return $this->getPollFromResponse($res);
} catch (NotAuthorizedException $nauth) {
$this->logger->error('Not authorized when fetching poll');
throw new PollAccessRestrictedException();
}
} }
public function getPoll(int $poll_id, ?string $poll_token = null): Poll public function getPoll(int $poll_id, ?string $poll_token = null): Poll
@ -513,8 +518,13 @@ class APnutI
'include_html' => false, 'include_html' => false,
'include_post_raw' => true 'include_post_raw' => true
]; ];
$res = $this->get('/posts/' . $post_id, $args); try {
return $this->getPollFromResponse($res); $res = $this->get('/posts/' . $post_id, $args);
return $this->getPollFromResponse($res);
} catch (NotAuthorizedException $nauth) {
$this->logger->error('Not authorized when fetching poll');
throw new PollAccessRestrictedException();
}
} else { } else {
$this->logger->debug('Poll token seems to be an actual poll token'); $this->logger->debug('Poll token seems to be an actual poll token');
return $this->getPollFromToken($poll_id, $poll_token); return $this->getPollFromToken($poll_id, $poll_token);