]> git.mxchange.org Git - friendica-addons.git/blobdiff - twitter/twitter.php
PL translation blackout THX waldis
[friendica-addons.git] / twitter / twitter.php
index 148a498b1d3fbbff5877c99426c80b4574f10c45..9de7b47d8b4dbf62b766d056eb58a35fbbce521a 100644 (file)
  *     we do not need "Twitter as login". When you've registered the app you get the
  *     OAuth Consumer key and secret pair for your application/site.
  *
- *     Add this key pair to your global .htconfig.php or use the admin panel.
+ *     Add this key pair to your global config/addon.ini.php or use the admin panel.
  *
- *     $a->config['twitter']['consumerkey'] = 'your consumer_key here';
- *     $a->config['twitter']['consumersecret'] = 'your consumer_secret here';
+ *     [twitter]
+ *     consumerkey = your consumer_key here
+ *     consumersecret = your consumer_secret here
  *
- *     To activate the addon itself add it to the $a->config['system']['addon']
+ *     To activate the addon itself add it to the [system] addon
  *     setting. After this, your user can configure their Twitter account settings
  *     from "Settings -> Addon Settings".
  *
  */
 
 use Abraham\TwitterOAuth\TwitterOAuth;
+use Abraham\TwitterOAuth\TwitterOAuthException;
 use Friendica\App;
 use Friendica\Content\OEmbed;
-use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Photo;
+use Friendica\Model\ItemContent;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
@@ -89,60 +93,71 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
-function twitter_install() {
+function twitter_install()
+{
        //  we need some hooks, for the configuration and for sending tweets
-       Addon::registerHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-       Addon::registerHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
-       Addon::registerHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
-       Addon::registerHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
-       Addon::registerHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
-       Addon::registerHook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
-       Addon::registerHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
-       Addon::registerHook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
-       Addon::registerHook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
-       Addon::registerHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
-       Addon::registerHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
+       Addon::registerHook('load_config'            , __FILE__, 'twitter_load_config');
+       Addon::registerHook('connector_settings'     , __FILE__, 'twitter_settings');
+       Addon::registerHook('connector_settings_post', __FILE__, 'twitter_settings_post');
+       Addon::registerHook('post_local'             , __FILE__, 'twitter_post_local');
+       Addon::registerHook('notifier_normal'        , __FILE__, 'twitter_post_hook');
+       Addon::registerHook('jot_networks'           , __FILE__, 'twitter_jot_nets');
+       Addon::registerHook('cron'                   , __FILE__, 'twitter_cron');
+       Addon::registerHook('queue_predeliver'       , __FILE__, 'twitter_queue_hook');
+       Addon::registerHook('follow'                 , __FILE__, 'twitter_follow');
+       Addon::registerHook('expire'                 , __FILE__, 'twitter_expire');
+       Addon::registerHook('prepare_body'           , __FILE__, 'twitter_prepare_body');
+       Addon::registerHook('check_item_notification', __FILE__, 'twitter_check_item_notification');
        logger("installed twitter");
 }
 
 function twitter_uninstall()
 {
-       Addon::unregisterHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-       Addon::unregisterHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
-       Addon::unregisterHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
-       Addon::unregisterHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
-       Addon::unregisterHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
-       Addon::unregisterHook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
-       Addon::unregisterHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
-       Addon::unregisterHook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
-       Addon::unregisterHook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
-       Addon::unregisterHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
-       Addon::unregisterHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
+       Addon::unregisterHook('load_config'            , __FILE__, 'twitter_load_config');
+       Addon::unregisterHook('connector_settings'     , __FILE__, 'twitter_settings');
+       Addon::unregisterHook('connector_settings_post', __FILE__, 'twitter_settings_post');
+       Addon::unregisterHook('post_local'             , __FILE__, 'twitter_post_local');
+       Addon::unregisterHook('notifier_normal'        , __FILE__, 'twitter_post_hook');
+       Addon::unregisterHook('jot_networks'           , __FILE__, 'twitter_jot_nets');
+       Addon::unregisterHook('cron'                   , __FILE__, 'twitter_cron');
+       Addon::unregisterHook('queue_predeliver'       , __FILE__, 'twitter_queue_hook');
+       Addon::unregisterHook('follow'                 , __FILE__, 'twitter_follow');
+       Addon::unregisterHook('expire'                 , __FILE__, 'twitter_expire');
+       Addon::unregisterHook('prepare_body'           , __FILE__, 'twitter_prepare_body');
+       Addon::unregisterHook('check_item_notification', __FILE__, 'twitter_check_item_notification');
 
        // old setting - remove only
-       Addon::unregisterHook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
-       Addon::unregisterHook('addon_settings', 'addon/twitter/twitter.php', 'twitter_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
+       Addon::unregisterHook('post_local_end'     , __FILE__, 'twitter_post_hook');
+       Addon::unregisterHook('addon_settings'     , __FILE__, 'twitter_settings');
+       Addon::unregisterHook('addon_settings_post', __FILE__, 'twitter_settings_post');
 }
 
-function twitter_check_item_notification($a, &$notification_data) {
-       $own_id = get_pconfig($notification_data["uid"], 'twitter', 'own_id');
+function twitter_load_config(App $a)
+{
+       $a->loadConfigFile(__DIR__ . '/config/twitter.ini.php');
+}
+
+function twitter_check_item_notification(App $a, array &$notification_data)
+{
+       $own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
 
        $own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                        intval($notification_data["uid"]),
-                       dbesc("twitter::".$own_id)
-               );
+                       DBA::escape("twitter::".$own_id)
+       );
 
-       if ($own_user)
+       if ($own_user) {
                $notification_data["profiles"][] = $own_user[0]["url"];
+       }
 }
 
-function twitter_follow($a, &$contact) {
-
-       logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
+function twitter_follow(App $a, array &$contact)
+{
+       logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
 
-       if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com"))
+       if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
                return;
+       }
 
        // contact seems to be a twitter contact, so continue
        $nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
@@ -169,47 +184,53 @@ function twitter_follow($a, &$contact) {
        $r = q("SELECT name,nick,url,addr,batch,notify,poll,request,confirm,poco,photo,priority,network,alias,pubkey
                FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
                                intval($uid),
-                               dbesc($nickname));
-       if (count($r))
+                               DBA::escape($nickname));
+       if (DBA::isResult($r)) {
                $contact["contact"] = $r[0];
+       }
 }
 
-function twitter_jot_nets(&$a,&$b) {
-       if(! local_user())
+function twitter_jot_nets(App $a, &$b)
+{
+       if (!local_user()) {
                return;
+       }
 
-       $tw_post = get_pconfig(local_user(),'twitter','post');
-       if(intval($tw_post) == 1) {
-               $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
+       $tw_post = PConfig::get(local_user(), 'twitter', 'post');
+       if (intval($tw_post) == 1) {
+               $tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
                $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
                $b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
                        . L10n::t('Post to Twitter') . '</div>';
        }
 }
 
-function twitter_settings_post ($a,$post) {
-       if(! local_user())
+function twitter_settings_post(App $a)
+{
+       if (!local_user()) {
                return;
+       }
        // don't check twitter settings if twitter submit button is not clicked
        if (empty($_POST['twitter-disconnect']) && empty($_POST['twitter-submit'])) {
                return;
+       }
 
        if (!empty($_POST['twitter-disconnect'])) {
                /*               * *
                 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
                 * from the user configuration
                 */
-               del_pconfig(local_user(), 'twitter', 'consumerkey');
-               del_pconfig(local_user(), 'twitter', 'consumersecret');
-               del_pconfig(local_user(), 'twitter', 'oauthtoken');
-               del_pconfig(local_user(), 'twitter', 'oauthsecret');
-               del_pconfig(local_user(), 'twitter', 'post');
-               del_pconfig(local_user(), 'twitter', 'post_by_default');
-               del_pconfig(local_user(), 'twitter', 'lastid');
-               del_pconfig(local_user(), 'twitter', 'mirror_posts');
-               del_pconfig(local_user(), 'twitter', 'import');
-               del_pconfig(local_user(), 'twitter', 'create_user');
-               del_pconfig(local_user(), 'twitter', 'own_id');
+               PConfig::delete(local_user(), 'twitter', 'consumerkey');
+               PConfig::delete(local_user(), 'twitter', 'consumersecret');
+               PConfig::delete(local_user(), 'twitter', 'oauthtoken');
+               PConfig::delete(local_user(), 'twitter', 'oauthsecret');
+               PConfig::delete(local_user(), 'twitter', 'post');
+               PConfig::delete(local_user(), 'twitter', 'post_by_default');
+               PConfig::delete(local_user(), 'twitter', 'lastid');
+               PConfig::delete(local_user(), 'twitter', 'mirror_posts');
+               PConfig::delete(local_user(), 'twitter', 'import');
+               PConfig::delete(local_user(), 'twitter', 'create_user');
+               PConfig::delete(local_user(), 'twitter', 'own_id');
        } else {
                if (isset($_POST['twitter-pin'])) {
                        //  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
@@ -232,6 +253,8 @@ function twitter_settings_post ($a,$post) {
                                PConfig::set(local_user(), 'twitter', 'post', 1);
                        } catch(Exception $e) {
                                info($e->getMessage());
+                       } catch(TwitterOAuthException $e) {
+                               info($e->getMessage());
                        }
                        //  reload the Addon Settings page, if we don't do it see Bug #42
                        goaway('settings/connectors');
@@ -252,14 +275,17 @@ function twitter_settings_post ($a,$post) {
                }
        }
 }
-function twitter_settings(&$a,&$s) {
-       if(! local_user())
+
+function twitter_settings(App $a, &$s)
+{
+       if (!local_user()) {
                return;
+       }
        $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
-       /***
+       /*       * *
         * 1) Check that we have global consumer key & secret
         * 2) If no OAuthtoken & stuff is present, generate button to get some
-        * 3) Checkbox for "Send public notices (140 chars only)
+        * 3) Checkbox for "Send public notices (280 chars only)
         */
        $ckey    = Config::get('twitter', 'consumerkey');
        $csecret = Config::get('twitter', 'consumersecret');
@@ -296,82 +322,72 @@ function twitter_settings(&$a,&$s) {
                         * account at Twitter.
                         */
                        $connection = new TwitterOAuth($ckey, $csecret);
-                       $result = $connection->oauth('oauth/request_token', ['oauth_callback' => 'oob']);
-
-                       $s .= '<p>' . L10n::t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
-                       $s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
-                       $s .= '<div id="twitter-pin-wrapper">';
-                       $s .= '<label id="twitter-pin-label" for="twitter-pin">' . L10n::t('Copy the PIN from Twitter here') . '</label>';
-                       $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
-                       $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $result['oauth_token'] . '" />';
-                       $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $result['oauth_token_secret'] . '" />';
-                       $s .= '</div><div class="clear"></div>';
-                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+                       try {
+                               $result = $connection->oauth('oauth/request_token', ['oauth_callback' => 'oob']);
+                               $s .= '<p>' . L10n::t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
+                               $s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
+                               $s .= '<div id="twitter-pin-wrapper">';
+                               $s .= '<label id="twitter-pin-label" for="twitter-pin">' . L10n::t('Copy the PIN from Twitter here') . '</label>';
+                               $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
+                               $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $result['oauth_token'] . '" />';
+                               $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $result['oauth_token_secret'] . '" />';
+                               $s .= '</div><div class="clear"></div>';
+                               $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+                       } catch (TwitterOAuthException $e) {
+                               $s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
+                       }
                } else {
-                       /***
+                       /*                       * *
                         *  we have an OAuth key / secret pair for the user
                         *  so let's give a chance to disable the postings to Twitter
                         */
                        $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-                       $details = $connection->get('account/verify_credentials');
-                       $s .= '<div id="twitter-info" ><img id="twitter-avatar" src="'.$details->profile_image_url.'" /><p id="twitter-info-block">'. t('Currently connected to: ') .'<a href="https://twitter.com/'.$details->screen_name.'" target="_twitter">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
-                       $s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
-                       if ($a->user['hidewall']) {
-                           $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
-                       }
-                       $s .= '<div id="twitter-enable-wrapper">';
-                       $s .= '<label id="twitter-enable-label" for="twitter-checkbox">'. t('Allow posting to Twitter'). '</label>';
-                       $s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
-                       $s .= '<div class="clear"></div>';
-                       $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
-                       $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
-                       $s .= '<div class="clear"></div>';
-
-                       $field_checkbox = get_markup_template('field_checkbox.tpl');
-
-                       $s .= '<div id="twitter-info" >
-                               <p>' . L10n::t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
-                                       <button type="submit" name="twitter-disconnect" value="1">' . L10n::t('Disconnect') . '</button>
-                               </p>
-                               <p id="twitter-info-block">
-                                       <a href="https://twitter.com/' . $details->screen_name . '" target="_twitter"><img id="twitter-avatar" src="' . $details->profile_image_url . '" /></a>
-                                       <em>' . $details->description . '</em>
-                               </p>
-                       </div>';
-                       $s .= '<div class="clear"></div>';
-                       $s .= '</div>';
-
-                       $s .= replace_macros($field_checkbox, [
-                               '$field' => ['twitter-enable', L10n::t('Allow posting to Twitter'), $enabled, L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
-                       ]);
-                       if ($a->user['hidewall']) {
-                               $s .= '<p>' . L10n::t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+                       try {
+                               $details = $connection->get('account/verify_credentials');
+
+                               $field_checkbox = get_markup_template('field_checkbox.tpl');
+
+                               $s .= '<div id="twitter-info" >
+                                       <p>' . L10n::t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
+                                               <button type="submit" name="twitter-disconnect" value="1">' . L10n::t('Disconnect') . '</button>
+                                       </p>
+                                       <p id="twitter-info-block">
+                                               <a href="https://twitter.com/' . $details->screen_name . '" target="_twitter"><img id="twitter-avatar" src="' . $details->profile_image_url . '" /></a>
+                                               <em>' . $details->description . '</em>
+                                       </p>
+                               </div>';
+                               $s .= '<div class="clear"></div>';
+
+                               $s .= replace_macros($field_checkbox, [
+                                       '$field' => ['twitter-enable', L10n::t('Allow posting to Twitter'), $enabled, L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
+                               ]);
+                               if ($a->user['hidewall']) {
+                                       $s .= '<p>' . L10n::t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+                               }
+                               $s .= replace_macros($field_checkbox, [
+                                       '$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
+                               ]);
+                               $s .= replace_macros($field_checkbox, [
+                                       '$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
+                               ]);
+                               $s .= replace_macros($field_checkbox, [
+                                       '$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
+                               ]);
+                               $s .= replace_macros($field_checkbox, [
+                                       '$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, L10n::t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')]
+                               ]);
+                               $s .= '<div class="clear"></div>';
+                               $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+                       } catch (TwitterOAuthException $e) {
+                               $s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
                        }
-                       $s .= replace_macros($field_checkbox, [
-                               '$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
-                       ]);
-                       $s .= replace_macros($field_checkbox, [
-                               '$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
-                       ]);
-                       $s .= replace_macros($field_checkbox, [
-                               '$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
-                       ]);
-                       $s .= replace_macros($field_checkbox, [
-                               '$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, '']
-                       ]);
-
-                       $s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
-                       $s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
-                       $s .= '<div class="clear"></div>';
-                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
                }
        }
        $s .= '</div><div class="clear"></div>';
 }
 
-
-function twitter_post_local(&$a, &$b) {
-
+function twitter_post_local(App $a, array &$b)
+{
        if ($b['edit']) {
                return;
        }
@@ -380,11 +396,11 @@ function twitter_post_local(&$a, &$b) {
                return;
        }
 
-       $twitter_post = intval(get_pconfig(local_user(), 'twitter', 'post'));
+       $twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
        $twitter_enable = (($twitter_post && x($_REQUEST, 'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
 
        // if API is used, default to the chosen settings
-       if ($b['api_source'] && intval(get_pconfig(local_user(), 'twitter', 'post_by_default'))) {
+       if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
                $twitter_enable = 1;
        }
 
@@ -399,17 +415,23 @@ function twitter_post_local(&$a, &$b) {
        $b['postopts'] .= 'twitter';
 }
 
-function twitter_action($a, $uid, $pid, $action) {
+function twitter_action(App $a, $uid, $pid, $action)
+{
+       $ckey = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-       $post = array('id' => $pid);
+       $post = ['id' => $pid];
 
-       logger("twitter_action '".$action."' ID: ".$pid." data: " . print_r($post, true), LOGGER_DATA);
+       logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
 
        switch ($action) {
                case "delete":
                        // To-Do: $result = $connection->post('statuses/destroy', $post);
+                       $result = [];
                        break;
                case "like":
                        $result = $connection->post('favorites/create', $post);
@@ -417,11 +439,14 @@ function twitter_action($a, $uid, $pid, $action) {
                case "unlike":
                        $result = $connection->post('favorites/destroy', $post);
                        break;
+               default:
+                       logger('Unhandled action ' . $action, LOGGER_DEBUG);
+                       $result = [];
        }
-       logger("twitter_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+       logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
-function twitter_post_hook(App $a, &$b)
+function twitter_post_hook(App $a, array &$b)
 {
        // Post to Twitter
        if (!PConfig::get($b["uid"], 'twitter', 'import')
@@ -429,8 +454,8 @@ function twitter_post_hook(App $a, &$b)
                return;
        }
 
-       if($b['parent'] != $b['id']) {
-               logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
+       if ($b['parent'] != $b['id']) {
+               logger("twitter_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
 
                // Looking if its a reply to a twitter post
                if ((substr($b["parent-uri"], 0, 9) != "twitter::")
@@ -441,37 +466,44 @@ function twitter_post_hook(App $a, &$b)
                        return;
                }
 
-               $r = q("SELECT * FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
-                       dbesc($b["thr-parent"]),
-                       intval($b["uid"]));
-
-               if(!count($r)) {
-                       logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
+               $condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
+               $orig_post = Item::selectFirst([], $condition);
+               if (!DBA::isResult($orig_post)) {
+                       logger("twitter_post_hook: no parent found " . $b["thr-parent"]);
                        return;
                } else {
                        $iscomment = true;
-                       $orig_post = $r[0];
                }
 
 
                $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-               $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-               $nicknameplain = "@".$nicknameplain;
+               $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+               $nicknameplain = "@" . $nicknameplain;
 
-               logger("twitter_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("twitter_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("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
+               logger("twitter_post_hook: parent found " . print_r($orig_post, true), LOGGER_DATA);
        } else {
                $iscomment = false;
 
-               if($b['private'] || !strstr($b['postopts'],'twitter'))
+               if ($b['private'] || !strstr($b['postopts'], 'twitter')) {
+                       return;
+               }
+
+               // Dont't post if the post doesn't belong to us.
+               // This is a check for forum postings
+               $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+               if ($b['contact-id'] != $self['id']) {
                        return;
+               }
        }
 
-       if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
+       if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
                twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
+       }
 
        if ($b['verb'] == ACTIVITY_LIKE) {
                logger("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), LOGGER_DEBUG);
@@ -484,37 +516,43 @@ function twitter_post_hook(App $a, &$b)
                return;
        }
 
-       if($b['deleted'] || ($b['created'] !== $b['edited']))
+       if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
                return;
+       }
 
        // if post comes from twitter don't send it back
-       if($b['extid'] == NETWORK_TWITTER)
+       if ($b['extid'] == NETWORK_TWITTER) {
                return;
+       }
 
-       if($b['app'] == "Twitter")
+       if ($b['app'] == "Twitter") {
                return;
+       }
 
        logger('twitter post invoked');
 
+       PConfig::load($b['uid'], 'twitter');
 
-       load_pconfig($b['uid'], 'twitter');
-
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($b['uid'], 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($b['uid'], 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
 
-       if($ckey && $csecret && $otoken && $osecret) {
+       if ($ckey && $csecret && $otoken && $osecret) {
                logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
 
                // If it's a repeated message from twitter then do a native retweet and exit
-               if (twitter_is_retweet($a, $b['uid'], $b['body']))
+               if (twitter_is_retweet($a, $b['uid'], $b['body'])) {
                        return;
+               }
 
                $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
+               // Set the timeout for upload to 30 seconds
+               $connection->setTimeouts(10, 30);
+
                $max_char = 280;
-               $msgarr = BBCode::toPlaintext($b, $max_char, true, 8);
+               $msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 8);
                $msg = $msgarr["text"];
 
                if (($msg == "") && isset($msgarr["title"])) {
@@ -523,82 +561,78 @@ function twitter_post_hook(App $a, &$b)
 
                $image = "";
 
-               if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
-                       $msg .= "\n".$msgarr["url"];
+               if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+                       $msg .= "\n" . $msgarr["url"];
+                       $url_added = true;
+               } else {
+                       $url_added = false;
+               }
 
-               if (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
+               if (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
                        $image = $msgarr["image"];
+               }
 
-               // and now tweet it :-)
-               if (strlen($msg) && ($image != "")) {
-                       $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-                       $media = $connection->upload('media/upload', ['media' => $image]);
+               if (empty($msg)) {
+                       return;
+               }
 
-                       $post = ['status' => $msg, 'media_ids' => $media->media_id_string];
+               // and now tweet it :-)
+               $post = [];
 
-                       if ($iscomment)
-                               $post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+               if (!empty($image)) {
+                       try {
+                               $img_str = Network::fetchUrl($image);
 
-                       $result = $connection->post('statuses/update', $post);
+                               $tempfile = tempnam(get_temppath(), 'cache');
+                               file_put_contents($tempfile, $img_str);
 
-                       logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
+                               $media = $connection->upload('media/upload', ['media' => $tempfile]);
 
-                       if ($result->source)
-                               set_config("twitter", "application_name", strip_tags($result->source));
+                               unlink($tempfile);
 
-                       if ($result->errors || $result->error) {
-                               logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+                               $post['media_ids'] = $media->media_id_string;
+                       } catch (Exception $e) {
+                               logger('Exception when trying to send to Twitter: ' . $e->getMessage());
 
                                // Workaround: Remove the picture link so that the post can be reposted without it
-                               $msg .= " ".$image;
+                               // When there is another url already added, a second url would be superfluous.
+                               if (!$url_added) {
+                                       $msg .= "\n" . $image;
+                               }
+
                                $image = "";
-                       } elseif ($iscomment) {
-                               logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
-                               Item::update(['extid' => "twitter::" . $result->id_str, 'body' => $result->text], ['id' => $b['id']]);
                        }
                }
 
-               if (strlen($msg) && ($image == "")) {
-// -----------------
-                       $max_char = 280;
-                       $msgarr = BBCode::toPlaintext($b, $max_char, true, 8);
-                       $msg = $msgarr["text"];
-
-                       if (($msg == "") && isset($msgarr["title"])) {
-                               $msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
-                       }
-
-                       if (isset($msgarr["url"])) {
-                               $msg .= "\n" . $msgarr["url"];
-                       }
-// -----------------
-                       $url = 'statuses/update';
-                       $post = array('status' => $msg);
+               $post['status'] = $msg;
 
-                       if ($iscomment)
-                               $post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+               if ($iscomment) {
+                       $post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+               }
 
-                       $result = $connection->post($url, $post);
-                       logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
+               $url = 'statuses/update';
+               $result = $connection->post($url, $post);
+               logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
-                       if ($result->source)
-                               set_config("twitter", "application_name", strip_tags($result->source));
+               if (!empty($result->source)) {
+                       Config::set("twitter", "application_name", strip_tags($result->source));
+               }
 
-                       if ($result->errors) {
-                               logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+               if (!empty($result->errors)) {
+                       logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
-                               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
-                               if (count($r))
-                                       $a->contact = $r[0]["id"];
+                       $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
+                       if (DBA::isResult($r)) {
+                               $a->contact = $r[0]["id"];
+                       }
 
-                               $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]);
+                       $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $post]);
 
-                               Queue::add($a->contact, NETWORK_TWITTER, $s);
-                               notice(L10n::t('Twitter post failed. Queued for retry.') . EOL);
-                       } elseif ($iscomment) {
-                               logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
-                               Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);
-                       }
+                       Queue::add($a->contact, NETWORK_TWITTER, $s);
+                       notice(L10n::t('Twitter post failed. Queued for retry.') . EOL);
+               } elseif ($iscomment) {
+                       logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
+                       Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);
                }
        }
 }
@@ -611,8 +645,6 @@ function twitter_addon_admin_post(App $a)
        Config::set('twitter', 'consumersecret', $consumersecret);
        info(L10n::t('Settings updated.') . EOL);
 }
-function twitter_plugin_admin(&$a, &$o){
-       $t = get_markup_template( "admin.tpl", "addon/twitter/" );
 
 function twitter_addon_admin(App $a, &$o)
 {
@@ -626,16 +658,18 @@ function twitter_addon_admin(App $a, &$o)
        ]);
 }
 
-function twitter_cron($a,$b) {
-       $last = get_config('twitter','last_poll');
+function twitter_cron(App $a)
+{
+       $last = Config::get('twitter', 'last_poll');
 
-       $poll_interval = intval(get_config('twitter','poll_interval'));
-       if(! $poll_interval)
+       $poll_interval = intval(Config::get('twitter', 'poll_interval'));
+       if (!$poll_interval) {
                $poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
+       }
 
-       if($last) {
+       if ($last) {
                $next = $last + ($poll_interval * 60);
-               if($next > time()) {
+               if ($next > time()) {
                        logger('twitter: poll intervall not reached');
                        return;
                }
@@ -643,10 +677,10 @@ function twitter_cron($a,$b) {
        logger('twitter: cron_start');
 
        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
-       if(count($r)) {
-               foreach($r as $rr) {
-                       logger('twitter: fetching for user '.$rr['uid']);
-                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
+       if (DBA::isResult($r)) {
+               foreach ($r as $rr) {
+                       logger('twitter: fetching for user ' . $rr['uid']);
+                       Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
                }
        }
 
@@ -658,64 +692,66 @@ function twitter_cron($a,$b) {
        $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
-       if(count($r)) {
-               foreach($r as $rr) {
+       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 (!count($user)) {
-                                       logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+                               if (!DBA::isResult($user)) {
+                                       logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
                                        continue;
                                }
                        }
 
-                       logger('twitter: importing timeline from user '.$rr['uid']);
-                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
-/*
-                       // To-Do
-                       // check for new contacts once a day
-                       $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
-                       if($last_contact_check)
-                               $next_contact_check = $last_contact_check + 86400;
-                       else
-                               $next_contact_check = 0;
-
-                       if($next_contact_check <= time()) {
-                               pumpio_getallusers($a, $rr["uid"]);
-                               set_pconfig($rr['uid'],'pumpio','contact_check',time());
-                       }
-*/
-
+                       logger('twitter: importing timeline from user ' . $rr['uid']);
+                       Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
+                       /*
+                         // To-Do
+                         // check for new contacts once a day
+                         $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
+                         if($last_contact_check)
+                         $next_contact_check = $last_contact_check + 86400;
+                         else
+                         $next_contact_check = 0;
+
+                         if($next_contact_check <= time()) {
+                         pumpio_getallusers($a, $rr["uid"]);
+                         PConfig::set($rr['uid'],'pumpio','contact_check',time());
+                         }
+                        */
                }
        }
 
        logger('twitter: cron_end');
 
-       set_config('twitter','last_poll', time());
+       Config::set('twitter', 'last_poll', time());
 }
 
-function twitter_expire($a,$b) {
-
-       $days = get_config('twitter', 'expire');
+function twitter_expire(App $a)
+{
+       $days = Config::get('twitter', 'expire');
 
-       if ($days == 0)
+       if ($days == 0) {
                return;
+       }
 
-       if (method_exists('dba', 'delete')) {
-               $r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
-               while ($row = dba::fetch($r)) {
-                       dba::delete('item', array('id' => $row['id']));
+       $r = DBA::select('item', ['id', 'iaid', 'icid'], ['deleted' => true, 'network' => NETWORK_TWITTER]);
+       while ($row = DBA::fetch($r)) {
+               DBA::delete('item', ['id' => $row['id']]);
+               if (!empty($row['iaid']) && !DBA::exists('item', ['iaid' => $row['iaid']])) {
+                       DBA::delete('item-activity', ['id' => $row['iaid']]);
+               }
+               if (!empty($row['icid']) && !DBA::exists('item', ['icid' => $row['icid']])) {
+                       DBA::delete('item-content', ['id' => $row['icid']]);
                }
-               dba::close($r);
-       } else {
-               $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
        }
+       DBA::close($r);
 
-       require_once("include/items.php");
+       require_once "include/items.php";
 
        logger('twitter_expire: expire_start');
 
        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
-       if (count($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        logger('twitter_expire: user ' . $rr['uid']);
                        Item::expire($rr['uid'], $days, NETWORK_TWITTER, true);
@@ -725,166 +761,179 @@ function twitter_expire($a,$b) {
        logger('twitter_expire: expire_end');
 }
 
-function twitter_prepare_body(&$a,&$b) {
-       if ($b["item"]["network"] != NETWORK_TWITTER)
+function twitter_prepare_body(App $a, array &$b)
+{
+       if ($b["item"]["network"] != NETWORK_TWITTER) {
                return;
+       }
 
        if ($b["preview"]) {
                $max_char = 280;
                $item = $b["item"];
-               $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
-
-               $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
-                       dbesc($item["thr-parent"]),
-                       intval(local_user()));
-
-               if(count($r)) {
-                       $orig_post = $r[0];
+               $item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
+               $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
+               $orig_post = Item::selectFirst(['author-link'], $condition);
+               if (DBA::isResult($orig_post)) {
                        $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-                       $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-                       $nicknameplain = "@".$nicknameplain;
+                       $nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+                       $nicknameplain = "@" . $nicknameplain;
 
-                       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 = BBCode::toPlaintext($item, $max_char, true, 8);
+               $msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 8);
                $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));
+               $b['html'] = nl2br(htmlspecialchars($msg));
        }
 }
 
 /**
  * @brief Build the item array for the mirrored post
  *
- * @param object $a Application class
+ * @param App $a Application class
  * @param integer $uid User id
  * @param object $post Twitter object with the post
  *
  * @return array item data to be posted
  */
-function twitter_do_mirrorpost($a, $uid, $post) {
-       $datarray["type"] = "wall";
-       $datarray["api_source"] = true;
-       $datarray["profile_uid"] = $uid;
-       $datarray["extid"] = NETWORK_TWITTER;
-       $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
-       $datarray['object'] = json_encode($post);
-       $datarray["title"] = "";
-
-       if (is_object($post->retweeted_status)) {
+function twitter_do_mirrorpost(App $a, $uid, $post)
+{
+       $datarray['api_source'] = true;
+       $datarray['profile_uid'] = $uid;
+       $datarray['extid'] = NETWORK_TWITTER;
+       $datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ':' . $post->id);
+       $datarray['protocol'] = Conversation::PARCEL_TWITTER;
+       $datarray['source'] = json_encode($post);
+       $datarray['title'] = '';
+
+       if (!empty($post->retweeted_status)) {
                // We don't support nested shares, so we mustn't show quotes as shares on retweets
-               $item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
+               $item = twitter_createpost($a, $uid, $post->retweeted_status, ['id' => 0], false, false, true);
 
                $datarray['body'] = "\n" . share_header(
                        $item['author-name'],
                        $item['author-link'],
                        $item['author-avatar'],
-                       "",
+                       '',
                        $item['created'],
                        $item['plink']
                );
 
-               $datarray['body'] .= $item['body'].'[/share]';
+               $datarray['body'] .= $item['body'] . '[/share]';
        } else {
-               $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
+               $item = twitter_createpost($a, $uid, $post, ['id' => 0], false, false, false);
 
                $datarray['body'] = $item['body'];
        }
 
-       $datarray["source"] = $item['app'];
-       $datarray["verb"] = $item['verb'];
+       $datarray['source'] = $item['app'];
+       $datarray['verb'] = $item['verb'];
 
-       if (isset($item["location"])) {
-               $datarray["location"] = $item["location"];
+       if (isset($item['location'])) {
+               $datarray['location'] = $item['location'];
        }
 
-       if (isset($item["coord"])) {
-               $datarray["coord"] = $item["coord"];
+       if (isset($item['coord'])) {
+               $datarray['coord'] = $item['coord'];
        }
 
        return $datarray;
 }
 
-function twitter_fetchtimeline($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
-       $lastid  = get_pconfig($uid, 'twitter', 'lastid');
+function twitter_fetchtimeline(App $a, $uid)
+{
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+       $lastid  = PConfig::get($uid, 'twitter', 'lastid');
 
-       $application_name  = get_config('twitter', 'application_name');
+       $application_name = Config::get('twitter', 'application_name');
 
-       if ($application_name == "")
+       if ($application_name == "") {
                $application_name = $a->get_hostname();
+       }
 
        $has_picture = false;
 
-       require_once('mod/item.php');
-       require_once('include/items.php');
-       require_once('mod/share.php');
+       require_once 'mod/item.php';
+       require_once 'include/items.php';
+       require_once 'mod/share.php';
 
        $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-       $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
+       $parameters = ["exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"];
 
        $first_time = ($lastid == "");
 
-       if ($lastid <> "")
+       if ($lastid != "") {
                $parameters["since_id"] = $lastid;
+       }
 
-       $items = $connection->get('statuses/user_timeline', $parameters);
+       try {
+               $items = $connection->get('statuses/user_timeline', $parameters);
+       } catch (TwitterOAuthException $e) {
+               logger('twitter_fetchtimeline: Error fetching timeline for user ' . $uid . ': ' . $e->getMessage());
+               return;
+       }
 
-       if (!is_array($items))
+       if (!is_array($items)) {
                return;
+       }
 
        $posts = array_reverse($items);
 
        if (count($posts)) {
-           foreach ($posts as $post) {
-               if ($post->id_str > $lastid) {
-                       $lastid = $post->id_str;
-                       set_pconfig($uid, 'twitter', 'lastid', $lastid);
-               }
-
-               if ($first_time)
-                       continue;
+               foreach ($posts as $post) {
+                       if ($post->id_str > $lastid) {
+                               $lastid = $post->id_str;
+                               PConfig::set($uid, 'twitter', 'lastid', $lastid);
+                       }
 
-               if (!stristr($post->source, $application_name)) {
+                       if ($first_time) {
+                               continue;
+                       }
 
-                       $_SESSION["authenticated"] = true;
-                       $_SESSION["uid"] = $uid;
+                       if (!stristr($post->source, $application_name)) {
+                               $_SESSION["authenticated"] = true;
+                               $_SESSION["uid"] = $uid;
 
-                       $_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
+                               $_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
 
-                       logger('twitter: posting for user '.$uid);
+                               logger('twitter: posting for user ' . $uid);
 
-                       item_post($a);
+                               item_post($a);
+                       }
                }
-           }
        }
-       set_pconfig($uid, 'twitter', 'lastid', $lastid);
+       PConfig::set($uid, 'twitter', 'lastid', $lastid);
 }
 
-function twitter_queue_hook(&$a,&$b) {
-
+function twitter_queue_hook(App $a)
+{
        $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
-               dbesc(NETWORK_TWITTER)
-               );
-       if(! count($qi))
+               DBA::escape(NETWORK_TWITTER)
+       );
+       if (!DBA::isResult($qi)) {
                return;
+       }
 
        foreach ($qi as $x) {
                if ($x['network'] !== NETWORK_TWITTER) {
                        continue;
+               }
 
                logger('twitter_queue: run');
 
@@ -892,20 +941,20 @@ function twitter_queue_hook(&$a,&$b) {
                        WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
                        intval($x['cid'])
                );
-               if(! count($r))
+               if (!DBA::isResult($r)) {
                        continue;
+               }
 
                $user = $r[0];
 
-               $ckey    = get_config('twitter', 'consumerkey');
-               $csecret = get_config('twitter', 'consumersecret');
-               $otoken  = get_pconfig($user['uid'], 'twitter', 'oauthtoken');
-               $osecret = get_pconfig($user['uid'], 'twitter', 'oauthsecret');
+               $ckey    = Config::get('twitter', 'consumerkey');
+               $csecret = Config::get('twitter', 'consumersecret');
+               $otoken  = PConfig::get($user['uid'], 'twitter', 'oauthtoken');
+               $osecret = PConfig::get($user['uid'], 'twitter', 'oauthsecret');
 
                $success = false;
 
                if ($ckey && $csecret && $otoken && $osecret) {
-
                        logger('twitter_queue: able to post');
 
                        $z = unserialize($x['content']);
@@ -915,14 +964,15 @@ function twitter_queue_hook(&$a,&$b) {
 
                        logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
 
-                       if ($result->errors)
+                       if ($result->errors) {
                                logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
-                       else {
+                       else {
                                $success = true;
                                Queue::removeItem($x['id']);
                        }
-               } else
-                       logger("twitter_queue: Error getting tokens for user ".$user['uid']);
+               } else {
+                       logger("twitter_queue: Error getting tokens for user " . $user['uid']);
+               }
 
                if (!$success) {
                        logger('twitter_queue: delayed');
@@ -931,158 +981,97 @@ function twitter_queue_hook(&$a,&$b) {
        }
 }
 
-function twitter_fix_avatar($avatar) {
-       require_once("include/Photo.php");
-
+function twitter_fix_avatar($avatar)
+{
        $new_avatar = str_replace("_normal.", ".", $avatar);
 
-       $info = get_photo_info($new_avatar);
-       if (!$info)
+       $info = Image::getInfoFromURL($new_avatar);
+       if (!$info) {
                $new_avatar = $avatar;
+       }
 
        return $new_avatar;
 }
 
-function twitter_fetch_contact($uid, $contact, $create_user) {
-
-       if ($contact->id_str == "")
-               return(-1);
+function twitter_fetch_contact($uid, $data, $create_user)
+{
+       if ($data->id_str == "") {
+               return -1;
+       }
 
-       $avatar = twitter_fix_avatar($contact->profile_image_url_https);
+       $avatar = twitter_fix_avatar($data->profile_image_url_https);
+       $url = "https://twitter.com/" . $data->screen_name;
+       $addr = $data->screen_name . "@twitter.com";
 
-       update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
-                       "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
-                       "name" => $contact->name, "nick" => $contact->screen_name,
-                       "location" => $contact->location, "about" => $contact->description,
-                       "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
+       GContact::update(["url" => $url, "network" => NETWORK_TWITTER,
+               "photo" => $avatar, "hide" => true,
+               "name" => $data->name, "nick" => $data->screen_name,
+               "location" => $data->location, "about" => $data->description,
+               "addr" => $addr, "generation" => 2]);
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-               intval($uid),
-               dbesc("twitter::" . $contact->id_str));
+       $fields = ['url' => $url, 'network' => NETWORK_TWITTER,
+               'name' => $data->name, 'nick' => $data->screen_name, 'addr' => $addr,
+                'location' => $data->location, 'about' => $data->description];
 
-       if(!count($r) && !$create_user)
-               return(0);
+       $cid = Contact::getIdForURL($url, 0, true, $fields);
+       if (!empty($cid)) {
+               DBA::update('contact', $fields, ['id' => $cid]);
+               Contact::updateAvatar($avatar, 0, $cid);
+       }
 
-       if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
-               logger("twitter_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
-               return(-1);
+       $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]);
+       if (!DBA::isResult($contact) && !$create_user) {
+               return 0;
        }
 
-       if(!count($r)) {
+       if (!DBA::isResult($contact)) {
                // 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),
-                       dbesc(DateTimeFormat::utcNow()),
-                       dbesc("https://twitter.com/" . $contact->screen_name),
-                       dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
-                       dbesc($contact->screen_name."@twitter.com"),
-                       dbesc("twitter::".$contact->id_str),
-                       dbesc(''),
-                       dbesc("twitter::".$contact->id_str),
-                       dbesc($contact->name),
-                       dbesc($contact->screen_name),
-                       dbesc($avatar),
-                       dbesc(NETWORK_TWITTER),
-                       intval(CONTACT_IS_FRIEND),
-                       intval(1),
-                       dbesc($contact->location),
-                       dbesc($contact->description),
-                       intval(1)
-               );
-
-               $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc("twitter::".$contact->id_str),
-                       intval($uid)
-                       );
-
-               if(! count($r))
-                       return(false);
+               $fields['uid'] = $uid;
+               $fields['created'] = DateTimeFormat::utcNow();
+               $fields['nurl'] = normalise_link($url);
+               $fields['alias'] = 'twitter::' . $data->id_str;
+               $fields['poll'] = 'twitter::' . $data->id_str;
+               $fields['rel'] = Contact::FRIEND;
+               $fields['priority'] = 1;
+               $fields['writable'] = true;
+               $fields['blocked'] = false;
+               $fields['readonly'] = false;
+               $fields['pending'] = false;
+
+               if (!DBA::insert('contact', $fields)) {
+                       return false;
+               }
 
-               $contact_id  = $r[0]['id'];
+               $contact_id = DBA::lastInsertId();
 
-               $g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1",
-                       intval($uid)
-               );
+               Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
-               if($g && intval($g[0]['def_gid'])) {
-                       require_once('include/group.php');
-                       group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+               Contact::updateAvatar($avatar, $uid, $contact_id);
+       } else {
+               if ($contact["readonly"] || $contact["blocked"]) {
+                       logger("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+                       return -1;
                }
 
-               require_once("Photo.php");
-
-               $photos = import_profile_photo($avatar, $uid, $contact_id, true);
-
-               if ($photos) {
-                       q("UPDATE `contact` SET `photo` = '%s',
-                                               `thumb` = '%s',
-                                               `micro` = '%s',
-                                               `name-date` = '%s',
-                                               `uri-date` = '%s',
-                                                       `avatar-date` = '%s'
-                                       WHERE `id` = %d",
-                               dbesc($photos[0]),
-                               dbesc($photos[1]),
-                               dbesc($photos[2]),
-                               dbesc(DateTimeFormat::utcNow()),
-                               dbesc(DateTimeFormat::utcNow()),
-                               dbesc(DateTimeFormat::utcNow()),
-                               intval($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'));
+               $contact_id = $contact['id'];
+
+               // update profile photos once every twelve hours as we have no notification of when they change.
+               $update_photo = ($contact['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
 
                // check that we have all the photos, this has been known to fail on occasion
+               if (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']) || $update_photo) {
+                       logger("twitter_fetch_contact: Updating contact " . $data->screen_name, LOGGER_DEBUG);
 
-               if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
-
-                       logger("twitter_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
-
-                       require_once("Photo.php");
-
-                       $photos = import_profile_photo($avatar, $uid, $r[0]['id'], true);
-
-                       if ($photos) {
-                               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",
-                                       dbesc($photos[0]),
-                                       dbesc($photos[1]),
-                                       dbesc($photos[2]),
-                                       dbesc(DateTimeFormat::utcNow()),
-                                       dbesc(DateTimeFormat::utcNow()),
-                                       dbesc(DateTimeFormat::utcNow()),
-                                       dbesc("https://twitter.com/".$contact->screen_name),
-                                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
-                                       dbesc($contact->screen_name."@twitter.com"),
-                                       dbesc($contact->name),
-                                       dbesc($contact->screen_name),
-                                       dbesc($contact->location),
-                                       dbesc($contact->description),
-                                       intval($r[0]['id'])
-                               );
-                       }
+                       Contact::updateAvatar($avatar, $uid, $contact['id']);
+
+                       $fields['name-date'] = DateTimeFormat::utcNow();
+                       $fields['uri-date'] = DateTimeFormat::utcNow();
+
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
                }
        }
 
-       return($r[0]["id"]);
+       return $contact_id;
 }
 
 function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
@@ -1095,25 +1084,34 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
        $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                intval($uid));
 
-       if(count($r)) {
+       if (DBA::isResult($r)) {
                $self = $r[0];
-       } else
+       } else {
                return;
+       }
 
-       $parameters = array();
+       $parameters = [];
 
-       if ($screen_name != "")
+       if ($screen_name != "") {
                $parameters["screen_name"] = $screen_name;
+       }
 
-       if ($user_id != "")
+       if ($user_id != "") {
                $parameters["user_id"] = $user_id;
+       }
 
        // Fetching user data
        $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-       $user = $connection->get('users/show', $parameters);
+       try {
+               $user = $connection->get('users/show', $parameters);
+       } catch (TwitterOAuthException $e) {
+               logger('twitter_fetchuser: Error fetching user ' . $uid . ': ' . $e->getMessage());
+               return;
+       }
 
-       if (!is_object($user))
+       if (!is_object($user)) {
                return;
+       }
 
        $contact_id = twitter_fetch_contact($uid, $user, true);
 
@@ -1150,14 +1148,20 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                        if ($url->url && $url->expanded_url && $url->display_url) {
                                $expanded_url = Network::finalUrl($url->expanded_url);
 
-                               $oembed_data = oembed_fetch_url($expanded_url);
+                               $oembed_data = OEmbed::fetchURL($expanded_url);
+
+                               if (empty($oembed_data) || empty($oembed_data->type)) {
+                                       continue;
+                               }
 
                                // Quickfix: Workaround for URL with "[" and "]" in it
-                               if (strpos($expanded_url, "[") || strpos($expanded_url, "]"))
+                               if (strpos($expanded_url, "[") || strpos($expanded_url, "]")) {
                                        $expanded_url = $url->url;
+                               }
 
-                               if ($type == "")
+                               if ($type == "") {
                                        $type = $oembed_data->type;
+                               }
 
                                if ($oembed_data->type == "video") {
                                        //$body = str_replace($url->url,
@@ -1165,14 +1169,12 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                                        //$dontincludemedia = true;
                                        $type = $oembed_data->type;
                                        $footerurl = $expanded_url;
-                                       $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+                                       $footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
 
                                        $body = str_replace($url->url, $footerlink, $body);
-                               //} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+                                       //} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
                                } elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
-                                       $body = str_replace($url->url,
-                                                       "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
-                                                       $body);
+                                       $body = str_replace($url->url, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
                                        //$dontincludemedia = true;
                                } elseif ($oembed_data->type != "link") {
                                        $body = str_replace($url->url, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
@@ -1181,17 +1183,24 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
                                        $tempfile = tempnam(get_temppath(), "cache");
                                        file_put_contents($tempfile, $img_str);
-                                       $mime = image_type_to_mime_type(exif_imagetype($tempfile));
+
+                                       // See http://php.net/manual/en/function.exif-imagetype.php#79283
+                                       if (filesize($tempfile) > 11) {
+                                               $mime = image_type_to_mime_type(exif_imagetype($tempfile));
+                                       } else {
+                                               $mime = false;
+                                       }
+
                                        unlink($tempfile);
 
                                        if (substr($mime, 0, 6) == "image/") {
                                                $type = "photo";
-                                               $body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
+                                               $body = str_replace($url->url, "[img]" . $expanded_url . "[/img]", $body);
                                                //$dontincludemedia = true;
                                        } 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($url->url, $footerlink, $body);
                                        }
@@ -1199,21 +1208,23 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                        }
                }
 
-               if ($footerurl != "")
+               if ($footerurl != "") {
                        $footer = add_page_info($footerurl, false, $picture);
+               }
 
                if (($footerlink != "") && (trim($footer) != "")) {
                        $removedlink = trim(str_replace($footerlink, "", $body));
 
-                       if (($removedlink == "") || strstr($body, $removedlink))
+                       if (($removedlink == "") || strstr($body, $removedlink)) {
                                $body = $removedlink;
+                       }
 
                        $body .= $footer;
                }
 
-               if (($footer == "") && ($picture != ""))
-                       $body .= "\n\n[img]".$picture."[/img]\n";
-               elseif (($footer == "") && ($picture == ""))
+               if (($footer == "") && ($picture != "")) {
+                       $body .= "\n\n[img]" . $picture . "[/img]\n";
+               } elseif (($footer == "") && ($picture == "")) {
                        $body = add_page_info_to_body($body);
                }
        }
@@ -1230,6 +1241,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                        if (strpos($tag, '#') === 0) {
                                if (strpos($tag, '[url=')) {
                                        continue;
+                               }
 
                                // don't link tags that are already embedded in links
                                if (preg_match('/\[(.*?)' . preg_quote($tag, '/') . '(.*?)\]/', $body)) {
@@ -1269,10 +1281,10 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
  *
  * @return $picture string Image URL or empty string
  */
-function twitter_media_entities($post, &$postarray) {
-
+function twitter_media_entities($post, array &$postarray)
+{
        // There are no media entities? So we quit.
-       if (!is_array($post->extended_entities->media)) {
+       if (empty($post->extended_entities->media)) {
                return "";
        }
 
@@ -1280,7 +1292,7 @@ function twitter_media_entities($post, &$postarray) {
        // We only do this when there is exactly one media.
        if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
                $picture = "";
-               foreach($post->extended_entities->media AS $medium) {
+               foreach ($post->extended_entities->media AS $medium) {
                        if (isset($medium->media_url_https)) {
                                $picture = $medium->media_url_https;
                                $postarray['body'] = str_replace($medium->url, "", $postarray['body']);
@@ -1290,23 +1302,26 @@ function twitter_media_entities($post, &$postarray) {
        }
 
        // This is a pure media post, first search for all media urls
-       $media = array();
-       foreach($post->extended_entities->media AS $medium) {
-               switch($medium->type) {
+       $media = [];
+       foreach ($post->extended_entities->media AS $medium) {
+               if (!isset($media[$medium->url])) {
+                       $media[$medium->url] = '';
+               }
+               switch ($medium->type) {
                        case 'photo':
-                               $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+                               $media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
                                $postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
                                break;
                        case 'video':
                        case 'animated_gif':
-                               $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+                               $media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
                                $postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
                                if (is_array($medium->video_info->variants)) {
                                        $bitrate = 0;
                                        // We take the video with the highest bitrate
                                        foreach ($medium->video_info->variants AS $variant) {
                                                if (($variant->content_type == "video/mp4") && ($variant->bitrate >= $bitrate)) {
-                                                       $media[$medium->url] = "\n[video]".$variant->url."[/video]";
+                                                       $media[$medium->url] = "\n[video]" . $variant->url . "[/video]";
                                                        $bitrate = $variant->bitrate;
                                                }
                                        }
@@ -1320,80 +1335,65 @@ function twitter_media_entities($post, &$postarray) {
 
        // Now we replace the media urls.
        foreach ($media AS $key => $value) {
-               $postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']);
+               $postarray['body'] = str_replace($key, "\n" . $value . "\n", $postarray['body']);
        }
        return "";
 }
 
-function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) {
-
-       $postarray = array();
+function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $only_existing_contact, $noquote)
+{
+       $postarray = [];
        $postarray['network'] = NETWORK_TWITTER;
-       $postarray['gravity'] = 0;
        $postarray['uid'] = $uid;
        $postarray['wall'] = 0;
-       $postarray['uri'] = "twitter::".$post->id_str;
-       $postarray['object'] = json_encode($post);
+       $postarray['uri'] = "twitter::" . $post->id_str;
+       $postarray['protocol'] = Conversation::PARCEL_TWITTER;
+       $postarray['source'] = json_encode($post);
 
        // Don't import our own comments
-       $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
-               dbesc($postarray['uri']),
-               intval($uid)
-       );
-
-       if (count($r)) {
-               logger("Item with extid ".$postarray['uri']." found.", LOGGER_DEBUG);
-               return(array());
+       if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
+               logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
+               return [];
        }
 
        $contactid = 0;
 
        if ($post->in_reply_to_status_id_str != "") {
+               $parent = "twitter::" . $post->in_reply_to_status_id_str;
 
-               $parent = "twitter::".$post->in_reply_to_status_id_str;
+               $fields = ['uri', 'parent-uri', 'parent'];
+               $parent_item = Item::selectFirst($fields, ['uri' => $parent, 'uid' => $uid]);
+               if (!DBA::isResult($parent_item)) {
+                       $parent_item = Item::selectFirst($fields, ['extid' => $parent, 'uid' => $uid]);
+               }
 
-               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc($parent),
-                       intval($uid)
-               );
-               if (count($r)) {
-                       $postarray['thr-parent'] = $r[0]["uri"];
-                       $postarray['parent-uri'] = $r[0]["parent-uri"];
-                       $postarray['parent'] = $r[0]["parent"];
+               if (DBA::isResult($parent_item)) {
+                       $postarray['thr-parent'] = $parent_item['uri'];
+                       $postarray['parent-uri'] = $parent_item['parent-uri'];
+                       $postarray['parent'] = $parent_item['parent'];
                        $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
                } else {
-                       $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
-                               dbesc($parent),
-                               intval($uid)
-                       );
-                       if (count($r)) {
-                               $postarray['thr-parent'] = $r[0]['uri'];
-                               $postarray['parent-uri'] = $r[0]['parent-uri'];
-                               $postarray['parent'] = $r[0]['parent'];
-                               $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
-                       } else {
-                               $postarray['thr-parent'] = $postarray['uri'];
-                               $postarray['parent-uri'] = $postarray['uri'];
-                               $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
-                       }
+                       $postarray['thr-parent'] = $postarray['uri'];
+                       $postarray['parent-uri'] = $postarray['uri'];
+                       $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
                }
 
                // Is it me?
-               $own_id = get_pconfig($uid, 'twitter', 'own_id');
+               $own_id = PConfig::get($uid, 'twitter', 'own_id');
 
                if ($post->user->id_str == $own_id) {
                        $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                                intval($uid));
 
-                       if(count($r)) {
+                       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']   = $r[0]["name"];
+                               $postarray['owner-link']   = $r[0]["url"];
+                               $postarray['owner-avatar'] = $r[0]["photo"];
                        } else {
-                               logger("No self contact for user ".$uid, LOGGER_DEBUG);
-                               return(array());
+                               logger("No self contact for user " . $uid, LOGGER_DEBUG);
+                               return [];
                        }
                }
                // Don't create accounts of people who just comment something
@@ -1407,15 +1407,15 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $contactid = twitter_fetch_contact($uid, $post->user, $create_user);
 
                $postarray['owner-name'] = $post->user->name;
-               $postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
+               $postarray['owner-link'] = "https://twitter.com/" . $post->user->screen_name;
                $postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
        }
 
-       if(($contactid == 0) && !$only_existing_contact) {
+       if (($contactid == 0) && !$only_existing_contact) {
                $contactid = $self['id'];
        } elseif ($contactid <= 0) {
                logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
-               return(array());
+               return [];
        }
 
        $postarray['contact-id'] = $contactid;
@@ -1424,12 +1424,15 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
        $postarray['author-name'] = $postarray['owner-name'];
        $postarray['author-link'] = $postarray['owner-link'];
        $postarray['author-avatar'] = $postarray['owner-avatar'];
-       $postarray['plink'] = "https://twitter.com/".$post->user->screen_name."/status/".$post->id_str;
+       $postarray['plink'] = "https://twitter.com/" . $post->user->screen_name . "/status/" . $post->id_str;
        $postarray['app'] = strip_tags($post->source);
 
        if ($post->user->protected) {
                $postarray['private'] = 1;
                $postarray['allow_cid'] = '<' . $self['id'] . '>';
+       } else {
+               $postarray['private'] = 0;
+               $postarray['allow_cid'] = '';
        }
 
        if (is_string($post->full_text)) {
@@ -1454,22 +1457,22 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
        $statustext = $converted["plain"];
 
-       if (is_string($post->place->name)) {
+       if (!empty($post->place->name)) {
                $postarray["location"] = $post->place->name;
        }
-       if (is_string($post->place->full_name)) {
+       if (!empty($post->place->full_name)) {
                $postarray["location"] = $post->place->full_name;
        }
-       if (is_array($post->geo->coordinates)) {
-               $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+       if (!empty($post->geo->coordinates)) {
+               $postarray["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
        }
-       if (is_array($post->coordinates->coordinates)) {
-               $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+       if (!empty($post->coordinates->coordinates)) {
+               $postarray["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
        }
-       if (is_object($post->retweeted_status)) {
+       if (!empty($post->retweeted_status)) {
                $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
 
-               $retweet['object'] = $postarray['object'];
+               $retweet['source'] = $postarray['source'];
                $retweet['private'] = $postarray['private'];
                $retweet['allow_cid'] = $postarray['allow_cid'];
                $retweet['contact-id'] = $postarray['contact-id'];
@@ -1480,7 +1483,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray = $retweet;
        }
 
-       if (is_object($post->quoted_status) && !$noquote) {
+       if (!empty($post->quoted_status) && !$noquote) {
                $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
                $postarray['body'] = $statustext;
@@ -1494,207 +1497,159 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                        $quoted['plink']
                );
 
-               $postarray['body'] .= $quoted['body'].'[/share]';
+               $postarray['body'] .= $quoted['body'] . '[/share]';
        }
 
-       return($postarray);
+       return $postarray;
 }
 
-function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
-
-       // this whole function doesn't seem to work. Needs complete check
-
-       $user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
-               intval($uid)
-       );
-
-       if(!count($user))
-               return;
-
-       // Is it me?
-       if (link_compare($user[0]["url"], $postarray['author-link']))
-               return;
-
-       $own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-               intval($uid),
-               dbesc("twitter::".$own_id)
-       );
-
-       if(!count($own_user))
-               return;
-
-       // Is it me from twitter?
-       if (link_compare($own_user[0]["url"], $postarray['author-link']))
-               return;
-
-       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
-               dbesc($postarray['parent-uri']),
-               intval($uid)
-       );
+function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, array $self)
+{
+       logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
 
-               foreach($myconv as $conv) {
-                       // now if we find a match, it means we're in this conversation
+       $posts = [];
 
-                       if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
-                               continue;
+       while ($post->in_reply_to_status_id_str != "") {
+               $parameters = ["trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str];
 
-                       require_once('include/enotify.php');
-
-                       $conv_parent = $conv['parent'];
-
-                       notification(array(
-                               'type'         => NOTIFY_COMMENT,
-                               'notify_flags' => $user[0]['notify-flags'],
-                               'language' => $user[0]['language'],
-                               'to_name' => $user[0]['username'],
-                               'to_email' => $user[0]['email'],
-                               'uid' => $user[0]['uid'],
-                               'item' => $postarray,
-                               'link' => $a->get_baseurl() . '/display/' . urlencode(Item::getGuidById($top_item)),
-                               'source_name' => $postarray['author-name'],
-                               'source_link' => $postarray['author-link'],
-                               'source_photo' => $postarray['author-avatar'],
-                               'verb'         => ACTIVITY_POST,
-                               'otype'        => 'item',
-                               'parent'       => $conv_parent,
-                       ));
-
-                       // only send one notification
+               try {
+                       $post = $connection->get('statuses/show', $parameters);
+               } catch (TwitterOAuthException $e) {
+                       logger('twitter_fetchparentposts: Error fetching for user ' . $uid . ' and post ' . $post->id_str . ': ' . $e->getMessage());
                        break;
                }
-       }
-}
-
-function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) {
-       logger("twitter_fetchparentposts: Fetching for user ".$uid." and post ".$post->id_str, LOGGER_DEBUG);
-
-       $posts = array();
 
-       while ($post->in_reply_to_status_id_str != "") {
-               $parameters = array("trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str);
-
-               $post = $connection->get('statuses/show', $parameters);
-
-               if (!count($post)) {
-                       logger("twitter_fetchparentposts: Can't fetch post ".$parameters->id, LOGGER_DEBUG);
+               if (empty($post)) {
+                       logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
                        break;
                }
 
-               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc("twitter::".$post->id_str),
-                       intval($uid)
-               );
+               if (empty($post->id_str)) {
+                       logger("twitter_fetchparentposts: This is not a post " . json_encode($post), LOGGER_DEBUG);
+                       break;
+               }
 
-               if (count($r))
+               if (DBA::exists('item', ['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) {
                        break;
+               }
 
                $posts[] = $post;
        }
 
-       logger("twitter_fetchparentposts: Fetching ".count($posts)." parents", LOGGER_DEBUG);
+       logger("twitter_fetchparentposts: Fetching " . count($posts) . " parents", LOGGER_DEBUG);
 
        $posts = array_reverse($posts);
 
-       if (count($posts)) {
+       if (!empty($posts)) {
                foreach ($posts as $post) {
                        $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
 
-                       if (trim($postarray['body']) == "") {
+                       if (empty($postarray['body'])) {
                                continue;
                        }
 
                        $item = Item::insert($postarray);
-                       $postarray["id"] = $item;
 
-                       logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item);
+                       $postarray["id"] = $item;
 
-                       if ($item && !function_exists("check_item_notification"))
-                               twitter_checknotification($a, $uid, $own_id, $item, $postarray);
+                       logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
                }
        }
 }
 
-function twitter_fetchhometimeline($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
-       $create_user = get_pconfig($uid, 'twitter', 'create_user');
-       $mirror_posts = get_pconfig($uid, 'twitter', 'mirror_posts');
+function twitter_fetchhometimeline(App $a, $uid)
+{
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+       $create_user = PConfig::get($uid, 'twitter', 'create_user');
+       $mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
 
-       logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
+       logger("twitter_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
 
-       $application_name  = get_config('twitter', 'application_name');
+       $application_name = Config::get('twitter', 'application_name');
 
-       if ($application_name == "")
+       if ($application_name == "") {
                $application_name = $a->get_hostname();
+       }
 
        require_once 'include/items.php';
 
-       $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+       $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-       $own_contact = twitter_fetch_own_contact($a, $uid);
+       try {
+               $own_contact = twitter_fetch_own_contact($a, $uid);
+       } catch (TwitterOAuthException $e) {
+               logger('twitter_fetchhometimeline: Error fetching own contact for user ' . $uid . ': ' . $e->getMessage());
+               return;
+       }
 
        $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($own_contact),
                intval($uid));
 
-       if(count($r)) {
+       if (DBA::isResult($r)) {
                $own_id = $r[0]["nick"];
        } else {
-               logger("twitter_fetchhometimeline: Own twitter contact not found for user ".$uid, LOGGER_DEBUG);
+               logger("twitter_fetchhometimeline: Own twitter contact not found for user " . $uid, LOGGER_DEBUG);
                return;
        }
 
        $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                intval($uid));
 
-       if(count($r)) {
+       if (DBA::isResult($r)) {
                $self = $r[0];
        } else {
-               logger("twitter_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
+               logger("twitter_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
                return;
        }
 
        $u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
                intval($uid));
-       if(!count($u)) {
-               logger("twitter_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
+       if (!DBA::isResult($u)) {
+               logger("twitter_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
                return;
        }
 
-       $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
+       $parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"];
        //$parameters["count"] = 200;
-
-
        // Fetching timeline
-       $lastid  = get_pconfig($uid, 'twitter', 'lasthometimelineid');
+       $lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
 
        $first_time = ($lastid == "");
 
-       if ($lastid <> "")
+       if ($lastid != "") {
                $parameters["since_id"] = $lastid;
+       }
 
-       $items = $connection->get('statuses/home_timeline', $parameters);
+       try {
+               $items = $connection->get('statuses/home_timeline', $parameters);
+       } catch (TwitterOAuthException $e) {
+               logger('twitter_fetchhometimeline: Error fetching home timeline: ' . $e->getMessage());
+               return;
+       }
 
        if (!is_array($items)) {
-               logger("twitter_fetchhometimeline: Error fetching home timeline: ".print_r($items, true), LOGGER_DEBUG);
+               logger("twitter_fetchhometimeline: Error fetching home timeline: " . print_r($items, true), LOGGER_DEBUG);
                return;
        }
 
        $posts = array_reverse($items);
 
-       logger("twitter_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+       logger("twitter_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
        if (count($posts)) {
                foreach ($posts as $post) {
                        if ($post->id_str > $lastid) {
                                $lastid = $post->id_str;
-                               set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+                               PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
                        }
 
-                       if ($first_time)
+                       if ($first_time) {
                                continue;
+                       }
 
                        if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
                                logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG);
@@ -1706,117 +1661,95 @@ function twitter_fetchhometimeline($a, $uid) {
                                continue;
                        }
 
-                       if ($post->in_reply_to_status_id_str != "")
-                               twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+                       if ($post->in_reply_to_status_id_str != "") {
+                               twitter_fetchparentposts($a, $uid, $post, $connection, $self);
+                       }
 
                        $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
 
-                       if (trim($postarray['body']) == "")
+                       if (empty($postarray['body']) || trim($postarray['body']) == "") {
                                continue;
+                       }
 
-                       $item = Item::insert($postarray);
-                       $postarray["id"] = $item;
+                       $notify = false;
 
-                       logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+                       if ($postarray['uri'] == $postarray['parent-uri']) {
+                               $contact = DBA::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]);
+                               if (DBA::isResult($contact)) {
+                                       $notify = Item::isRemoteSelf($contact, $postarray);
+                               }
+                       }
 
-                       if ($item && !function_exists("check_item_notification"))
-                               twitter_checknotification($a, $uid, $own_id, $item, $postarray);
+                       $item = Item::insert($postarray, false, $notify);
+                       $postarray["id"] = $item;
 
+                       logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
                }
        }
-       set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+       PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
 
        // Fetching mentions
-       $lastid  = get_pconfig($uid, 'twitter', 'lastmentionid');
+       $lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
 
        $first_time = ($lastid == "");
 
-       if ($lastid <> "")
+       if ($lastid != "") {
                $parameters["since_id"] = $lastid;
+       }
 
-       $items = $connection->get('statuses/mentions_timeline', $parameters);
+       try {
+               $items = $connection->get('statuses/mentions_timeline', $parameters);
+       } catch (TwitterOAuthException $e) {
+               logger('twitter_fetchhometimeline: Error fetching mentions: ' . $e->getMessage());
+               return;
+       }
 
        if (!is_array($items)) {
-               logger("twitter_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
+               logger("twitter_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
                return;
        }
 
        $posts = array_reverse($items);
 
-       logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+       logger("twitter_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
        if (count($posts)) {
                foreach ($posts as $post) {
-                       if ($post->id_str > $lastid)
+                       if ($post->id_str > $lastid) {
                                $lastid = $post->id_str;
+                       }
 
-                       if ($first_time)
+                       if ($first_time) {
                                continue;
+                       }
 
-                       if ($post->in_reply_to_status_id_str != "")
-                               twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+                       if ($post->in_reply_to_status_id_str != "") {
+                               twitter_fetchparentposts($a, $uid, $post, $connection, $self);
+                       }
 
                        $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
 
-                       if (trim($postarray['body']) == "")
+                       if (trim($postarray['body']) == "") {
                                continue;
+                       }
 
                        $item = Item::insert($postarray);
-                       $postarray["id"] = $item;
 
-                       if ($item && function_exists("check_item_notification"))
-                               check_item_notification($item, $uid, NOTIFY_TAGSELF);
-
-                       if (!isset($postarray["parent"]) || ($postarray["parent"] == 0))
-                               $postarray["parent"] = $item;
-
-                       logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
-
-                       if ($item == 0) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($postarray['uri']),
-                                       intval($uid)
-                               );
-                               if (count($r)) {
-                                       $item = $r[0]['id'];
-                                       $parent_id = $r[0]['parent'];
-                               }
-                       } else {
-                               $parent_id = $postarray['parent'];
-                       }
-
-                       if (($item != 0) && !function_exists("check_item_notification")) {
-                               require_once('include/enotify.php');
-                               notification(array(
-                                       'type'         => NOTIFY_TAGSELF,
-                                       'notify_flags' => $u[0]['notify-flags'],
-                                       'language'     => $u[0]['language'],
-                                       'to_name'      => $u[0]['username'],
-                                       'to_email'     => $u[0]['email'],
-                                       'uid'          => $u[0]['uid'],
-                                       'item'         => $postarray,
-                                       'link'         => $a->get_baseurl() . '/display/' . urlencode(Item::getGuidById($item)),
-                                       'source_name'  => $postarray['author-name'],
-                                       'source_link'  => $postarray['author-link'],
-                                       'source_photo' => $postarray['author-avatar'],
-                                       'verb'         => ACTIVITY_TAG,
-                                       'otype'        => 'item',
-                                       'parent'       => $parent_id
-                               ));
-                       }
+                       logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
                }
        }
 
-       set_pconfig($uid, 'twitter', 'lastmentionid', $lastid);
+       PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
 }
 
-function twitter_fetch_own_contact($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+function twitter_fetch_own_contact(App $a, $uid)
+{
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-       $own_id = get_pconfig($uid, 'twitter', 'own_id');
+       $own_id = PConfig::get($uid, 'twitter', 'own_id');
 
        $contact_id = 0;
 
@@ -1824,67 +1757,74 @@ function twitter_fetch_own_contact($a, $uid) {
                $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
                // Fetching user data
+               // get() may throw TwitterOAuthException, but we will catch it later
                $user = $connection->get('account/verify_credentials');
 
-               set_pconfig($uid, 'twitter', 'own_id', $user->id_str);
+               PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
 
                $contact_id = twitter_fetch_contact($uid, $user, true);
-
        } else {
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-                       intval($uid), dbesc("twitter::".$own_id));
-               if(count($r))
+                       intval($uid),
+                       DBA::escape("twitter::" . $own_id));
+               if (DBA::isResult($r)) {
                        $contact_id = $r[0]["id"];
-               else
-                       del_pconfig($uid, 'twitter', 'own_id');
-
+               } else {
+                       PConfig::delete($uid, 'twitter', 'own_id');
+               }
        }
 
-       return($contact_id);
+       return $contact_id;
 }
 
-function twitter_is_retweet($a, $uid, $body) {
+function twitter_is_retweet(App $a, $uid, $body)
+{
        $body = trim($body);
 
        // Skip if it isn't a pure repeated messages
        // Does it start with a share?
-       if (strpos($body, "[share") > 0)
-               return(false);
+       if (strpos($body, "[share") > 0) {
+               return false;
+       }
 
        // Does it end with a share?
-       if (strlen($body) > (strrpos($body, "[/share]") + 8))
-               return(false);
+       if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+               return false;
+       }
 
-       $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+       $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
        // Skip if there is no shared message in there
-       if ($body == $attributes)
-               return(false);
+       if ($body == $attributes) {
+               return false;
+       }
 
        $link = "";
        preg_match("/link='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "")
+       if (!empty($matches[1])) {
                $link = $matches[1];
+       }
 
        preg_match('/link="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "")
+       if (!empty($matches[1])) {
                $link = $matches[1];
+       }
 
        $id = preg_replace("=https?://twitter.com/(.*)/status/(.*)=ism", "$2", $link);
-       if ($id == $link)
-               return(false);
+       if ($id == $link) {
+               return false;
+       }
 
-       logger('twitter_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
+       logger('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
 
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
        $result = $connection->post('statuses/retweet/' . $id);
 
-       logger('twitter_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
+       logger('twitter_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
 
-       return(!isset($result->errors));
+       return !isset($result->errors);
 }
-?>