Changeset 829996

Timestamp:

12/30/2013 04:34:19 AM (11 years ago)

Author:

alexkingorg

Message:

version 3.1

Location:

twitter-tools/trunk

Files:

• README.txt (modified) (2 diffs)
• classes/aktt.php (modified) (2 diffs)
• classes/aktt_account.php (modified) (2 diffs)
• classes/aktt_tweet.php (modified) (8 diffs)
• twitter-tools.php (modified) (1 diff)
• views/admin-account.php (modified) (1 diff)

twitter-tools/trunk/README.txt

@@ -2 +2 @@
 Contributors: alexkingorg, crowdfavorite
 Tags: twitter, tweet, integration, post, notify, integrate, archive, widget, shortcode, social
-Requires at least: 3.4
-Tested up to: 3.5.1
-Stable tag: 3.0.4
+Requires at least: 3.
+Tested up to: 3.
+Stable tag: 3.0.
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -141 +141 @@
 == Upgrade Notice ==
 
-Version 3.0.4 brings support for Twitter API v1.1.
-
-Version 3.0 is a complete rewrite that utilizes <a href="http://wordpress.org/extend/plugins/social/">Social</a> to make connecting your Twitter account easy. It is compatibile with the latest Twitter API changes as of October 11, 2012. Please see the <a href="http://alexking.org/blog/2012/10/12/twitter-tools-3-0-faq">FAQ</a> for more details.
+Version 3.1 brings support for Social 2.10's CRON action names and requires Social 2.10 and WordPress 3.8. It also adds a setting for the publish/draft status of blog posts created from tweets. Now you can set your blog posts to be created as drafts, then publish only the ones you choose to. We've also improved native RT support.
+
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
 
 = 3.0.4 =

twitter-tools/trunk/classes/aktt.php

@@ -3 +3 @@
 class AKTT {
     // settings: aktt_v3_settings
-    static $ver = '3.0.1';
+    static $ver = '3.1';
     static $enabled = false;
     static $prefix = 'aktt_';
@@ -78 +78 @@
         
         // Cron Hooks
-        add_action('social_cron_15', array('AKTT', 'import_tweets'));
+        add_action('social15', array('AKTT', 'import_tweets'));
         add_action('aktt_backfill_tweets', array('AKTT', 'backfill_tweets'));
         

twitter-tools/trunk/classes/aktt_account.php

@@ -37 +37 @@
                 'value' => 0,
                 'type'  => 'is_cat',
+
+
+
+
+
+
             ),
             'post_tags' => array( // tags to add to posts created from this acct
@@ -167 +173 @@
             'post_category' => $this->option('post_category'),
             'post_tags' => $this->option('post_tags'),
+
             'title_prefix' => $this->option('blog_post_title'),
         );

twitter-tools/trunk/classes/aktt_tweet.php

@@ -91 +91 @@
      */
     public function content() {
+
+
+
         if (isset($this->data) && isset($this->data->text)) {
             return $this->data->text;
@@ -142 +145 @@
      */
     public function hashtags() {
-        return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->hashtags : array());
+        if ($this->is_native_retweet()) {
+            return (isset($this->data->retweeted_status->entities) ? $this->data->retweeted_status->entities->hashtags : array());
+        }
+        else {
+            return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->hashtags : array());
+        }
     }
     
@@ -151 +159 @@
      */
     public function mentions() {
-        return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->user_mentions : array());
+        if ($this->is_native_retweet()) {
+            return (isset($this->data->retweeted_status->entities) ? $this->data->retweeted_status->entities->user_mentions : array());
+        }
+        else {
+            return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->user_mentions : array());
+        }
     }
     
@@ -160 +173 @@
      */
     public function urls() {
-        return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->urls : array());
+        if ($this->is_native_retweet()) {
+            return (isset($this->data->retweeted_status->entities) ? $this->data->retweeted_status->entities->urls : array());
+        }
+        else {
+            return (isset($this->data) && isset($this->data->entities) ? $this->data->entities->urls : array());
+        }
     }
     
@@ -288 +306 @@
 
     /**
-     * Is this a retweet?
+     * Is this a native retweet?
+     *
+     * @return bool
+     */
+    function is_native_retweet() {
+        return (bool) (isset($this->data) && !empty($this->data->retweeted_status));
+    }
+
+
+    /**
+     * Is this a retweet? (This includes both native and non-native retweets.)
      *
      * @return bool
      */
     function is_retweet() {
-        return (bool) (AKTT::substr($this->content(), 0, 2) == 'RT' || !empty($this->data->retweeted_status));
+        return (bool) (AKTT::substr($this->content(), 0, 2) == 'RT' || ));
     }
     
@@ -313 +341 @@
     }
     
-    function link_entities($defer_to_anywhere = true) {
+    function link_entities($de = true) {
         $entities = array();
 // mentions
-        $anywhere = Social::option('twitter_anywhere_api_key');
-        if (!$defer_to_anywhere || empty($anywhere) || is_feed()) {
-            foreach ($this->mentions() as $entity) {
-                $entities['start_'.str_pad($entity->indices[0], 5, '0', STR_PAD_LEFT)] = array(
-                    'find' => $entity->screen_name,
-                    'replace' => AKTT::profile_link($entity->screen_name),
-                    'start' => $entity->indices[0],
-                    'end' => $entity->indices[1],
-                );
-            }
+        foreach ($this->mentions() as $entity) {
+            $entities['start_'.str_pad($entity->indices[0], 5, '0', STR_PAD_LEFT)] = array(
+                'find' => $entity->screen_name,
+                'replace' => AKTT::profile_link($entity->screen_name),
+                'start' => $entity->indices[0],
+                'end' => $entity->indices[1],
+            );
         }
 // hashtags
@@ -367 +392 @@
             $diff += AKTT::strlen($entity['replace']) - ($end - $start);
         }
+
+
+
+
+
+
         return $str;
     }
@@ -556 +587 @@
 //              'post_tag' => array_map('trim', explode(',', $post_tags)),
 //          ),
-            'post_status' => 'publish',
+            'post_status' => ,
             'post_type' => 'post',
             'post_date' => date('Y-m-d H:i:s', AKTT::gmt_to_wp_time($gmt_time)),

twitter-tools/trunk/twitter-tools.php

@@ -4 +4 @@
 Plugin URI: http://crowdfavorite.com/wordpress/plugins/twitter-tools/
 Description: An integration between your WordPress site and Twitter. Create posts from your tweets. Show your tweets in your sidebar. Relies on <a href="http://wordpress.org/extend/plugins/social/">Social</a>.
-Version: 3.0.4
+Version: 3.
 Author: Crowd Favorite
 Author URI: http://crowdfavorite.com

twitter-tools/trunk/views/admin-account.php

@@ -49 +49 @@
             </p>
             <p>
+
+
+
+
+
+
+
+
+
+
+
                 <label class="left" for="<?php echo esc_attr(sprintf($name, 'post_tags')); ?>"><?php _e('Tags', 'twitter-tools'); ?></label>
                 <input type="text" class="type-ahead" data-tax="post_tag" name="<?php echo esc_attr(sprintf($name, 'post_tags')); ?>" id="<?php echo esc_attr(sprintf($name, 'post_tags')); ?>" value="<?php echo esc_attr($account->option('post_tags')); ?>" />  <span class="help"><?php _e('(comma separated)', 'twitter-tools'); ?></span>