Modified: trunk/Websites/webkit.org/wp-content/plugins/tweet-listener.php (213739 => 213740)
--- trunk/Websites/webkit.org/wp-content/plugins/tweet-listener.php 2017-03-11 00:59:39 UTC (rev 213739)
+++ trunk/Websites/webkit.org/wp-content/plugins/tweet-listener.php 2017-03-11 01:01:19 UTC (rev 213740)
@@ -12,7 +12,7 @@
class TweetListener {
private static $object = null;
-
+
const AUTH_TOKEN = TWITTER_LISTENER_AUTH;
const DATA_KEY = 'recent_tweet';
@@ -28,9 +28,12 @@
}
public function listen() {
-
+
+ if (!isset($_POST['token']) || $_POST['token'] != TWITTER_LISTENER_AUTH)
+ wp_die();
+
$defaults = array(
- 'text' => '',
+ 'text' => '',
'username' => '@webkit',
'link' => '',
'created' => '',
@@ -41,10 +44,10 @@
update_option(self::DATA_KEY, $data);
wp_die();
}
-
+
public function tweet() {
$data = ""
-
+
// Setup compatible Tweet structure
$Tweet = new StdClass();
@@ -64,7 +67,7 @@
$Tweet->entities->urls[] = $URL;
}
}
-
+
return $Tweet;
}
Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php (213739 => 213740)
--- trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php 2017-03-11 00:59:39 UTC (rev 213739)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php 2017-03-11 01:01:19 UTC (rev 213740)
@@ -11,6 +11,7 @@
class WebKitTwitterTileWidget extends WebKitPostTileWidget {
const CACHEKEY = 'webkit_twitter_feed';
+ const ENDPOINT = 'https://api.twitter.com/1.1/statuses/user_timeline.json';
function __construct() {
parent::WP_Widget(false,
@@ -30,35 +31,31 @@
if ( empty($Tweet) || empty($Tweet->text) )
return $this->follow_markup($options);
- // Show "Follow @webkit" instead of tweet for blog URLs
- if ( ! empty($Tweet->entities)
- && ! empty($Tweet->entities->urls)
- && count($Tweet->entities->urls) == 1
- && preg_match('!webkit.org/blog/\d+/!', $Tweet->entities->urls[0]->expanded_url) == 1)
- return $this->follow_markup($options);
-
$classes = array('tile', 'third-tile', 'twitter-tile');
-
$text = (string)$options['text'];
+ $link = "https://twitter.com/webkit/status/$Tweet->id";
if ( ! empty($Tweet->text) )
$text = $Tweet->text;
- if ( ! empty($options['url']) )
- $url = ""
-
// Expand URLs
foreach ( $Tweet->entities->urls as $entry ) {
$expanded = '<a href="" . esc_url($entry->expanded_url) . '">'
. $entry->display_url . '</a>';
+
+ // Don't show webkit.org links, just change the tile to use the link in the tweet
+ if ( preg_match('!webkit.org/.+?!', $entry->expanded_url) == 1 ) {
+ $expanded = '';
+ $link = $entry->expanded_url;
+ }
+
$text = str_replace($entry->url, $expanded, $text);
}
$text = preg_replace('/RT @[^:]+:\s+/', '', $text, 1);
+ if ( ! ( empty($Tweet->entities) || empty($Tweet->entities->media) ) ) {
+ $Image = $Tweet->entities->media[0];
- if ( empty($Tweet->entities) || empty($Tweet->entities->media) ) {
-
- $Image = $Tweet->entities->media[0];
if ( empty($Image) ) $classes[] = 'text-only';
// Strip media links
@@ -65,11 +62,13 @@
foreach ( $Tweet->entities->media as $entry ) {
$text = str_replace($entry->url, '', $text);
}
+ } else {
+ $classes[] = 'text-only';
}
?>
<div class="<?php echo esc_attr(join(' ', $classes)); ?>">
- <a href="" echo esc_attr($Tweet->id); ?>" class="tile-link">Clickable link to tweet</a>
+ <a href="" echo esc_url($link); ?>" class="tile-link">Clickable link to tweet</a>
<div class="tile-content">
<?php if ( ! empty($Image) ): ?>
<img src="" echo esc_url($Image->media_url_https); ?>">
@@ -79,7 +78,7 @@
</div>
<ul class="twitter-controls">
- <li><a href="" target="twitter-modal"><span class="twitter-icon">Twitter</span> @webkit</a></li>
+ <li><a href="" target="twitter-modal"><span class="twitter-icon">Twitter</span>@webkit</a></li>
<li><a href="" echo esc_attr($Tweet->id); ?>" class="twitter-icon reply-icon" target="twitter-modal">Reply</a></li>
<li><a href="" echo esc_attr($Tweet->id); ?>" class="twitter-icon retweet-icon" target="twitter-modal">Retweet</a></li>
<li><a href="" echo esc_attr($Tweet->id); ?>" class="twitter-icon favorite-icon" target="twitter-modal">Favorite</a></li>
@@ -111,52 +110,45 @@
function tweet () {
- // Prefer pushed tweet
+ if ( false !== ( $cached = get_transient(self::CACHEKEY) ) )
+ return json_decode($cached);
+
+ // Get pushed Tweet as a fallback
+ $pushedTweet = false;
if ( class_exists('TweetListener') ) {
$TweetListener = TweetListener::object();
- return $TweetListener->tweet();
+ $pushedTweet = $TweetListener->tweet();
}
- // Poll for tweet
- if ( false !== ( $cached = get_transient(self::CACHEKEY) ) )
- return json_decode($cached);
-
- $endpoint = 'https://api.twitter.com/1.1/statuses/user_timeline.json';
+ // Connect to Twitter API
$parameters = array();
$options = array(
'method' => 'GET',
);
- $oauth_consumer_key = 'ypSvRp37vmyt3ldMPhs0e62c9';
- $oauth_consumer_key_secret = 'mLuYD3AjUehUZKOgQIICA5Na69te45aSJTkdIDTGSg4cfHd6Lz';
- $oauth_token = '14315023-7pHbcI5bk2QZhNiHR9uFudaksBzMPubEuOEmYj7YQ';
- $oauth_token_secret = '0K9T9znxG4S9PUGunYZ5LwyKL9AR6v3eAXp6WKY2oi7Bg';
+ list($oauth_consumer_key, $oauth_consumer_key_secret) = explode(':', TWITTER_CONSUMER_KEY);
+ list($oauth_token, $oauth_token_secret) = explode(':', TWITTER_OAUTH_TOKEN);
$oauth_timestamp = time();
$oauth_nonce = sha1(rand() . $oauth_timestamp);
$fields = array(
'oauth_consumer_key' => $oauth_consumer_key,
- 'oauth_nonce' => sha1(rand() . time()),
+ 'oauth_nonce' => $oauth_nonce,
'oauth_signature_method' => 'HMAC-SHA1',
- 'oauth_timestamp' => time(),
+ 'oauth_timestamp' => $oauth_timestamp,
'oauth_token' => $oauth_token,
'oauth_version' => '1.0',
);
$fields = array_merge($parameters, $fields);
- $base = array(
- 'GET', $endpoint, http_build_query($fields, '', '&')
- );
- $base = join('&', array_map('rawurlencode', $base));
+ $requestParts = array('GET', self::ENDPOINT, http_build_query($fields, '', '&'));
+ $request = join('&', array_map('rawurlencode', $requestParts));
+ $authkeys = array($oauth_consumer_key_secret, $oauth_token_secret);
+ $auth = join('&', array_map('rawurlencode', $authkeys));
- $key = array(
- $oauth_consumer_key_secret, $oauth_token_secret
- );
- $key = join('&', array_map('rawurlencode', $key));
+ $signature = base64_encode( hash_hmac('sha1', $request, $auth, true) );
- $signature = base64_encode( hash_hmac('sha1', $base, $key, true) );
-
$oauth = array(
'oauth_consumer_key' => $oauth_consumer_key,
'oauth_nonce' => $fields['oauth_nonce'],
@@ -166,8 +158,9 @@
'oauth_token' => $oauth_token,
'oauth_version' => '1.0',
);
+
+ // Wrap values in double-quotes.
$oauth = array_map(create_function('$h','return "\"$h\"";'), $oauth);
-
$oauth = http_build_query($oauth, '', ', ');
$oauth = str_replace('%22', '"', $oauth);
@@ -177,10 +170,10 @@
$options['headers'] = $headers;
- $response = wp_remote_get($endpoint, $options);
+ $response = wp_remote_get(self::ENDPOINT, $options);
if ( is_a($response, 'WP_Error') )
- return false;
+ return $pushedTweet;
if ( 200 == $response['response']['code'] && ! empty($response['body']) ) {
$body = json_decode($response['body']);
@@ -189,9 +182,14 @@
return $data;
}
- return false;
+ return $pushedTweet;
}
+ function isWebKitLink ($Tweet) {
+ return ( ! empty($Tweet->entities->urls[0]->expanded_url)
+ && preg_match('!webkit.org/.+?!', $Tweet->entities->urls[0]->expanded_url) == 1 );
+ }
+
} // END class WebKitTwitterTileWidget
register_widget('WebKitTwitterTileWidget');
\ No newline at end of file
