MrPetovan/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1280 from annando/loglevels

Browse source 
Loglevels adjusted, warnings fixed
This commit is contained in:
Philipp Holzer 2022-09-08 07:38:07 +02:00 committed by GitHub
parent 9e0bc31d42 86e24c747e
commit 94a774a7d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openstreetmap/openstreetmap.php
View file

@ -81,7 +81,7 @@ function openstreetmap_location(App $a, &$item)
if ($item['coord'] != '') { if ($item['coord'] != '') {
$coords = explode(' ', $item['coord']); $coords = explode(' ', $item['coord']);
if (count($coords) > 1) { if ((count($coords) > 1) && is_numeric($coords[0]) && is_numeric($coords[1])) {
$lat = urlencode(round($coords[0], 5)); $lat = urlencode(round($coords[0], 5));
$lon = urlencode(round($coords[1], 5)); $lon = urlencode(round($coords[1], 5));
$target = $tmsserver; $target = $tmsserver;

57
twitter/twitter.php
View file

@ -199,7 +199,7 @@ function twitter_api_contact(string $apiPath, array $contact, int $uid): ?bool
return null; return null;
} }
return twitter_api_call($uid, $apiPath, ['screen_name' => $contact['nick']]); return (bool)twitter_api_call($uid, $apiPath, ['screen_name' => $contact['nick']]);
} }
function twitter_jot_nets(App $a, array &$jotnets_fields) function twitter_jot_nets(App $a, array &$jotnets_fields)
@ -564,16 +564,16 @@ function twitter_item_by_link(App $a, array &$hookData)
} }
} }
function twitter_api_post(string $apiPath, string $pid, int $uid): ?bool function twitter_api_post(string $apiPath, string $pid, int $uid): ?object
{ {
if (empty($pid)) { if (empty($pid)) {
return false; return null;
} }
return twitter_api_call($uid, $apiPath, ['id' => $pid]); return twitter_api_call($uid, $apiPath, ['id' => $pid]);
} }
function twitter_api_call(int $uid, string $apiPath, array $parameters = []): ?bool function twitter_api_call(int $uid, string $apiPath, array $parameters = []): ?object
{ {
$ckey = DI::config()->get('twitter', 'consumerkey'); $ckey = DI::config()->get('twitter', 'consumerkey');
$csecret = DI::config()->get('twitter', 'consumersecret'); $csecret = DI::config()->get('twitter', 'consumersecret');
@ -600,13 +600,13 @@ function twitter_api_call(int $uid, string $apiPath, array $parameters = []): ?b
Logger::info('[twitter] API call successful', ['apiPath' => $apiPath, 'parameters' => $parameters]); Logger::info('[twitter] API call successful', ['apiPath' => $apiPath, 'parameters' => $parameters]);
Logger::debug('[twitter] API call result', ['apiPath' => $apiPath, 'parameters' => $parameters, 'result' => $result]); Logger::debug('[twitter] API call result', ['apiPath' => $apiPath, 'parameters' => $parameters, 'result' => $result]);
return true; return $result;
} catch (TwitterOAuthException $twitterOAuthException) { } catch (TwitterOAuthException $twitterOAuthException) {
Logger::warning('Unable to communicate with twitter', ['apiPath' => $apiPath, 'parameters' => $parameters, 'code' => $twitterOAuthException->getCode(), 'exception' => $twitterOAuthException]); Logger::notice('Unable to communicate with twitter', ['apiPath' => $apiPath, 'parameters' => $parameters, 'code' => $twitterOAuthException->getCode(), 'exception' => $twitterOAuthException]);
return false; return null;
} catch (Exception $e) { } catch (Exception $e) {
Logger::notice('[twitter] API call failed', ['apiPath' => $apiPath, 'parameters' => $parameters, 'code' => $e->getCode(), 'message' => $e->getMessage()]); Logger::notice('[twitter] API call failed', ['apiPath' => $apiPath, 'parameters' => $parameters, 'code' => $e->getCode(), 'message' => $e->getMessage()]);
return false; return null;
} }
} }
@ -657,7 +657,7 @@ function twitter_post_hook(App $a, array &$b)
$condition = ['uri' => $b['thr-parent'], 'uid' => $b['uid']]; $condition = ['uri' => $b['thr-parent'], 'uid' => $b['uid']];
$thr_parent = Post::selectFirst(['uri', 'extid', 'author-link', 'author-nick', 'author-network'], $condition); $thr_parent = Post::selectFirst(['uri', 'extid', 'author-link', 'author-nick', 'author-network'], $condition);
if (!DBA::isResult($thr_parent)) { if (!DBA::isResult($thr_parent)) {
Logger::warning('No parent found', ['thr-parent' => $b['thr-parent']]); Logger::notice('No parent found', ['thr-parent' => $b['thr-parent']]);
return; return;
} }
@ -809,7 +809,7 @@ function twitter_post_hook(App $a, array &$b)
unset($post['media_ids']); unset($post['media_ids']);
} }
} catch (Exception $e) { } catch (Exception $e) {
Logger::warning('Exception when trying to send to Twitter', ['id' => $b['id'], 'message' => $e->getMessage()]); Logger::notice('Exception when trying to send to Twitter', ['id' => $b['id'], 'message' => $e->getMessage()]);
} }
} }
@ -856,7 +856,7 @@ function twitter_delete_item(array $item)
$condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid']]; $condition = ['uri' => $item['thr-parent'], 'uid' => $item['uid']];
$thr_parent = Post::selectFirst(['uri', 'extid', 'author-link', 'author-nick', 'author-network'], $condition); $thr_parent = Post::selectFirst(['uri', 'extid', 'author-link', 'author-nick', 'author-network'], $condition);
if (!DBA::isResult($thr_parent)) { if (!DBA::isResult($thr_parent)) {
Logger::warning('No parent found', ['thr-parent' => $item['thr-parent']]); Logger::notice('No parent found', ['thr-parent' => $item['thr-parent']]);
return; return;
} }
@ -1225,7 +1225,7 @@ function twitter_fetchtimeline(App $a, int $uid): void
try { try {
twitter_fetch_own_contact($a, $uid); twitter_fetch_own_contact($a, $uid);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching own contact', ['uid' => $uid, 'message' => $e->getMessage()]); Logger::notice('Error fetching own contact', ['uid' => $uid, 'message' => $e->getMessage()]);
return; return;
} }
@ -1247,7 +1247,7 @@ function twitter_fetchtimeline(App $a, int $uid): void
try { try {
$items = $connection->get('statuses/user_timeline', $parameters); $items = $connection->get('statuses/user_timeline', $parameters);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching timeline', ['uid' => $uid, 'message' => $e->getMessage()]); Logger::notice('Error fetching timeline', ['uid' => $uid, 'message' => $e->getMessage()]);
return; return;
} }
@ -1268,12 +1268,12 @@ function twitter_fetchtimeline(App $a, int $uid): void
} }
if ($first_time) { if ($first_time) {
Logger::warning('First time, continue'); Logger::notice('First time, continue');
continue; continue;
} }
if (stristr($post->source, $application_name)) { if (stristr($post->source, $application_name)) {
Logger::warning('Source is application name', ['source' => $post->source, 'application_name' => $application_name]); Logger::notice('Source is application name', ['source' => $post->source, 'application_name' => $application_name]);
continue; continue;
} }
Logger::info('Preparing mirror post', ['twitter-id' => $post->id_str, 'uid' => $uid]); Logger::info('Preparing mirror post', ['twitter-id' => $post->id_str, 'uid' => $uid]);
@ -1281,7 +1281,7 @@ function twitter_fetchtimeline(App $a, int $uid): void
$mirrorpost = twitter_do_mirrorpost($a, $uid, $post); $mirrorpost = twitter_do_mirrorpost($a, $uid, $post);
if (empty($mirrorpost['body'])) { if (empty($mirrorpost['body'])) {
Logger::warning('Body is empty', ['post' => $post, 'mirrorpost' => $mirrorpost]); Logger::notice('Body is empty', ['post' => $post, 'mirrorpost' => $mirrorpost]);
continue; continue;
} }
@ -1344,7 +1344,7 @@ function twitter_get_relation($uid, $target, $contact = [])
Logger::info('Fetched friendship relation', ['user' => $uid, 'target' => $target, 'relation' => $relation]); Logger::info('Fetched friendship relation', ['user' => $uid, 'target' => $target, 'relation' => $relation]);
} catch (Throwable $e) { } catch (Throwable $e) {
Logger::warning('Error fetching friendship status', ['uid' => $uid, 'target' => $target, 'message' => $e->getMessage()]); Logger::notice('Error fetching friendship status', ['uid' => $uid, 'target' => $target, 'message' => $e->getMessage()]);
} }
return $relation; return $relation;
@ -1417,12 +1417,12 @@ function twitter_fetch_contact($uid, $data, $create_user)
Contact::update($fields, ['id' => $cid]); Contact::update($fields, ['id' => $cid]);
Contact::updateAvatar($cid, $avatar); Contact::updateAvatar($cid, $avatar);
} else { } else {
Logger::warning('No contact found', ['fields' => $fields]); Logger::notice('No contact found', ['fields' => $fields]);
} }
$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => 'twitter::' . $data->id_str]); $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => 'twitter::' . $data->id_str]);
if (!DBA::isResult($contact) && empty($cid)) { if (!DBA::isResult($contact) && empty($cid)) {
Logger::warning('User contact not found', ['uid' => $uid, 'twitter-id' => $data->id_str]); Logger::notice('User contact not found', ['uid' => $uid, 'twitter-id' => $data->id_str]);
return 0; return 0;
} elseif (!$create_user) { } elseif (!$create_user) {
return $cid; return $cid;
@ -1506,7 +1506,7 @@ function twitter_fetchuser($screen_name)
$parameters = ['screen_name' => $screen_name]; $parameters = ['screen_name' => $screen_name];
$user = $connection->get('users/show', $parameters); $user = $connection->get('users/show', $parameters);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching user', ['user' => $screen_name, 'message' => $e->getMessage()]); Logger::notice('Error fetching user', ['user' => $screen_name, 'message' => $e->getMessage()]);
return null; return null;
} }
@ -1799,6 +1799,7 @@ function twitter_createpost(App $a, int $uid, $post, array $self, $create_user,
if (DBA::isResult($self)) { if (DBA::isResult($self)) {
$contactid = $self['id']; $contactid = $self['id'];
$postarray['owner-id'] = Contact::getIdForURL($self['url']);
$postarray['owner-name'] = $self['name']; $postarray['owner-name'] = $self['name'];
$postarray['owner-link'] = $self['url']; $postarray['owner-link'] = $self['url'];
$postarray['owner-avatar'] = $self['photo']; $postarray['owner-avatar'] = $self['photo'];
@ -1975,7 +1976,7 @@ function twitter_fetchparentposts(App $a, int $uid, $post, TwitterOAuth $connect
try { try {
$post = twitter_statuses_show($post->in_reply_to_status_id_str, $connection); $post = twitter_statuses_show($post->in_reply_to_status_id_str, $connection);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching parent post', ['uid' => $uid, 'post' => $post->id_str, 'message' => $e->getMessage()]); Logger::notice('Error fetching parent post', ['uid' => $uid, 'post' => $post->id_str, 'message' => $e->getMessage()]);
break; break;
} }
@ -2047,7 +2048,7 @@ function twitter_fetchhometimeline(App $a, int $uid): void
try { try {
$own_contact = twitter_fetch_own_contact($a, $uid); $own_contact = twitter_fetch_own_contact($a, $uid);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching own contact', ['uid' => $uid, 'message' => $e->getMessage()]); Logger::notice('Error fetching own contact', ['uid' => $uid, 'message' => $e->getMessage()]);
return; return;
} }
@ -2055,7 +2056,7 @@ function twitter_fetchhometimeline(App $a, int $uid): void
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$own_id = $contact['nick']; $own_id = $contact['nick'];
} else { } else {
Logger::warning('Own twitter contact not found', ['uid' => $uid]); Logger::notice('Own twitter contact not found', ['uid' => $uid]);
return; return;
} }
@ -2087,17 +2088,17 @@ function twitter_fetchhometimeline(App $a, int $uid): void
try { try {
$items = $connection->get('statuses/home_timeline', $parameters); $items = $connection->get('statuses/home_timeline', $parameters);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching home timeline', ['uid' => $uid, 'message' => $e->getMessage()]); Logger::notice('Error fetching home timeline', ['uid' => $uid, 'message' => $e->getMessage()]);
return; return;
} }
if (!is_array($items)) { if (!is_array($items)) {
Logger::warning('home timeline is no array', ['items' => $items]); Logger::notice('home timeline is no array', ['items' => $items]);
return; return;
} }
if (empty($items)) { if (empty($items)) {
Logger::notice('No new timeline content', ['uid' => $uid]); Logger::info('No new timeline content', ['uid' => $uid]);
return; return;
} }
@ -2170,12 +2171,12 @@ function twitter_fetchhometimeline(App $a, int $uid): void
try { try {
$items = $connection->get('statuses/mentions_timeline', $parameters); $items = $connection->get('statuses/mentions_timeline', $parameters);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching mentions', ['uid' => $uid, 'message' => $e->getMessage()]); Logger::notice('Error fetching mentions', ['uid' => $uid, 'message' => $e->getMessage()]);
return; return;
} }
if (!is_array($items)) { if (!is_array($items)) {
Logger::warning('mentions are no arrays', ['items' => $items]); Logger::notice('mentions are no arrays', ['items' => $items]);
return; return;
} }