X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=166c99ef907fc560968a2181f276eccf7085a719;hb=02fdb7c6542bb5ad8b7e524cf98fef9571f48379;hp=7f37bcaae8f9edf06bd4a9e7f95fa3efacb7f9a6;hpb=e7148d528cacd684fe8e5d0702da241310878bfd;p=friendica-addons.git diff --git a/twitter/twitter.php b/twitter/twitter.php index 7f37bcaa..166c99ef 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -68,8 +68,8 @@ 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\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; @@ -83,9 +83,9 @@ use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\ItemContent; -use Friendica\Model\Queue; use Friendica\Model\User; use Friendica\Object\Image; +use Friendica\Util\Config\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -97,47 +97,45 @@ define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes function twitter_install() { // we need some hooks, for the configuration and for sending tweets - 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('hook_fork' , __FILE__, 'twitter_hook_fork'); - 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'); + Hook::register('load_config' , __FILE__, 'twitter_load_config'); + Hook::register('connector_settings' , __FILE__, 'twitter_settings'); + Hook::register('connector_settings_post', __FILE__, 'twitter_settings_post'); + Hook::register('hook_fork' , __FILE__, 'twitter_hook_fork'); + Hook::register('post_local' , __FILE__, 'twitter_post_local'); + Hook::register('notifier_normal' , __FILE__, 'twitter_post_hook'); + Hook::register('jot_networks' , __FILE__, 'twitter_jot_nets'); + Hook::register('cron' , __FILE__, 'twitter_cron'); + Hook::register('follow' , __FILE__, 'twitter_follow'); + Hook::register('expire' , __FILE__, 'twitter_expire'); + Hook::register('prepare_body' , __FILE__, 'twitter_prepare_body'); + Hook::register('check_item_notification', __FILE__, 'twitter_check_item_notification'); Logger::log("installed twitter"); } function twitter_uninstall() { - 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('hook_fork' , __FILE__, 'twitter_hook_fork'); - 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'); + Hook::unregister('load_config' , __FILE__, 'twitter_load_config'); + Hook::unregister('connector_settings' , __FILE__, 'twitter_settings'); + Hook::unregister('connector_settings_post', __FILE__, 'twitter_settings_post'); + Hook::unregister('hook_fork' , __FILE__, 'twitter_hook_fork'); + Hook::unregister('post_local' , __FILE__, 'twitter_post_local'); + Hook::unregister('notifier_normal' , __FILE__, 'twitter_post_hook'); + Hook::unregister('jot_networks' , __FILE__, 'twitter_jot_nets'); + Hook::unregister('cron' , __FILE__, 'twitter_cron'); + Hook::unregister('follow' , __FILE__, 'twitter_follow'); + Hook::unregister('expire' , __FILE__, 'twitter_expire'); + Hook::unregister('prepare_body' , __FILE__, 'twitter_prepare_body'); + Hook::unregister('check_item_notification', __FILE__, 'twitter_check_item_notification'); // old setting - remove only - 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'); + Hook::unregister('post_local_end' , __FILE__, 'twitter_post_hook'); + Hook::unregister('addon_settings' , __FILE__, 'twitter_settings'); + Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post'); } -function twitter_load_config(App $a) +function twitter_load_config(App $a, ConfigFileLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/twitter.config.php'); + $a->getConfigCache()->load($loader->loadAddonConfig('twitter')); } function twitter_check_item_notification(App $a, array &$notification_data) @@ -193,21 +191,25 @@ function twitter_follow(App $a, array &$contact) } } -function twitter_jot_nets(App $a, &$b) +function twitter_jot_nets(App $a, array &$jotnets_fields) { if (!local_user()) { return; } - $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 .= '
' - . L10n::t('Post to Twitter') . '
'; + if (PConfig::get(local_user(), 'twitter', 'post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'twitter_enable', + L10n::t('Post to Twitter'), + PConfig::get(local_user(), 'twitter', 'post_by_default') + ] + ]; } } + function twitter_settings_post(App $a) { if (!local_user()) { @@ -679,16 +681,7 @@ function twitter_post_hook(App $a, array &$b) if (!empty($result->errors)) { Logger::log('Send to Twitter failed: "' . print_r($result->errors, true) . '"'); - - $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]); - - Queue::add($a->contact, Protocol::TWITTER, $s); - notice(L10n::t('Twitter post failed. Queued for retry.') . EOL); + Worker::defer(); } elseif ($iscomment) { Logger::log('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]); @@ -739,7 +732,7 @@ function twitter_cron(App $a) if (DBA::isResult($r)) { foreach ($r as $rr) { Logger::log('twitter: fetching for user ' . $rr['uid']); - Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']); + Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']); } } @@ -762,7 +755,7 @@ function twitter_cron(App $a) } Logger::log('twitter: importing timeline from user ' . $rr['uid']); - Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']); + Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']); /* // To-Do // check for new contacts once a day @@ -821,7 +814,7 @@ function twitter_prepare_body(App $a, array &$b) if ($b["preview"]) { $max_char = 280; $item = $b["item"]; - $item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"]; + $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"]; $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; $orig_post = Item::selectFirst(['author-link'], $condition); @@ -989,66 +982,6 @@ function twitter_fetchtimeline(App $a, $uid) Logger::log('Last ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG); } -function twitter_queue_hook(App $a) -{ - $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", - DBA::escape(Protocol::TWITTER) - ); - if (!DBA::isResult($qi)) { - return; - } - - foreach ($qi as $x) { - if ($x['network'] !== Protocol::TWITTER) { - continue; - } - - Logger::log('twitter_queue: run'); - - $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` - WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", - intval($x['cid']) - ); - if (!DBA::isResult($r)) { - continue; - } - - $user = $r[0]; - - $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::log('twitter_queue: able to post'); - - $z = unserialize($x['content']); - - $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); - $result = $connection->post($z['url'], $z['post']); - - Logger::log('twitter_queue: post result: ' . print_r($result, true), Logger::DEBUG); - - if ($result->errors) { - Logger::log('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"'); - } else { - $success = true; - Queue::removeItem($x['id']); - } - } else { - Logger::log("twitter_queue: Error getting tokens for user " . $user['uid']); - } - - if (!$success) { - Logger::log('twitter_queue: delayed'); - Queue::updateTime($x['id']); - } - } -} - function twitter_fix_avatar($avatar) { $new_avatar = str_replace("_normal.", ".", $avatar); @@ -1221,9 +1154,11 @@ function twitter_expand_entities(App $a, $body, $item, $picture) continue; } - $expanded_url = Network::finalUrl($url->expanded_url); + $expanded_url = $url->expanded_url; + + $final_url = Network::finalUrl($url->expanded_url); - $oembed_data = OEmbed::fetchURL($expanded_url); + $oembed_data = OEmbed::fetchURL($final_url); if (empty($oembed_data) || empty($oembed_data->type)) { continue; @@ -1249,7 +1184,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) } elseif ($oembed_data->type != 'link') { $body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body); } else { - $img_str = Network::fetchUrl($expanded_url, true, $redirects, 4); + $img_str = Network::fetchUrl($final_url, true, $redirects, 4); $tempfile = tempnam(get_temppath(), 'cache'); file_put_contents($tempfile, $img_str); @@ -1265,7 +1200,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) if (substr($mime, 0, 6) == 'image/') { $type = 'photo'; - $body = str_replace($url->url, '[img]' . $expanded_url . '[/img]', $body); + $body = str_replace($url->url, '[img]' . $final_url . '[/img]', $body); } else { $type = $oembed_data->type; $footerurl = $expanded_url; @@ -1551,15 +1486,28 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl return []; } - $retweet['source'] = $postarray['source']; - $retweet['private'] = $postarray['private']; - $retweet['allow_cid'] = $postarray['allow_cid']; - $retweet['contact-id'] = $postarray['contact-id']; - $retweet['owner-name'] = $postarray['owner-name']; - $retweet['owner-link'] = $postarray['owner-link']; - $retweet['owner-avatar'] = $postarray['owner-avatar']; + if (!$noquote) { + // Store the original tweet + Item::insert($retweet); - $postarray = $retweet; + // CHange the other post into a reshare activity + $postarray['verb'] = ACTIVITY2_ANNOUNCE; + $postarray['gravity'] = GRAVITY_ACTIVITY; + $postarray['object-type'] = ACTIVITY_OBJ_NOTE; + + $postarray['thr-parent'] = $retweet['uri']; + $postarray['parent-uri'] = $retweet['uri']; + } else { + $retweet['source'] = $postarray['source']; + $retweet['private'] = $postarray['private']; + $retweet['allow_cid'] = $postarray['allow_cid']; + $retweet['contact-id'] = $postarray['contact-id']; + $retweet['owner-name'] = $postarray['owner-name']; + $retweet['owner-link'] = $postarray['owner-link']; + $retweet['owner-avatar'] = $postarray['owner-avatar']; + + $postarray = $retweet; + } } if (!empty($post->quoted_status) && !$noquote) {