Changeset 736685

Timestamp:

07/05/2013 01:51:22 PM (12 years ago)

Author:

simonwheatley

Message:

New code for v0.6

Location:

tweet-watcher/trunk

Files:

• class-tweet-watcher.php (modified) (3 diffs)
• class-twitter-oauth.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• templates-admin/confirm-unauthenticate.php (added)
• templates-admin/settings.php (modified) (1 diff)
• tweet-watcher.php (modified) (2 diffs)

tweet-watcher/trunk/class-tweet-watcher.php

@@ -235 +235 @@
         foreach ( $users as $user_id => & $user ) {
             $args = array( 'include_entities' => 'true', 'count' => 100 );
-            if ( isset( $user[ 'last_mention_id' ] ) ) {
+            if ( isset( $user[ 'last_mention_id' ] ) && $user[ 'last_mention_id' ] ) {
                 $args[ 'since_id' ] = $user[ 'last_mention_id' ];
             }
@@ -241 +241 @@
                 $queued_mentions = (array) get_option( 'twtwchr_queued_mentions', array() );
                 foreach ( $mentions as & $mention ) {
+                    // error_log( "TW: Queue $mention->id_str" );
                     array_unshift( $queued_mentions, $mention );
                 }
@@ -259 +260 @@
         foreach ( $users as $user_id => & $user ) {
             $args = array( 'include_entities' => 'true', 'include_rts' => 'true', 'contributor_details' => 'true', 'count' => 100 );
-            if ( isset( $user[ 'last_tweet_id' ] ) ) {
+            if ( isset( $user[ 'last_tweet_id' ] ) && $user[ 'last_tweet_id' ] ) {
                 $args[ 'since_id' ] = $user[ 'last_tweet_id' ];
             }
-            if ( $mentions = $this->oauth->get_tweets( $user_id, $args ) ) {
+            if ( $tweets = $this->oauth->get_tweets( $user_id, $args ) ) {
                 $queued_tweets = (array) get_option( 'twtwchr_queued_tweets', array() );
-                foreach ( $mentions as & $mention ) {
-                    array_unshift( $queued_tweets, $mention );
+                foreach ( $tweets as & $tweet ) {
+                    array_unshift( $queued_tweets, $tweet );
                 }
                 update_option( 'twtwchr_queued_tweets', $queued_tweets );
-                $last_tweet = array_shift( $mentions );
+                $last_tweet = array_shift( $tweets );
                 $this->oauth->set_user_property( $user_id, 'last_tweet_id', $last_tweet->id_str );
             }

tweet-watcher/trunk/class-twitter-oauth.php

@@ -30 +30 @@
         $params = array_merge( $params, $override_params );
         
-        $response = $this->do_oauth( 'https://api.twitter.com/1/statuses/mentions.json', 'GET', $params, $user[ 'oauth_token_secret' ] );
+        $response = $this->do_oauth( 'https://api.twitter.com/1.1/statuses/mentions.json', 'GET', $params, $user[ 'oauth_token_secret' ] );
         return json_decode( wp_remote_retrieve_body( $response ) );
     }
@@ -51 +51 @@
         $params = array_merge( $params, $override_params );
         
-        $response = $this->do_oauth( 'https://api.twitter.com/1/statuses/user_timeline.json', 'GET', $params, $user[ 'oauth_token_secret' ] );
+        $response = $this->do_oauth( 'https://api.twitter.com/1.1/statuses/user_timeline.json', 'GET', $params, $user[ 'oauth_token_secret' ] );
+        return json_decode( wp_remote_retrieve_body( $response ) );
+    }
+    
+    function get_tweet_as_user( $user_id, $tweet_id_str, $override_params = array() ) {
+        // https://api.twitter.com/1/statuses/show.json?id=XXX
+        
+        if ( ! $user = $this->get_user( $user_id ) )
+            return new WP_Error( 'twtwchr_twitter_error', __( 'No user exists for that User ID. (Error 200)', 'twtwchr' ) );
+
+        $params = array();
+        $params['id'] = $tweet_id_str;
+        $params['user_id'] = $user_id;
+        $params['oauth_consumer_key'] = $this->oauth_consumer_key;
+        $params['oauth_nonce'] = $this->get_nonce();
+        $params['oauth_signature_method'] = 'HMAC-SHA1';
+        $params['oauth_timestamp'] = time() + $this->oauth_time_offset;
+        $params['oauth_token'] = $user[ 'oauth_token' ];
+        $params['oauth_version'] = '1.0';
+        
+        $params = array_merge( $params, $override_params );
+        
+        $response = $this->do_oauth( 'https://api.twitter.com/1/statuses/show.json', 'GET', $params, $user[ 'oauth_token_secret' ] );
         return json_decode( wp_remote_retrieve_body( $response ) );
     }
@@ -235 +257 @@
         if ( ! isset( $users[ $user_id ] ) )
             return false;
+        $user = & $users[ $user_id ][ 'last_tweet_id' ];
         return $users[ $user_id ];
     }
     
     function get_users() {
-        return $this->get_property( 'users', array() );
+        $users = $this->get_property( 'users', array() );
+        foreach ( $users as & $user ) {
+            $user[ 'last_tweet_id' ] = isset( $user[ 'last_tweet_id' ] ) ? $user[ 'last_tweet_id' ] : null;
+            $user[ 'last_mention_id' ] = isset( $user[ 'last_mention_id' ] ) ? $user[ 'last_mention_id' ] : null;
+        }
+        return $users;
     }
     

tweet-watcher/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.4.2
 Tested up to: 3.4.2
-Stable tag: 0.3
+Stable tag: 0.6
  
 A WordPress plugin which authenticates with a number of Twitter accounts and watches their mention and tweet stream, firing actions for each mention or tweet.
@@ -16 +16 @@
 
 == Changelog ==
+
+= 0.6 =
+
+Friday 05 July 2013
+
+* BUGFIX: Don't set `since_id` if it's not available, as Twitter will object
+* FIDDLING: Rename `$mention` to `$tweet` when talking about tweets not mentions
+* BUGFIX: User Twitter API v1.1, so it actually works
+
+= 0.5 =
+
+Wednesday 5 December 2012
+
+* BUGFIX: Removed some PHP notices from settings page for unset indexes on the $user array
+* BUGFIX: Remove stray error_log call.
 
 = 0.4 =

tweet-watcher/trunk/templates-admin/settings.php

@@ -41 +41 @@
     <?php endif; ?>
         
-    <p><a href="<?php echo esc_url( $auth_url ); ?>" class="button button-primary">Authenticate a new acccount</a></p>
+    <p><a href="<?php echo esc_url( $auth_url ); ?>" class="button button-primary">Authenticate a new account</a></p>
     
 </div>

tweet-watcher/trunk/tweet-watcher.php

@@ -5 +5 @@
 Plugin URI: https://github.com/simonwheatley/Tweet-Watcher/
 Description: Authenticates with a number of Twitter accounts and fires actions for each mention or tweet.
-Version: 0.4
+Version: 0.6
 Author: Simon Wheatley (Code for the People)
 Author URI: http://codeforthepeople.com/
@@ -42 +42 @@
     return __FILE__;
 }
-
-?>