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

fix regex

Browse Source
This commit is contained in:
Max Nuding 2024-04-10 11:34:54 +02:00
parent 4a3bbeec79
commit 7f16b67d02
No known key found for this signature in database
1 changed files with 225 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
src/APnutI.php
View File

@ -26,7 +26,7 @@ class APnutI
protected string $auth_url = 'https://pnut.io/oauth/authenticate'; protected string $auth_url = 'https://pnut.io/oauth/authenticate';
protected string $client_secret; protected string $client_secret;
protected string $client_id; protected string $client_id;
protected string $scope = ""; protected string $scope = '';
protected string $redirect_uri; protected string $redirect_uri;
protected int $rate_limit = 40; protected int $rate_limit = 40;
protected int $rate_limit_remaining = 40; protected int $rate_limit_remaining = 40;
@ -86,10 +86,11 @@ class APnutI
} elseif (is_string($log_level)) { } elseif (is_string($log_level)) {
$log_level = constant('Monolog\Logger::' . $log_level); $log_level = constant('Monolog\Logger::' . $log_level);
} }
$this->logger = empty($log_path) ? new NullLogger() : new Logger($this->app_name); $this->logger = empty($log_path)
? new NullLogger()
: new Logger($this->app_name);
$this->token_session_key = $this->app_name . 'access_token'; $this->token_session_key = $this->app_name . 'access_token';
$this->token_redirect_after_auth = $this->app_name $this->token_redirect_after_auth = $this->app_name . 'redirect_after_auth';
.'redirect_after_auth';
$handler = new RotatingFileHandler($log_path, 5, $log_level, true); $handler = new RotatingFileHandler($log_path, 5, $log_level, true);
$this->logger->pushHandler($handler); $this->logger->pushHandler($handler);
$this->server_token = null; $this->server_token = null;
@ -171,9 +172,7 @@ class APnutI
$this->logger->debug( $this->logger->debug(
'Is redirect. Headers: ' . json_encode($this->headers) 'Is redirect. Headers: ' . json_encode($this->headers)
); );
$this->logger->debug( $this->logger->debug('Is redirect. Target: ' . $v);
'Is redirect. Target: '. $v
);
$this->redirect_target = $v; $this->redirect_target = $v;
break; break;
} }
@ -188,7 +187,6 @@ class APnutI
string $content_type = 'application/x-www-form-urlencoded', string $content_type = 'application/x-www-form-urlencoded',
bool $follow_redirect = true bool $follow_redirect = true
): array { ): array {
$this->redirect_target = null; $this->redirect_target = null;
$this->meta = null; $this->meta = null;
$method = strtoupper($method); $method = strtoupper($method);
@ -201,26 +199,29 @@ class APnutI
// if they passed an array, build a list of parameters from it // if they passed an array, build a list of parameters from it
curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POST, true);
if (is_array($parameters) && $method !== 'POST-RAW') { if (is_array($parameters) && $method !== 'POST-RAW') {
$parameters = $content_type === 'application/json' ? json_encode($parameters) : http_build_query($parameters); $parameters =
$content_type === 'application/json'
? json_encode($parameters)
: http_build_query($parameters);
} }
curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters); curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters);
$headers[] = "Content-Type: ".$content_type; $headers[] = 'Content-Type: ' . $content_type;
} }
if ($method !== 'POST' && $method !== 'POST-RAW') { if ($method !== 'POST' && $method !== 'POST-RAW') {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
} }
if ($method === 'GET' && isset($parameters['access_token'])) { if ($method === 'GET' && isset($parameters['access_token'])) {
$this->logger->info("Using provided token for auth"); $this->logger->info('Using provided token for auth');
$headers[] = 'Authorization: Bearer ' . $params['access_token']; $headers[] = 'Authorization: Bearer ' . $params['access_token'];
} elseif (!empty($this->access_token)) { } elseif (!empty($this->access_token)) {
$this->logger->info("Using access token for auth"); $this->logger->info('Using access token for auth');
$headers[] = 'Authorization: Bearer ' . $this->access_token; $headers[] = 'Authorization: Bearer ' . $this->access_token;
} elseif (!empty($this->server_token)) { } elseif (!empty($this->server_token)) {
$use_server_token = true; $use_server_token = true;
$this->logger->info("Using server token for auth"); $this->logger->info('Using server token for auth');
$headers[] = 'Authorization: Bearer ' . $this->server_token; $headers[] = 'Authorization: Bearer ' . $this->server_token;
} else { } else {
$this->logger->info("Using no auth"); $this->logger->info('Using no auth');
} }
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
@ -233,13 +234,17 @@ class APnutI
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE); $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$effectiveURL = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); $effectiveURL = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
curl_close($ch); curl_close($ch);
$this->logger->debug("{$method} Request to {$url}. Received status: {$http_status}. Response: {$response}"); $this->logger->debug(
"{$method} Request to {$url}. Received status: {$http_status}. Response: {$response}"
);
if ($http_status === 0) { if ($http_status === 0) {
throw new \Exception('Unable to connect to Pnut ' . $url); throw new \Exception('Unable to connect to Pnut ' . $url);
} }
if ($request === false) { if ($request === false) {
if (!curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT)) { if (!curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT)) {
throw new \Exception('SSL verification failed, connection terminated: ' . $url); throw new \Exception(
'SSL verification failed, connection terminated: ' . $url
);
} }
} }
if (!empty($response)) { if (!empty($response)) {
@ -281,13 +286,21 @@ class APnutI
// look for errors // look for errors
if (isset($response['error'])) { if (isset($response['error'])) {
if (is_array($response['error'])) { if (is_array($response['error'])) {
throw new PnutException($response['error']['message'], $response['error']['code']); throw new PnutException(
$response['error']['message'],
$response['error']['code']
);
} else { } else {
throw new PnutException($response['error']); throw new PnutException($response['error']);
} }
// look for response migration errors // look for response migration errors
} elseif (isset($response['meta'], $response['meta']['error_message'])) { } elseif (
throw new PnutException($response['meta']['error_message'], $response['meta']['code']); isset($response['meta'], $response['meta']['error_message'])
) {
throw new PnutException(
$response['meta']['error_message'],
$response['meta']['code']
);
} }
} }
} }
@ -300,7 +313,11 @@ class APnutI
} elseif (!empty($this->redirect_target)) { } elseif (!empty($this->redirect_target)) {
return [$this->redirect_target]; return [$this->redirect_target];
} else { } else {
throw new PnutException("No response ".json_encode($response).", http status: ${http_status}"); throw new PnutException(
'No response ' .
json_encode($response) .
", http status: ${http_status}"
);
} }
} }
@ -313,10 +330,8 @@ class APnutI
return $this->makeRequest($method, $end_point, $parameters, $content_type); return $this->makeRequest($method, $end_point, $parameters, $content_type);
} }
public function postJson( public function postJson(string $end_point, array $parameters): array
string $end_point, {
array $parameters
): array {
return $this->post($end_point, $parameters, 'application/json'); return $this->post($end_point, $parameters, 'application/json');
} }
@ -332,7 +347,13 @@ class APnutI
$end_point .= $separator . http_build_query($parameters); $end_point .= $separator . http_build_query($parameters);
$parameters = []; $parameters = [];
} }
return $this->makeRequest('get', $end_point, $parameters, $content_type, $follow_redirect); return $this->makeRequest(
'get',
$end_point,
$parameters,
$content_type,
$follow_redirect
);
} }
public function getAuthURL($append_redirect_query_string = null) public function getAuthURL($append_redirect_query_string = null)
@ -341,30 +362,35 @@ class APnutI
if (!empty($append_redirect_query_string)) { if (!empty($append_redirect_query_string)) {
$redirect_uri .= $append_redirect_query_string; $redirect_uri .= $append_redirect_query_string;
} }
$url = $this->auth_url $url =
. '?client_id=' $this->auth_url .
. $this->client_id '?client_id=' .
. '&redirect_uri=' $this->client_id .
. urlencode($redirect_uri) '&redirect_uri=' .
. '&scope='.$this->needed_scope urlencode($redirect_uri) .
. '&response_type=code'; '&scope=' .
$this->needed_scope .
'&response_type=code';
$this->logger->debug('Auth URL: ' . $url); $this->logger->debug('Auth URL: ' . $url);
return $url; return $url;
} }
//TODO: Ping server and validate token //TODO: Ping server and validate token
public function isAuthenticated(bool $allow_server_token = false, bool $skip_verify_token = false): bool public function isAuthenticated(
{ bool $allow_server_token = false,
$is_authenticated = ($allow_server_token && !empty($this->server_token)) bool $skip_verify_token = false
|| isset($this->access_token); ): bool {
$log_str = $is_authenticated $is_authenticated =
? 'Authenticated' ($allow_server_token && !empty($this->server_token)) ||
: 'Not authenticated'; isset($this->access_token);
$log_str = $is_authenticated ? 'Authenticated' : 'Not authenticated';
$this->logger->info( $this->logger->info(
"Checking auth status for app: {$this->app_name}: {$log_str}" "Checking auth status for app: {$this->app_name}: {$log_str}"
); );
if (isset($_SERVER['HTTP_REFERER'])) { if (isset($_SERVER['HTTP_REFERER'])) {
$this->logger->info('Referrer: '.($_SERVER['HTTP_REFERER'] ?? 'Unknown')); $this->logger->info(
'Referrer: ' . ($_SERVER['HTTP_REFERER'] ?? 'Unknown')
);
$_SESSION[$this->token_redirect_after_auth] = $_SERVER['HTTP_REFERER']; $_SESSION[$this->token_redirect_after_auth] = $_SERVER['HTTP_REFERER'];
} }
return $is_authenticated; return $is_authenticated;
@ -378,7 +404,7 @@ class APnutI
'client_secret' => $this->client_secret, 'client_secret' => $this->client_secret,
'code' => $auth_code, 'code' => $auth_code,
'redirect_uri' => $this->redirect_uri, 'redirect_uri' => $this->redirect_uri,
'grant_type'=> 'authorization_code' 'grant_type' => 'authorization_code',
]; ];
$resp = $this->post( $resp = $this->post(
'/oauth/access_token', '/oauth/access_token',
@ -387,7 +413,7 @@ class APnutI
); );
if (empty($resp['access_token'])) { if (empty($resp['access_token'])) {
$this->logger->error("No access token ".json_encode($resp)); $this->logger->error('No access token ' . json_encode($resp));
return false; return false;
} else { } else {
$this->logger->debug('Received access token ' . $resp['access_token']); $this->logger->debug('Received access token ' . $resp['access_token']);
@ -458,9 +484,11 @@ class APnutI
foreach ($posts as $post) { foreach ($posts as $post) {
$post_obj[] = new Post($post, $this); $post_obj[] = new Post($post, $this);
} }
} while ($this->meta != null } while (
&& $this->meta->more $this->meta != null &&
&& (count($post_obj) < $count || $count !== 0)); $this->meta->more &&
(count($post_obj) < $count || $count !== 0)
);
return $post_obj; return $post_obj;
} }
@ -476,7 +504,7 @@ class APnutI
'include_html' => false, 'include_html' => false,
'include_mention_posts' => false, 'include_mention_posts' => false,
'include_copy_mentions' => false, 'include_copy_mentions' => false,
'include_post_raw' => true 'include_post_raw' => true,
]; ];
foreach ($params as $param => $value) { foreach ($params as $param => $value) {
$parameters[$param] = $value; $parameters[$param] = $value;
@ -515,8 +543,10 @@ 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;
return $this->getPollFromEndpoint('/polls/' . $poll_id . $poll_token_query); return $this->getPollFromEndpoint('/polls/' . $poll_id . $poll_token_query);
} }
@ -528,7 +558,8 @@ class APnutI
} }
$this->logger->debug('Poll token provided'); $this->logger->debug('Poll token provided');
$re = '/((http(s)?:\/\/)?((posts)|(beta))\.pnut\.io\/(@.*\/)?)?(?(1)|^)(?<postid>\d+)/'; $re =
'/((http(s)?:\/\/)?((posts)|(beta))\.pnut\.io\/(@.*\/)?)?(?(1)|^)(?<postid>\d+)/$';
preg_match($re, $poll_token, $matches); preg_match($re, $poll_token, $matches);
if (!empty($matches['postid'])) { if (!empty($matches['postid'])) {
$this->logger->debug('Poll token is post ' . $matches['postid']); $this->logger->debug('Poll token is post ' . $matches['postid']);
@ -537,7 +568,7 @@ class APnutI
'include_raw' => true, 'include_raw' => true,
'include_counts' => false, 'include_counts' => false,
'include_html' => false, 'include_html' => false,
'include_post_raw' => true 'include_post_raw' => true,
]; ];
return $this->getPollFromEndpoint('/posts/' . $post_id, $arg); return $this->getPollFromEndpoint('/posts/' . $post_id, $arg);
} else { } else {
@ -557,13 +588,16 @@ class APnutI
$poll_types = Poll::$poll_types; $poll_types = Poll::$poll_types;
$poll_types[] = Poll::$notice_type; $poll_types[] = Poll::$notice_type;
$poll_types_param = implode(',', $poll_types); $poll_types_param = implode(',', $poll_types);
$this->logger->info('No list of polls provided, using post search for poll types: '.$poll_types_param); $this->logger->info(
'No list of polls provided, using post search for poll types: ' .
$poll_types_param
);
$endpoint = '/posts/search?raw_types=' . $poll_types_param; $endpoint = '/posts/search?raw_types=' . $poll_types_param;
$params = [ $params = [
'include_raw' => true, 'include_raw' => true,
'include_counts' => false, 'include_counts' => false,
'include_html' => false, 'include_html' => false,
'include_post_raw' => true 'include_post_raw' => true,
]; ];
} }
try { try {
@ -586,10 +620,13 @@ class APnutI
} }
} }
public function voteInPoll(int $poll_id, array $options, ?string $poll_token): Poll public function voteInPoll(
{ int $poll_id,
array $options,
?string $poll_token
): Poll {
$params = [ $params = [
'positions' => $options 'positions' => $options,
]; ];
if (!empty($poll_token)) { if (!empty($poll_token)) {
$params['poll_token'] = $poll_token; $params['poll_token'] = $poll_token;
@ -621,7 +658,7 @@ class APnutI
if (!empty($this->access_token)) { if (!empty($this->access_token)) {
#$this->logger->info("AT:".$this->access_token); #$this->logger->info("AT:".$this->access_token);
} else { } else {
$this->logger->info("No AT"); $this->logger->info('No AT');
} }
// Remove in production again // Remove in production again
@ -650,11 +687,18 @@ class APnutI
//get returns an array with the url at idx 0 //get returns an array with the url at idx 0
$r = null; $r = null;
try { try {
$r = $this->get('/users/'.$user_id.'/avatar', $args, 'application/json', false); $r = $this->get(
'/users/' . $user_id . '/avatar',
$args,
'application/json',
false
);
} catch (HttpPnutRedirectException $re) { } catch (HttpPnutRedirectException $re) {
return $re->response; return $re->response;
} }
$this->logger->error('Could not fetch avatar: No redirection! ' . json_encode($r)); $this->logger->error(
'Could not fetch avatar: No redirection! ' . json_encode($r)
);
throw new PnutException('Could not fetch avatar: No redirection!'); throw new PnutException('Could not fetch avatar: No redirection!');
} }
@ -728,7 +772,10 @@ class APnutI
if (!empty($raw)) { if (!empty($raw)) {
$parameters['raw'] = $parameters; $parameters['raw'] = $parameters;
} }
return new Post($this->post('/posts', $parameters, 'application/json'), $this); return new Post(
$this->post('/posts', $parameters, 'application/json'),
$this
);
} }
public function createPostWithParameters( public function createPostWithParameters(
@ -743,20 +790,28 @@ class APnutI
$parameters = array_merge($parameters, $params); $parameters = array_merge($parameters, $params);
$this->logger->debug('Post with params'); $this->logger->debug('Post with params');
$this->logger->debug(json_encode($parameters)); $this->logger->debug(json_encode($parameters));
return new Post($this->post('/posts', $parameters, 'application/json'), $this); return new Post(
$this->post('/posts', $parameters, 'application/json'),
$this
);
} }
public function getChannel(int $channel_id): Channel public function getChannel(int $channel_id): Channel
{ {
# Always include channel raw, it contains the channel name # Always include channel raw, it contains the channel name
$parameters = [ $parameters = [
'include_channel_raw' => true 'include_channel_raw' => true,
]; ];
return new Channel($this->get('/channels/'.$channel_id, $parameters), $this); return new Channel(
$this->get('/channels/' . $channel_id, $parameters),
$this
);
} }
public function getSubscribedChannels(bool $include_pms = true, bool $include_channels = true): array public function getSubscribedChannels(
{ bool $include_pms = true,
bool $include_channels = true
): array {
# Always include channel raw, it contains the channel name # Always include channel raw, it contains the channel name
$channel_types = []; $channel_types = [];
if ($include_pms) { if ($include_pms) {
@ -768,7 +823,7 @@ class APnutI
$parameters = [ $parameters = [
'include_channel_raw' => true, 'include_channel_raw' => true,
'channel_types' => implode(',', $channel_types) 'channel_types' => implode(',', $channel_types),
]; ];
$channels = []; $channels = [];
$resp = $this->get('/users/me/channels/subscribed', $parameters); $resp = $this->get('/users/me/channels/subscribed', $parameters);
@ -784,19 +839,28 @@ class APnutI
self::$POST_MAX_LENGTH = $config['post']['max_length']; self::$POST_MAX_LENGTH = $config['post']['max_length'];
//self::$POST_MAX_LENGTH_REPOST = $config['post']['repost_max_length']; //self::$POST_MAX_LENGTH_REPOST = $config['post']['repost_max_length'];
self::$POST_MAX_LENGTH_REPOST = self::$POST_MAX_LENGTH; self::$POST_MAX_LENGTH_REPOST = self::$POST_MAX_LENGTH;
self::$POST_SECONDS_BETWEEN_DUPLICATES = $config['post']['seconds_between_duplicates']; self::$POST_SECONDS_BETWEEN_DUPLICATES =
$config['post']['seconds_between_duplicates'];
self::$MESSAGE_MAX_LENGTH = $config['message']['max_length']; self::$MESSAGE_MAX_LENGTH = $config['message']['max_length'];
self::$RAW_MAX_LENGTH = $config['raw']['max_length']; self::$RAW_MAX_LENGTH = $config['raw']['max_length'];
self::$USER_DESCRIPTION_MAX_LENGTH = $config['user']['description_max_length']; self::$USER_DESCRIPTION_MAX_LENGTH =
$config['user']['description_max_length'];
self::$USER_USERNAME_MAX_LENGTH = $config['user']['username_max_length']; self::$USER_USERNAME_MAX_LENGTH = $config['user']['username_max_length'];
$this->logger->info('-----------Pnut API config-----------'); $this->logger->info('-----------Pnut API config-----------');
$this->logger->info(''); $this->logger->info('');
$this->logger->info("Max post length: ".self::$POST_MAX_LENGTH); $this->logger->info('Max post length: ' . self::$POST_MAX_LENGTH);
$this->logger->info("Max repost length: ".self::$POST_MAX_LENGTH_REPOST); $this->logger->info('Max repost length: ' . self::$POST_MAX_LENGTH_REPOST);
$this->logger->info("Seconds between post duplicates: ".self::$POST_SECONDS_BETWEEN_DUPLICATES); $this->logger->info(
$this->logger->info("Max raw length: ".self::$RAW_MAX_LENGTH); 'Seconds between post duplicates: ' .
$this->logger->info("Max user description length: ".self::$USER_DESCRIPTION_MAX_LENGTH); self::$POST_SECONDS_BETWEEN_DUPLICATES
$this->logger->info("Max username length: ".self::$USER_USERNAME_MAX_LENGTH); );
$this->logger->info('Max raw length: ' . self::$RAW_MAX_LENGTH);
$this->logger->info(
'Max user description length: ' . self::$USER_DESCRIPTION_MAX_LENGTH
);
$this->logger->info(
'Max username length: ' . self::$USER_USERNAME_MAX_LENGTH
);
$this->logger->info('--------------------------------------'); $this->logger->info('--------------------------------------');
} }
@ -812,7 +876,7 @@ class APnutI
{ {
$token = $this->getServerToken(); $token = $this->getServerToken();
$this->server_token = $token; $this->server_token = $token;
$this->logger->info("ST:".$this->server_token); $this->logger->info('ST:' . $this->server_token);
} }
protected function getServerToken(): string protected function getServerToken(): string
@ -821,14 +885,16 @@ class APnutI
$params = [ $params = [
'client_id' => $this->client_id, 'client_id' => $this->client_id,
'client_secret' => $this->client_secret, 'client_secret' => $this->client_secret,
'grant_type' => 'client_credentials' 'grant_type' => 'client_credentials',
]; ];
$resp = $this->post('/oauth/access_token', $params); $resp = $this->post('/oauth/access_token', $params);
if (!empty($resp['access_token'])) { if (!empty($resp['access_token'])) {
$this->logger->info(json_encode($resp)); $this->logger->info(json_encode($resp));
return $resp['access_token']; return $resp['access_token'];
} else { } else {
throw new PnutException("Error retrieving app access token: ".json_encode($resp)); throw new PnutException(
'Error retrieving app access token: ' . json_encode($resp)
);
} }
} }