X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=statusnet%2Fstatusnet.php;h=5cb65b91fdb90d4ebec3c975d4a001086cefe3b5;hb=802c5ca87f5d851a9be776bfc6245c1606ff6c6e;hp=de2fad9c642d4ad6a56eab07439e21fd1d307295;hpb=d2639edbc210fed7ed8f29609597ff133e716212;p=friendica-addons.git diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index de2fad9c..5cb65b91 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -47,18 +47,20 @@ use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; +use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; -use Friendica\Model\ItemContent; use Friendica\Model\Photo; +use Friendica\Model\Post; use Friendica\Model\User; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\Strings; +use GuzzleHttp\Exception\TransferException; function statusnet_install() { @@ -72,47 +74,29 @@ function statusnet_install() Hook::register('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); Hook::register('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); Hook::register('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); - Logger::log("installed GNU Social"); -} - -function statusnet_uninstall() -{ - Hook::unregister('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - Hook::unregister('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); - Hook::unregister('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - Hook::unregister('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork'); - Hook::unregister('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); - Hook::unregister('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); - Hook::unregister('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); - Hook::unregister('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); - Hook::unregister('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); - - // old setting - remove only - Hook::unregister('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - Hook::unregister('addon_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - Hook::unregister('addon_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); + Logger::notice('installed GNU Social'); } function statusnet_check_item_notification(App $a, &$notification_data) { - if (DI::pConfig()->get($notification_data["uid"], 'statusnet', 'post')) { - $notification_data["profiles"][] = DI::pConfig()->get($notification_data["uid"], 'statusnet', 'own_url'); + if (DI::pConfig()->get($notification_data['uid'], 'statusnet', 'post')) { + $notification_data['profiles'][] = DI::pConfig()->get($notification_data['uid'], 'statusnet', 'own_url'); } } function statusnet_jot_nets(App $a, array &$jotnets_fields) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } - if (DI::pConfig()->get(local_user(), 'statusnet', 'post')) { + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post')) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'statusnet_enable', DI::l10n()->t('Post to GNU Social'), - DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default') + DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default') ] ]; } @@ -120,30 +104,30 @@ function statusnet_jot_nets(App $a, array &$jotnets_fields) function statusnet_settings_post(App $a, $post) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } // don't check GNU Social settings if GNU Social submit button is not clicked - if (empty($_POST['statusnet-submit'])) { + if (empty($_POST['statusnet-submit']) && empty($_POST['statusnet-disconnect'])) { return; } - if (isset($_POST['statusnet-disconnect'])) { + if (!empty($_POST['statusnet-disconnect'])) { /* * * - * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration + * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration */ - DI::pConfig()->delete(local_user(), 'statusnet', 'consumerkey'); - DI::pConfig()->delete(local_user(), 'statusnet', 'consumersecret'); - DI::pConfig()->delete(local_user(), 'statusnet', 'post'); - DI::pConfig()->delete(local_user(), 'statusnet', 'post_by_default'); - DI::pConfig()->delete(local_user(), 'statusnet', 'oauthtoken'); - DI::pConfig()->delete(local_user(), 'statusnet', 'oauthsecret'); - DI::pConfig()->delete(local_user(), 'statusnet', 'baseapi'); - DI::pConfig()->delete(local_user(), 'statusnet', 'lastid'); - DI::pConfig()->delete(local_user(), 'statusnet', 'mirror_posts'); - DI::pConfig()->delete(local_user(), 'statusnet', 'import'); - DI::pConfig()->delete(local_user(), 'statusnet', 'create_user'); - DI::pConfig()->delete(local_user(), 'statusnet', 'own_url'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'post'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthtoken'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthsecret'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'lastid'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'mirror_posts'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'import'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'create_user'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'own_url'); } else { if (isset($_POST['statusnet-preconf-apiurl'])) { /* * * @@ -155,243 +139,197 @@ function statusnet_settings_post(App $a, $post) foreach ($globalsn as $asn) { if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) { $apibase = $asn['apiurl']; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { - DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']); - DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']); - DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']); - //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $asn['consumerkey']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $asn['consumersecret']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $asn['apiurl']); + //DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'application_name', $asn['applicationname'] ); } else { - notice(DI::l10n()->t('Please contact your site administrator.
The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.
The provided API URL is not valid.') . '
' . $asn['apiurl']); } } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-consumersecret'])) { // check if we can reach the API of the GNU Social server // we'll check the API Version for that, if we don't get one we'll try to fix the path but will // resign quickly after this one try to fix the path ;-) $apibase = $_POST['statusnet-baseapi']; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { // ok the API path is correct, let's save the settings - DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); - DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); - DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase); - //DI::pConfig()->set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] ); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $apibase); + //DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] ); } else { // the API path is not correct, maybe missing trailing / ? $apibase = $apibase . '/'; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { // ok the API path is now correct, let's save the settings - DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); - DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); - DI::pConfig()->set(local_user(), 'statusnet', 'baseapi', $apibase); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $apibase); } else { // still not the correct API base, let's do noting - notice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL); + DI::sysmsg()->addNotice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.')); } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen - $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); - $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); - $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); + $api = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret'); // the token and secret for which the PIN was generated were hidden in the settings // form as token and token2, we need a new connection to GNU Social using these token // and secret to request a Access Token with the PIN $connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']); $token = $connection->getAccessToken($_POST['statusnet-pin']); // ok, now that we have the Access Token, save them in the user config - DI::pConfig()->set(local_user(), 'statusnet', 'oauthtoken', $token['oauth_token']); - DI::pConfig()->set(local_user(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']); - DI::pConfig()->set(local_user(), 'statusnet', 'post', 1); - DI::pConfig()->set(local_user(), 'statusnet', 'post_taglinks', 1); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthtoken', $token['oauth_token']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post', 1); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - DI::baseUrl()->redirect('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a dent for every new __public__ posting to the wall - DI::pConfig()->set(local_user(), 'statusnet', 'post', intval($_POST['statusnet-enable'])); - DI::pConfig()->set(local_user(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default'])); - DI::pConfig()->set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror'])); - DI::pConfig()->set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import'])); - DI::pConfig()->set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post', intval($_POST['statusnet-enable'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'import', intval($_POST['statusnet-import'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user'])); if (!intval($_POST['statusnet-mirror'])) - DI::pConfig()->delete(local_user(), 'statusnet', 'lastid'); + DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'lastid'); } } } } } -function statusnet_settings(App $a, &$s) +function statusnet_settings(App $a, array &$data) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } - DI::page()['htmlhead'] .= '' . "\r\n"; + + DI::page()->registerStylesheet(__DIR__ . '/statusnet.css', 'all'); + /* * * * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some * allow the user to cancel the connection process at this step * 3) Checkbox for "Send public notices (respect size limitation) */ - $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); - $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); - $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); - $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); - $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); - $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $defenabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'); - $defchecked = (($defenabled) ? ' checked="checked" ' : ''); - $mirrorenabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts'); - $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : ''); - $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); - $importselected = ["", "", ""]; - $importselected[$import] = ' selected="selected"'; - //$importenabled = DI::pConfig()->get(local_user(),'statusnet','import'); - //$importchecked = (($importenabled) ? ' checked="checked" ' : ''); - $create_userenabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user'); - $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); - - $css = (($enabled) ? '' : '-disabled'); - - $s .= ''; - $s .= '

' . DI::l10n()->t('GNU Social Import/Export/Mirror') . '

'; - $s .= ''; - $s .= '
'; + + + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/statusnet/'); + $html = Renderer::replaceMacros($t, [ + '$l10n' => [ + 'global_title' => DI::l10n()->t('Globally Available GNU Social OAuthKeys'), + 'global_info' => DI::l10n()->t(DI::l10n()->t('There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).')), + 'credentials_title' => DI::l10n()->t('Provide your own OAuth Credentials'), + 'credentials_info' => DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'), + 'oauth_info' => DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social.'), + 'oauth_alt' => DI::l10n()->t('Log in with GNU Social'), + 'oauth_cancel' => DI::l10n()->t('Cancel Connection Process'), + 'oauth_api' => DI::l10n()->t('Current GNU Social API is: %s', $baseapi), + 'connected_account' => $connected_account ?? '', + 'privacy_warning' => $privacy_warning ?? '', + ], + + '$ckey' => $ckey, + '$csecret' => $csecret, + '$otoken' => $otoken, + '$osecret' => $osecret, + '$sites' => $sites, + + '$authorize_url' => $authorize_url ?? '', + '$request_token' => $request_token ?? null, + '$account' => $account ?? null, + + '$authenticate_url' => DI::baseUrl()->get() . '/statusnet/connect', + + '$consumerkey' => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'], + '$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'], + + '$baseapi' => ['statusnet-baseapi', DI::l10n()->t('Base API Path (remember the trailing /)'), '', '', false, ' size="35'], + '$pin' => ['statusnet-pin', DI::l10n()->t('Copy the security code from GNU Social here')], + + '$enable' => ['statusnet-enabled', DI::l10n()->t('Allow posting to GNU Social'), $enabled, DI::l10n()->t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')], + '$default' => ['statusnet-default', DI::l10n()->t('Post to GNU Social by default'), $def_enabled], + '$mirror' => ['statusnet-mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled], + '$create_user' => ['statusnet-create_user', DI::l10n()->t('Automatically create contacts'), $createuser_enabled], + '$import' => ['statusnet-import', DI::l10n()->t('Import the remote timeline'), $import, '', [ + 0 => DI::l10n()->t('Disabled'), + 1 => DI::l10n()->t('Full Timeline'), + 2 => DI::l10n()->t('Only Mentions'), + ]], + ]); + + $data = [ + 'connector' => 'statusnet', + 'title' => DI::l10n()->t('GNU Social Import/Export/Mirror'), + 'image' => 'images/gnusocial.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, + ]; } function statusnet_hook_fork(App $a, array &$b) @@ -421,35 +359,35 @@ function statusnet_hook_fork(App $a, array &$b) if (DI::pConfig()->get($post['uid'], 'statusnet', 'import')) { // Don't fork if it isn't a reply to a GNU Social post - if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) { - Logger::log('No GNU Social parent found for item ' . $post['id']); + if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) { + Logger::notice('No GNU Social parent found for item ' . $post['id']); $b['execute'] = false; return; } } else { // Comments are never exported when we don't import the GNU Social timeline - if (!strstr($post['postopts'], 'statusnet') || ($post['parent'] != $post['id']) || $post['private']) { + if (strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['parent'] != $post['id']) || $post['private']) { $b['execute'] = false; return; } } } -function statusnet_post_local(App $a, &$b) +function statusnet_post_local(App $a, array &$b) { if ($b['edit']) { return; } - if (!local_user() || (local_user() != $b['uid'])) { + if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) { return; } - $statusnet_post = DI::pConfig()->get(local_user(), 'statusnet', 'post'); + $statusnet_post = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post'); $statusnet_enable = (($statusnet_post && !empty($_REQUEST['statusnet_enable'])) ? intval($_REQUEST['statusnet_enable']) : 0); // if API is used, default to the chosen settings - if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default'))) { $statusnet_enable = 1; } @@ -474,65 +412,69 @@ function statusnet_action(App $a, $uid, $pid, $action) $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); - Logger::log("statusnet_action '" . $action . "' ID: " . $pid, Logger::DATA); + Logger::debug('statusnet_action "' . $action . '" ID: ' . $pid); switch ($action) { - case "delete": - $result = $connection->post("statuses/destroy/" . $pid); + case 'delete': + $result = $connection->post('statuses/destroy/' . $pid); break; - case "like": - $result = $connection->post("favorites/create/" . $pid); + + case 'like': + $result = $connection->post('favorites/create/' . $pid); break; - case "unlike": - $result = $connection->post("favorites/destroy/" . $pid); + + case 'unlike': + $result = $connection->post('favorites/destroy/' . $pid); break; } - Logger::log("statusnet_action '" . $action . "' send, result: " . print_r($result, true), Logger::DEBUG); + Logger::info('statusnet_action "' . $action . '" send, result: ' . print_r($result, true)); } -function statusnet_post_hook(App $a, &$b) +function statusnet_post_hook(App $a, array &$b) { /** * Post to GNU Social */ - if (!DI::pConfig()->get($b["uid"], 'statusnet', 'import')) { + if (!DI::pConfig()->get($b['uid'], 'statusnet', 'import')) { if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) return; } - $api = DI::pConfig()->get($b["uid"], 'statusnet', 'baseapi'); + $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b)); + + $api = DI::pConfig()->get($b['uid'], 'statusnet', 'baseapi'); $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); if ($b['parent'] != $b['id']) { - Logger::log("statusnet_post_hook: parameter " . print_r($b, true), Logger::DATA); + Logger::debug('statusnet_post_hook: parameter ', ['b' => $b]); // Looking if its a reply to a GNU Social post $hostlength = strlen($hostname) + 2; - if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) { - Logger::log("statusnet_post_hook: no GNU Social post " . $b["parent"]); + if ((substr($b['parent-uri'], 0, $hostlength) != $hostname . '::') && (substr($b['extid'], 0, $hostlength) != $hostname . '::') && (substr($b['thr-parent'], 0, $hostlength) != $hostname . '::')) { + Logger::notice('statusnet_post_hook: no GNU Social post ' . $b['parent']); return; } - $condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]]; - $orig_post = Item::selectFirst(['author-link', 'uri'], $condition); + $condition = ['uri' => $b['thr-parent'], 'uid' => $b['uid']]; + $orig_post = Post::selectFirst(['author-link', 'uri'], $condition); if (!DBA::isResult($orig_post)) { - Logger::log("statusnet_post_hook: no parent found " . $b["thr-parent"]); + Logger::notice('statusnet_post_hook: no parent found ' . $b['thr-parent']); return; } else { $iscomment = true; } - $nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]); + $nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post['author-link']); - $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]"; - $nicknameplain = "@" . $nick; + $nickname = '@[url=' . $orig_post['author-link'] . ']' . $nick . '[/url]'; + $nicknameplain = '@' . $nick; - Logger::log("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], Logger::DEBUG); - if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) { - $b["body"] = $nickname . " " . $b["body"]; + Logger::info('statusnet_post_hook: comparing ' . $nickname . ' and ' . $nicknameplain . ' with ' . $b['body']); + if ((strpos($b['body'], $nickname) === false) && (strpos($b['body'], $nicknameplain) === false)) { + $b['body'] = $nickname . ' ' . $b['body']; } - Logger::log("statusnet_post_hook: parent found " . print_r($orig_post, true), Logger::DEBUG); + Logger::info('statusnet_post_hook: parent found ', ['orig_post' => $orig_post]); } else { $iscomment = false; @@ -549,15 +491,15 @@ function statusnet_post_hook(App $a, &$b) } if (($b['verb'] == Activity::POST) && $b['deleted']) { - statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete"); + statusnet_action($a, $b['uid'], substr($orig_post['uri'], $hostlength), 'delete'); } if ($b['verb'] == Activity::LIKE) { - Logger::log("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), Logger::DEBUG); + Logger::info('statusnet_post_hook: parameter 2 ' . substr($b['thr-parent'], $hostlength)); if ($b['deleted']) - statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike"); + statusnet_action($a, $b['uid'], substr($b['thr-parent'], $hostlength), 'unlike'); else - statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "like"); + statusnet_action($a, $b['uid'], substr($b['thr-parent'], $hostlength), 'like'); return; } @@ -570,11 +512,11 @@ function statusnet_post_hook(App $a, &$b) return; } - if ($b['app'] == "StatusNet") { + if ($b['app'] == 'StatusNet') { return; } - Logger::log('GNU Socialpost invoked'); + Logger::notice('GNU Socialpost invoked'); DI::pConfig()->load($b['uid'], 'statusnet'); @@ -595,35 +537,35 @@ function statusnet_post_hook(App $a, &$b) DI::pConfig()->set($b['uid'], 'statusnet', 'max_char', $max_char); - $tempfile = ""; - $msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 7); - $msg = $msgarr["text"]; + $tempfile = ''; + $msgarr = Plaintext::getPost($b, $max_char, true, 7); + $msg = $msgarr['text']; - if (($msg == "") && isset($msgarr["title"])) - $msg = Plaintext::shorten($msgarr["title"], $max_char - 50); + if (($msg == '') && isset($msgarr['title'])) + $msg = Plaintext::shorten($msgarr['title'], $max_char - 50, $b['uid']); - $image = ""; + $image = ''; - if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { - $msg .= " \n" . $msgarr["url"]; - } elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video")) { - $image = $msgarr["image"]; + if (isset($msgarr['url']) && ($msgarr['type'] != 'photo')) { + $msg .= " \n" . $msgarr['url']; + } elseif (isset($msgarr['image']) && ($msgarr['type'] != 'video')) { + $image = $msgarr['image']; } - if ($image != "") { - $img_str = Network::fetchUrl($image); - $tempfile = tempnam(get_temppath(), "cache"); + if ($image != '') { + $img_str = DI::httpClient()->fetch($image); + $tempfile = tempnam(System::getTempPath(), 'cache'); file_put_contents($tempfile, $img_str); - $postdata = ["status" => $msg, "media[]" => $tempfile]; + $postdata = ['status' => $msg, 'media[]' => $tempfile]; } else { - $postdata = ["status" => $msg]; + $postdata = ['status' => $msg]; } // and now send it :-) if (strlen($msg)) { if ($iscomment) { - $postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength); - Logger::log('statusnet_post send reply ' . print_r($postdata, true), Logger::DEBUG); + $postdata['in_reply_to_status_id'] = substr($orig_post['uri'], $hostlength); + Logger::info('statusnet_post send reply ' . print_r($postdata, true)); } // New code that is able to post pictures @@ -634,21 +576,21 @@ function statusnet_post_hook(App $a, &$b) $cb->setToken($otoken, $osecret); $result = $cb->statuses_update($postdata); //$result = $dent->post('statuses/update', $postdata); - Logger::log('statusnet_post send, result: ' . print_r($result, true) . - "\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true), Logger::DEBUG); + Logger::info('statusnet_post send, result: ' . print_r($result, true) . + "\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true)); if (!empty($result->source)) { - DI::pConfig()->set($b["uid"], "statusnet", "application_name", strip_tags($result->source)); + DI::pConfig()->set($b['uid'], 'statusnet', 'application_name', strip_tags($result->source)); } if (!empty($result->error)) { - Logger::log('Send to GNU Social failed: "' . $result->error . '"'); + Logger::notice('Send to GNU Social failed: "' . $result->error . '"'); } elseif ($iscomment) { - Logger::log('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']); - Item::update(['extid' => $hostname . "::" . $result->id, 'body' => $result->text], ['id' => $b['id']]); + Logger::notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']); + Item::update(['extid' => $hostname . '::' . $result->id, 'body' => $result->text], ['id' => $b['id']]); } } - if ($tempfile != "") { + if ($tempfile != '') { unlink($tempfile); } } @@ -667,10 +609,10 @@ function statusnet_addon_admin_post(App $a) $secret = trim($_POST['secret'][$id]); $key = trim($_POST['key'][$id]); //$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):''); - if ($sitename != "" && - $apiurl != "" && - $secret != "" && - $key != "" && + if ($sitename != '' && + $apiurl != '' && + $secret != '' && + $key != '' && empty($_POST['delete'][$id])) { $sites[] = [ @@ -686,7 +628,7 @@ function statusnet_addon_admin_post(App $a) $sites = DI::config()->set('statusnet', 'sites', $sites); } -function statusnet_addon_admin(App $a, &$o) +function statusnet_addon_admin(App $a, string &$o) { $sites = DI::config()->get('statusnet', 'sites'); $sitesform = []; @@ -712,50 +654,50 @@ function statusnet_addon_admin(App $a, &$o) //'applicationname' => Array("applicationname[$id]", DI::l10n()->t("Application name"), "", ""), ]; - $t = Renderer::getMarkupTemplate("admin.tpl", "addon/statusnet/"); + $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/statusnet/'); $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Save Settings'), '$sites' => $sitesform, ]); } -function statusnet_prepare_body(App $a, &$b) +function statusnet_prepare_body(App $a, array &$b) { - if ($b["item"]["network"] != Protocol::STATUSNET) { + if ($b['item']['network'] != Protocol::STATUSNET) { return; } - if ($b["preview"]) { - $max_char = DI::pConfig()->get(local_user(), 'statusnet', 'max_char'); + if ($b['preview']) { + $max_char = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'max_char'); if (intval($max_char) == 0) { $max_char = 140; } - $item = $b["item"]; - $item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"]; + $item = $b['item']; + $item['plink'] = DI::baseUrl()->get() . '/display/' . $item['guid']; - $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; - $orig_post = Item::selectFirst(['author-link', 'uri'], $condition); + $condition = ['uri' => $item['thr-parent'], 'uid' => DI::userSession()->getLocalUserId()]; + $orig_post = Post::selectFirst(['author-link', 'uri'], $condition); if (DBA::isResult($orig_post)) { - $nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]); + $nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post['author-link']); - $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]"; - $nicknameplain = "@" . $nick; + $nickname = '@[url=' . $orig_post['author-link'] . ']' . $nick . '[/url]'; + $nicknameplain = '@' . $nick; - if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) { - $item["body"] = $nickname . " " . $item["body"]; + if ((strpos($item['body'], $nickname) === false) && (strpos($item['body'], $nicknameplain) === false)) { + $item['body'] = $nickname . ' ' . $item['body']; } } - $msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 7); - $msg = $msgarr["text"]; + $msgarr = Plaintext::getPost($item, $max_char, true, 7); + $msg = $msgarr['text']; - if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { - $msg .= " " . $msgarr["url"]; + if (isset($msgarr['url']) && ($msgarr['type'] != 'photo')) { + $msg .= ' ' . $msgarr['url']; } - if (isset($msgarr["image"])) { - $msg .= " " . $msgarr["image"]; + if (isset($msgarr['image'])) { + $msg .= ' ' . $msgarr['image']; } $b['html'] = nl2br(htmlspecialchars($msg)); @@ -774,18 +716,16 @@ function statusnet_cron(App $a, $b) if ($last) { $next = $last + ($poll_interval * 60); if ($next > time()) { - Logger::log('statusnet: poll intervall not reached'); + Logger::notice('statusnet: poll intervall not reached'); return; } } - Logger::log('statusnet: cron_start'); + Logger::notice('statusnet: cron_start'); - $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() "); - if (DBA::isResult($r)) { - foreach ($r as $rr) { - Logger::log('statusnet: fetching for user ' . $rr['uid']); - statusnet_fetchtimeline($a, $rr['uid']); - } + $pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'statusnet', 'k' => 'mirror_posts', 'v' => true]); + foreach ($pconfigs as $rr) { + Logger::notice('statusnet: fetching for user ' . $rr['uid']); + statusnet_fetchtimeline($a, $rr['uid']); } $abandon_days = intval(DI::config()->get('system', 'account_abandon_days')); @@ -795,28 +735,25 @@ function statusnet_cron(App $a, $b) $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400); - $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()"); - if (DBA::isResult($r)) { - foreach ($r as $rr) { - if ($abandon_days != 0) { - $user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit); - if (!DBA::isResult($user)) { - Logger::log('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported'); - continue; - } + $pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'statusnet', 'k' => 'import', 'v' => true]); + foreach ($pconfigs as $rr) { + if ($abandon_days != 0) { + if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $rr['uid'], $abandon_limit])) { + Logger::notice('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported'); + continue; } - - Logger::log('statusnet: importing timeline from user ' . $rr['uid']); - statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]); } + + Logger::notice('statusnet: importing timeline from user ' . $rr['uid']); + statusnet_fetchhometimeline($a, $rr['uid'], $rr['v']); } - Logger::log('statusnet: cron_end'); + Logger::notice('statusnet: cron_end'); DI::config()->set('statusnet', 'last_poll', time()); } -function statusnet_fetchtimeline(App $a, $uid) +function statusnet_fetchtimeline(App $a, int $uid) { $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); @@ -825,26 +762,30 @@ function statusnet_fetchtimeline(App $a, $uid) $osecret = DI::pConfig()->get($uid, 'statusnet', 'oauthsecret'); $lastid = DI::pConfig()->get($uid, 'statusnet', 'lastid'); - require_once 'mod/item.php'; // get the application name for the SN app // 1st try personal config, then system config and fallback to the // hostname of the node if neither one is set. $application_name = DI::pConfig()->get($uid, 'statusnet', 'application_name'); - if ($application_name == "") { + if ($application_name == '') { $application_name = DI::config()->get('statusnet', 'application_name'); } - if ($application_name == "") { + if ($application_name == '') { $application_name = DI::baseUrl()->getHostname(); } $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); - $parameters = ["exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false]; + $parameters = [ + 'exclude_replies' => true, + 'trim_user' => true, + 'contributor_details' => false, + 'include_rts' => false, + ]; - $first_time = ($lastid == ""); + $first_time = ($lastid == ''); - if ($lastid <> "") { - $parameters["since_id"] = $lastid; + if ($lastid != '') { + $parameters['since_id'] = $lastid; } $items = $connection->get('statuses/user_timeline', $parameters); @@ -864,7 +805,7 @@ function statusnet_fetchtimeline(App $a, $uid) continue; } - if ($post->source == "activity") { + if ($post->source == 'activity') { continue; } @@ -872,51 +813,38 @@ function statusnet_fetchtimeline(App $a, $uid) continue; } - if ($post->in_reply_to_status_id != "") { + if ($post->in_reply_to_status_id != '') { continue; } if (!stristr($post->source, $application_name)) { - $_SESSION["authenticated"] = true; - $_SESSION["uid"] = $uid; - - unset($_REQUEST); - $_REQUEST["api_source"] = true; - $_REQUEST["profile_uid"] = $uid; - //$_REQUEST["source"] = "StatusNet"; - $_REQUEST["source"] = $post->source; - $_REQUEST["extid"] = Protocol::STATUSNET; - - if (isset($post->id)) { - $_REQUEST['message_id'] = Item::newURI($uid, Protocol::STATUSNET . ":" . $post->id); - } + $postarray['uid'] = $uid; + $postarray['app'] = $post->source; + $postarray['extid'] = Protocol::STATUSNET; - //$_REQUEST["date"] = $post->created_at; + $postarray['title'] = ''; - $_REQUEST["title"] = ""; - - $_REQUEST["body"] = PageInfo::searchAndAppendToBody($post->text, true); + $postarray['body'] = $post->text; if (is_string($post->place->name)) { - $_REQUEST["location"] = $post->place->name; + $postarray['location'] = $post->place->name; } if (is_string($post->place->full_name)) { - $_REQUEST["location"] = $post->place->full_name; + $postarray['location'] = $post->place->full_name; } if (is_array($post->geo->coordinates)) { - $_REQUEST["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1]; + $postarray['coord'] = $post->geo->coordinates[0] . ' ' . $post->geo->coordinates[1]; } if (is_array($post->coordinates->coordinates)) { - $_REQUEST["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0]; + $postarray['coord'] = $post->coordinates->coordinates[1] . ' ' . $post->coordinates->coordinates[0]; } - //print_r($_REQUEST); - if ($_REQUEST["body"] != "") { - Logger::log('statusnet: posting for user ' . $uid); + if ($postarray['body'] != '') { + Logger::notice('statusnet: posting for user ' . $uid); - item_post($a); + Item::insert($postarray, true); } } } @@ -931,7 +859,7 @@ function statusnet_address($contact) $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url); - $address = $contact->screen_name . "@" . $hostname; + $address = $contact->screen_name . '@' . $hostname; return $address; } @@ -942,115 +870,93 @@ function statusnet_fetch_contact($uid, $contact, $create_user) return -1; } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET)); + $contact_record = Contact::selectFirst([], + ['alias' => Strings::normaliseLink($contact->statusnet_profile_url), 'uid' => $uid, 'network' => Protocol::STATUSNET]); - if (!DBA::isResult($r) && !$create_user) { + if (!DBA::isResult($contact_record) && !$create_user) { return 0; } - if (DBA::isResult($r) && ($r[0]["readonly"] || $r[0]["blocked"])) { - Logger::log("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", Logger::DEBUG); + if (DBA::isResult($contact_record) && ($contact_record['readonly'] || $contact_record['blocked'])) { + Logger::info('statusnet_fetch_contact: Contact "' . $contact_record['nick'] . '" is blocked or readonly.'); return -1; } - if (!DBA::isResult($r)) { - // create contact record - q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, - `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ", - intval($uid), - DBA::escape(DateTimeFormat::utcNow()), - DBA::escape($contact->statusnet_profile_url), - DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), - DBA::escape(statusnet_address($contact)), - DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), - DBA::escape(''), - DBA::escape(''), - DBA::escape($contact->name), - DBA::escape($contact->screen_name), - DBA::escape($contact->profile_image_url), - DBA::escape(Protocol::STATUSNET), - intval(Contact::FRIEND), - intval(1), - DBA::escape($contact->location), - DBA::escape($contact->description), - intval(1) - ); - - $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1", - DBA::escape($contact->statusnet_profile_url), - intval($uid), - DBA::escape(Protocol::STATUSNET)); - - if (!DBA::isResult($r)) { + if (!DBA::isResult($contact_record)) { + $fields = [ + 'uid' => $uid, + 'created' => DateTimeFormat::utcNow(), + 'url' => $contact->statusnet_profile_url, + 'nurl' => Strings::normaliseLink($contact->statusnet_profile_url), + 'addr' => statusnet_address($contact), + 'alias' => Strings::normaliseLink($contact->statusnet_profile_url), + 'notify' => '', + 'poll' => '', + 'name' => $contact->name, + 'nick' => $contact->screen_name, + 'photo' => $contact->profile_image_url, + 'network' => Protocol::STATUSNET, + 'rel' => Contact::FRIEND, + 'priority' => 1, + 'location' => $contact->location, + 'about' => $contact->description, + 'writable' => true, + 'blocked' => false, + 'readonly' => false, + 'pending' => false, + ]; + + if (!Contact::insert($fields)) { + return false; + } + + $contact_record = Contact::selectFirst([], + ['alias' => Strings::normaliseLink($contact->statusnet_profile_url), 'uid' => $uid, 'network' => Protocol::STATUSNET]); + if (!DBA::isResult($contact_record)) { return false; } - $contact_id = $r[0]['id']; + $contact_id = $contact_record['id']; Group::addMember(User::getDefaultGroup($uid), $contact_id); $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `avatar-date` = '%s' - WHERE `id` = %d", - DBA::escape($photos[0]), - DBA::escape($photos[1]), - DBA::escape($photos[2]), - DBA::escape(DateTimeFormat::utcNow()), - intval($contact_id) - ); + Contact::update(['photo' => $photos[0], 'thumb' => $photos[1], + 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()], ['id' => $contact_id]); } else { // update profile photos once every two weeks as we have no notification of when they change. - //$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false); - $update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours')); + //$update_photo = (($contact_record['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false); + $update_photo = ($contact_record['avatar-date'] < DateTimeFormat::utc('now -12 hours')); // check that we have all the photos, this has been known to fail on occasion - if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) { - Logger::log("statusnet_fetch_contact: Updating contact " . $contact->screen_name, Logger::DEBUG); - - $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']); - - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `url` = '%s', - `nurl` = '%s', - `addr` = '%s', - `name` = '%s', - `nick` = '%s', - `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - DBA::escape($photos[0]), - DBA::escape($photos[1]), - DBA::escape($photos[2]), - DBA::escape(DateTimeFormat::utcNow()), - DBA::escape(DateTimeFormat::utcNow()), - DBA::escape(DateTimeFormat::utcNow()), - DBA::escape($contact->statusnet_profile_url), - DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), - DBA::escape(statusnet_address($contact)), - DBA::escape($contact->name), - DBA::escape($contact->screen_name), - DBA::escape($contact->location), - DBA::escape($contact->description), - intval($r[0]['id']) - ); + if ((!$contact_record['photo']) || (!$contact_record['thumb']) || (!$contact_record['micro']) || ($update_photo)) { + Logger::info('statusnet_fetch_contact: Updating contact ' . $contact->screen_name); + + $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_record['id']); + + Contact::update([ + 'photo' => $photos[0], + 'thumb' => $photos[1], + 'micro' => $photos[2], + 'name-date' => DateTimeFormat::utcNow(), + 'uri-date' => DateTimeFormat::utcNow(), + 'avatar-date' => DateTimeFormat::utcNow(), + 'url' => $contact->statusnet_profile_url, + 'nurl' => Strings::normaliseLink($contact->statusnet_profile_url), + 'addr' => statusnet_address($contact), + 'name' => $contact->name, + 'nick' => $contact->screen_name, + 'location' => $contact->location, + 'about' => $contact->description + ], ['id' => $contact_record['id']]); } } - return $r[0]["id"]; + return $contact_record['id']; } -function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "") +function statusnet_fetchuser(App $a, $uid, $screen_name = '', $user_id = '') { $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); @@ -1064,23 +970,19 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "") $cb->setConsumerKey($ckey, $csecret); $cb->setToken($otoken, $osecret); - $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", - intval($uid)); - - if (DBA::isResult($r)) { - $self = $r[0]; - } else { + $self = Contact::selectFirst([], ['self' => true, 'uid' => $uid]); + if (!DBA::isResult($self)) { return; } $parameters = []; - if ($screen_name != "") { - $parameters["screen_name"] = $screen_name; + if ($screen_name != '') { + $parameters['screen_name'] = $screen_name; } - if ($user_id != "") { - $parameters["user_id"] = $user_id; + if ($user_id != '') { + $parameters['user_id'] = $user_id; } // Fetching user data @@ -1095,9 +997,9 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "") return $contact_id; } -function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact) +function statusnet_createpost(App $a, int $uid, $post, $self, $create_user, bool $only_existing_contact) { - Logger::log("statusnet_createpost: start", Logger::DEBUG); + Logger::info('statusnet_createpost: start'); $api = DI::pConfig()->get($uid, 'statusnet', 'baseapi'); $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); @@ -1114,33 +1016,26 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex $content = $post; } - $postarray['uri'] = $hostname . "::" . $content->id; + $postarray['uri'] = $hostname . '::' . $content->id; - if (Item::exists(['extid' => $postarray['uri'], 'uid' => $uid])) { + if (Post::exists(['extid' => $postarray['uri'], 'uid' => $uid])) { return []; } - $contactid = 0; + $contactId = 0; if (!empty($content->in_reply_to_status_id)) { + $thr_parent = $hostname . '::' . $content->in_reply_to_status_id; - $parent = $hostname . "::" . $content->in_reply_to_status_id; - - $fields = ['uri', 'parent-uri', 'parent']; - $item = Item::selectFirst($fields, ['uri' => $parent, 'uid' => $uid]); - + $item = Post::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]); if (!DBA::isResult($item)) { - $item = Item::selectFirst($fields, ['extid' => $parent, 'uid' => $uid]); + $item = Post::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]); } if (DBA::isResult($item)) { $postarray['thr-parent'] = $item['uri']; - $postarray['parent-uri'] = $item['parent-uri']; - $postarray['parent'] = $item['parent']; $postarray['object-type'] = Activity\ObjectType::COMMENT; } else { - $postarray['thr-parent'] = $postarray['uri']; - $postarray['parent-uri'] = $postarray['uri']; $postarray['object-type'] = Activity\ObjectType::NOTE; } @@ -1148,15 +1043,13 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex $own_url = DI::pConfig()->get($uid, 'statusnet', 'own_url'); if ($content->user->id == $own_url) { - $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", - intval($uid)); + $self = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $uid]); + if (DBA::isResult($self)) { + $contactId = $self['id']; - if (DBA::isResult($r)) { - $contactid = $r[0]["id"]; - - $postarray['owner-name'] = $r[0]["name"]; - $postarray['owner-link'] = $r[0]["url"]; - $postarray['owner-avatar'] = $r[0]["photo"]; + $postarray['owner-name'] = $self['name']; + $postarray['owner-link'] = $self['url']; + $postarray['owner-avatar'] = $self['photo']; } else { return []; } @@ -1164,23 +1057,22 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex // Don't create accounts of people who just comment something $create_user = false; } else { - $postarray['parent-uri'] = $postarray['uri']; $postarray['object-type'] = Activity\ObjectType::NOTE; } - if ($contactid == 0) { - $contactid = statusnet_fetch_contact($uid, $post->user, $create_user); + if ($contactId == 0) { + $contactId = statusnet_fetch_contact($uid, $post->user, $create_user); $postarray['owner-name'] = $post->user->name; $postarray['owner-link'] = $post->user->statusnet_profile_url; $postarray['owner-avatar'] = $post->user->profile_image_url; } - if (($contactid == 0) && !$only_existing_contact) { - $contactid = $self['id']; - } elseif ($contactid <= 0) { + if (($contactId == 0) && !$only_existing_contact) { + $contactId = $self['id']; + } elseif ($contactId <= 0) { return []; } - $postarray['contact-id'] = $contactid; + $postarray['contact-id'] = $contactId; $postarray['verb'] = Activity::POST; @@ -1189,7 +1081,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex $postarray['author-avatar'] = $content->user->profile_image_url; // To-Do: Maybe unreliable? Can the api be entered without trailing "/"? - $hostname = str_replace("/api/", "/notice/", DI::pConfig()->get($uid, 'statusnet', 'baseapi')); + $hostname = str_replace('/api/', '/notice/', DI::pConfig()->get($uid, 'statusnet', 'baseapi')); $postarray['plink'] = $hostname . $content->id; $postarray['app'] = strip_tags($content->source); @@ -1207,22 +1099,22 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex $postarray['edited'] = DateTimeFormat::utc($content->created_at); if (!empty($content->place->name)) { - $postarray["location"] = $content->place->name; + $postarray['location'] = $content->place->name; } if (!empty($content->place->full_name)) { - $postarray["location"] = $content->place->full_name; + $postarray['location'] = $content->place->full_name; } if (!empty($content->geo->coordinates)) { - $postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1]; + $postarray['coord'] = $content->geo->coordinates[0] . ' ' . $content->geo->coordinates[1]; } if (!empty($content->coordinates->coordinates)) { - $postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0]; + $postarray['coord'] = $content->coordinates->coordinates[1] . ' ' . $content->coordinates->coordinates[0]; } - Logger::log("statusnet_createpost: end", Logger::DEBUG); + Logger::info('statusnet_createpost: end'); return $postarray; } @@ -1241,7 +1133,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) // "create_user" is deactivated, since currently you cannot add users manually by now $create_user = true; - Logger::log("statusnet_fetchhometimeline: Fetching for user " . $uid, Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Fetching for user ' . $uid); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); @@ -1251,46 +1143,43 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) return; } - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($own_contact), - intval($uid)); - - if (DBA::isResult($r)) { - $nick = $r[0]["nick"]; + $contact = Contact::selectFirst([], ['id' => $own_contact, 'uid' => $uid]); + if (DBA::isResult($contact)) { + $nick = $contact['nick']; } else { - Logger::log("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Own GNU Social contact not found for user ' . $uid); return; } - $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", - intval($uid)); - - if (DBA::isResult($r)) { - $self = $r[0]; - } else { - Logger::log("statusnet_fetchhometimeline: Own contact not found for user " . $uid, Logger::DEBUG); + $self = Contact::selectFirst([], ['self' => true, 'uid' => $uid]); + if (!DBA::isResult($self)) { + Logger::info('statusnet_fetchhometimeline: Own contact not found for user ' . $uid); return; } - $u = q("SELECT * FROM user WHERE uid = %d LIMIT 1", - intval($uid)); - if (!DBA::isResult($u)) { - Logger::log("statusnet_fetchhometimeline: Own user not found for user " . $uid, Logger::DEBUG); + $user = User::getById($uid); + if (!DBA::isResult($user)) { + Logger::info('statusnet_fetchhometimeline: Own user not found for user ' . $uid); return; } - $parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true]; - //$parameters["count"] = 200; + $parameters = [ + 'exclude_replies' => false, + 'trim_user' => false, + 'contributor_details' => true, + 'include_rts' => true, + //'count' => 200, + ]; if ($mode == 1) { // Fetching timeline $lastid = DI::pConfig()->get($uid, 'statusnet', 'lasthometimelineid'); //$lastid = 1; - $first_time = ($lastid == ""); + $first_time = ($lastid == ''); - if ($lastid != "") { - $parameters["since_id"] = $lastid; + if ($lastid != '') { + $parameters['since_id'] = $lastid; } $items = $connection->get('statuses/home_timeline', $parameters); @@ -1303,16 +1192,16 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) } elseif (is_string($items) || is_float($items) || is_int($items)) { $errormsg = $items; } else { - $errormsg = "Unknown error"; + $errormsg = 'Unknown error'; } - Logger::log("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Error fetching home timeline: ' . $errormsg); return; } $posts = array_reverse($items); - Logger::log("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Fetching timeline for user ' . $uid . ' ' . sizeof($posts) . ' items'); if (count($posts)) { foreach ($posts as $post) { @@ -1333,14 +1222,14 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) } else { $postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true); - if (trim($postarray['body']) == "") { + if (trim($postarray['body']) == '') { continue; } $item = Item::insert($postarray); - $postarray["id"] = $item; + $postarray['id'] = $item; - Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item); + Logger::notice('statusnet_fetchhometimeline: User ' . $self['nick'] . ' posted home timeline item ' . $item); } } } @@ -1349,22 +1238,22 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) // Fetching mentions $lastid = DI::pConfig()->get($uid, 'statusnet', 'lastmentionid'); - $first_time = ($lastid == ""); + $first_time = ($lastid == ''); - if ($lastid != "") { - $parameters["since_id"] = $lastid; + if ($lastid != '') { + $parameters['since_id'] = $lastid; } $items = $connection->get('statuses/mentions_timeline', $parameters); if (!is_array($items)) { - Logger::log("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Error fetching mentions: ' . print_r($items, true)); return; } $posts = array_reverse($items); - Logger::log("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG); + Logger::info('statusnet_fetchhometimeline: Fetching mentions for user ' . $uid . ' ' . sizeof($posts) . ' items'); if (count($posts)) { foreach ($posts as $post) { @@ -1384,13 +1273,13 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1) $conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id; } } else { - if (trim($postarray['body']) == "") { + if (trim($postarray['body']) == '') { continue; } $item = Item::insert($postarray); - Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item); + Logger::notice('statusnet_fetchhometimeline: User ' . $self['nick'] . ' posted mention timeline item ' . $item); } } } @@ -1409,7 +1298,7 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); - $parameters["count"] = 200; + $parameters['count'] = 200; $items = $connection->get('statusnet/conversation/' . $conversation, $parameters); if (is_array($items)) { @@ -1423,9 +1312,9 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic } $item = Item::insert($postarray); - $postarray["id"] = $item; + $postarray['id'] = $item; - Logger::log('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item); + Logger::notice('statusnet_complete_conversation: User ' . $self['nick'] . ' posted home timeline item ' . $item); } } } @@ -1434,72 +1323,74 @@ function statusnet_convertmsg(App $a, $body) { $body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body); - $URLSearchString = "^\[\]"; + $URLSearchString = '^\[\]'; $links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER); - $footer = ""; - $footerurl = ""; - $footerlink = ""; - $type = ""; + $footer = $footerurl = $footerlink = $type = ''; if ($links) { foreach ($matches AS $match) { - $search = "[url=" . $match[1] . "]" . $match[2] . "[/url]"; + $search = '[url=' . $match[1] . ']' . $match[2] . '[/url]'; - Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG); + Logger::info('statusnet_convertmsg: expanding url ' . $match[1]); - $expanded_url = Network::finalUrl($match[1]); + try { + $expanded_url = DI::httpClient()->finalUrl($match[1]); + } catch (TransferException $exception) { + Logger::notice('statusnet_convertmsg: Couldn\'t get final URL.', ['url' => $match[1], 'exception' => $exception]); + $expanded_url = $match[1]; + } - Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG); + Logger::info('statusnet_convertmsg: fetching data for ' . $expanded_url); $oembed_data = OEmbed::fetchURL($expanded_url, true); - Logger::log("statusnet_convertmsg: fetching data: done", Logger::DEBUG); + Logger::info('statusnet_convertmsg: fetching data: done'); - if ($type == "") { + if ($type == '') { $type = $oembed_data->type; } - if ($oembed_data->type == "video") { - //$body = str_replace($search, "[video]".$expanded_url."[/video]", $body); + if ($oembed_data->type == 'video') { + //$body = str_replace($search, '[video]'.$expanded_url.'[/video]', $body); $type = $oembed_data->type; $footerurl = $expanded_url; - $footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]"; + $footerlink = '[url=' . $expanded_url . ']' . $expanded_url . '[/url]'; $body = str_replace($search, $footerlink, $body); - } elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) { - $body = str_replace($search, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body); - } elseif ($oembed_data->type != "link") { - $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body); + } elseif (($oembed_data->type == 'photo') && isset($oembed_data->url)) { + $body = str_replace($search, '[url=' . $expanded_url . '][img]' . $oembed_data->url . '[/img][/url]', $body); + } elseif ($oembed_data->type != 'link') { + $body = str_replace($search, '[url=' . $expanded_url . ']' . $expanded_url . '[/url]', $body); } else { - $img_str = Network::fetchUrl($expanded_url, true, 4); + $img_str = DI::httpClient()->fetch($expanded_url, HttpClientAccept::DEFAULT, 4); - $tempfile = tempnam(get_temppath(), "cache"); + $tempfile = tempnam(System::getTempPath(), 'cache'); file_put_contents($tempfile, $img_str); $mime = mime_content_type($tempfile); unlink($tempfile); - if (substr($mime, 0, 6) == "image/") { - $type = "photo"; - $body = str_replace($search, "[img]" . $expanded_url . "[/img]", $body); + if (substr($mime, 0, 6) == 'image/') { + $type = 'photo'; + $body = str_replace($search, '[img]' . $expanded_url . '[/img]', $body); } else { $type = $oembed_data->type; $footerurl = $expanded_url; - $footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]"; + $footerlink = '[url=' . $expanded_url . ']' . $expanded_url . '[/url]'; $body = str_replace($search, $footerlink, $body); } } } - if ($footerurl != "") { + if ($footerurl != '') { $footer = "\n" . PageInfo::getFooterFromUrl($footerurl); } - if (($footerlink != "") && (trim($footer) != "")) { - $removedlink = trim(str_replace($footerlink, "", $body)); + if (($footerlink != '') && (trim($footer) != '')) { + $removedlink = trim(str_replace($footerlink, '', $body)); - if (($removedlink == "") || strstr($body, $removedlink)) { + if (($removedlink == '') || strstr($body, $removedlink)) { $body = $removedlink; } @@ -1510,7 +1401,7 @@ function statusnet_convertmsg(App $a, $body) return $body; } -function statusnet_fetch_own_contact(App $a, $uid) +function statusnet_fetch_own_contact(App $a, int $uid) { $ckey = DI::pConfig()->get($uid, 'statusnet', 'consumerkey'); $csecret = DI::pConfig()->get($uid, 'statusnet', 'consumersecret'); @@ -1521,7 +1412,7 @@ function statusnet_fetch_own_contact(App $a, $uid) $contact_id = 0; - if ($own_url == "") { + if ($own_url == '') { $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); // Fetching user data @@ -1535,10 +1426,9 @@ function statusnet_fetch_own_contact(App $a, $uid) $contact_id = statusnet_fetch_contact($uid, $user, true); } else { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", - intval($uid), DBA::escape($own_url)); - if (DBA::isResult($r)) { - $contact_id = $r[0]["id"]; + $contact = Contact::selectFirst([], ['uid' => $uid, 'alias' => $own_url]); + if (DBA::isResult($contact)) { + $contact_id = $contact['id']; } else { DI::pConfig()->delete($uid, 'statusnet', 'own_url'); } @@ -1546,18 +1436,18 @@ function statusnet_fetch_own_contact(App $a, $uid) return $contact_id; } -function statusnet_is_retweet(App $a, $uid, $body) +function statusnet_is_retweet(App $a, int $uid, string $body) { $body = trim($body); // Skip if it isn't a pure repeated messages // Does it start with a share? - if (strpos($body, "[share") > 0) { + if (strpos($body, '[share') > 0) { return false; } // Does it end with a share? - if (strlen($body) > (strrpos($body, "[/share]") + 8)) { + if (strlen($body) > (strrpos($body, '[/share]') + 8)) { return false; } @@ -1567,7 +1457,7 @@ function statusnet_is_retweet(App $a, $uid, $body) return false; } - $link = ""; + $link = ''; preg_match("/link='(.*?)'/ism", $attributes, $matches); if (!empty($matches[1])) { $link = $matches[1]; @@ -1591,13 +1481,13 @@ function statusnet_is_retweet(App $a, $uid, $body) return false; } - Logger::log('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG); + Logger::info('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); $result = $connection->post('statuses/retweet/' . $id); - Logger::log('statusnet_is_retweet: result ' . print_r($result, true), Logger::DEBUG); + Logger::info('statusnet_is_retweet: result ' . print_r($result, true)); return isset($result->id); }