cinch-twitter 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c78167e8dea6ad52e63fde4d37a76883fb6dbc8
-  data.tar.gz: 108e50c4e34bca3660891fc63b09af43240c9b79
+  metadata.gz: 97cce969296f624998cd0b31d92b943bf6472f5c
+  data.tar.gz: 2c70ea9305bb6a05926417a89d879ac025c11bb2
 SHA512:
-  metadata.gz: cd97aa5ab04f56e044b00e0e52e063f4f23ede8851e7f6cc739144efc258bdcd23a05e0e0a11967804a79309548a13149f9e784e2f054bf4fa0ffa6674adda2e
-  data.tar.gz: 2429229aae5a5234f8271eeebfb01eb49fa691aa779873114f01bbce34346bfb9230f0dd77ea2957a65bc9a92037d88aed4d3daca402d5b6ae6959414dae18de
+  metadata.gz: f55352869ccbab0d74aadf073b1f48d0a993338ebcf40f7e42780fee0bbd2eb6bf2dcd98f311b9f0c9c89a6d60dee51efa4c06f77edb33711813391298e43db8
+  data.tar.gz: 02557810e739f718fe157772a884e267f64c2b73822af5dad1cfb826fb8a648b725ee31bdacaa50b50a5f04d59181634142fbe57ec5fa856e7d53aa9aaaf8352

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 2.0.3
+  * Fixes many regressions introduced in 2.0.2, including URLs not being expanded and parts of the tweet metadata being blank (i.e. 'from XXX')
+  * Switches back to UTC time for all tweet output
+  * Various small fixes
+
 # Version 2.0.2
   * Brings everything up to the latest version of the Twitter gem. Portions rewritten by @Namasteh.
 

data/lib/cinch/plugins/twitter/version.rb

@@ -1,5 +1,5 @@
 module Cinch
   module Twitter
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

data/lib/cinch/plugins/twitter.rb

@@ -16,7 +16,7 @@ module Cinch
         Usage:
         * !tw <handle(-D)>: Fetch the latest Tweet from the bot or include an offset (I.E. !tw someuser-2) to fetch (-D) Tweets back (up to 19)
         * @<handle(-D): Same as above, just shorthand.
-        * !t-search <terms>: Searches recent tweets containing your terms and returns the most recent three. You can search hash tags or do 'to:<handle>' to get the most recent tweets sent to that handle.
+        * !t-search <terms>: Searches recent tweets containing your terms and returns the most recent four. You can search hash tags or do 'to:<handle>' to get the most recent tweets sent to that handle.
         USAGE
 
       def initialize(*args)
@@ -30,13 +30,13 @@ module Cinch
       def execute_tweet(m, username, offset)
         offset ||= 0
 
-        user = @client.user(username)
+        user = @client.user(username, include_entities: "1")
 
         return m.reply "This user's tweets are protected!" if user.protected?
         return m.reply "This user hasn't tweeted yet!" if user.status.nil?
 
         if offset.to_i > 0
-          tweets = @client.user_timeline(user)
+          tweets = @client.user_timeline(user, include_entities: "1")
           return m.reply "You can not backtrack more than #{tweets.count.pred} tweets before the current tweet!" if offset.to_i > tweets.count.pred
           tweet = tweets[offset.to_i]
 
@@ -53,7 +53,7 @@ module Cinch
       match /t-search (.+)/, method: :execute_search
 
       def execute_search(m, term)    
-        @client.search("#{term}", :result_type => "recent").take(3).each do |tweet|
+        @client.search("#{term}", :result_type => "recent").take(4).each do |tweet|
         m.reply format_tweet(tweet)
       end
     end
@@ -62,7 +62,7 @@ module Cinch
       match /#(\d+)$/, method: :execute_id, prefix: /^@/
 
       def execute_id(m, id)
-        tweet = @client.status(id)
+        tweet = @client.status(id, include_entities: "1")
 
         m.reply format_tweet(tweet)
       rescue ::Twitter::Error::NotFound => e
@@ -82,29 +82,28 @@ module Cinch
         end
 
         # Tweet tweet
-        body = expand_uris(CGI.unescapeHTML(!!tweet.retweet? ? tweet.retweeted_status.full_text : tweet.full_text).gsub("\n", " ").squeeze(" "), tweet.urls)
-
+        body = CGI.unescapeHTML(!!tweet.retweet? ? tweet.retweeted_status.full_text : tweet.full_text).gsub("\n", " ").squeeze(" ")
+        body = expand_uris(body, tweet.urls)
+        
         # Metadata
-        ttime = tweet.created_at
+        ttime = tweet.created_at.getutc
         tail = []
-        tail << ttime.ago.to_words
-        tail << "from #{tweet.place.full_name}" if !!tweet.place
+        tail << ttime.ago.to_time.strftime('%b %-e %Y, %-l:%M %p %Z')
+        tail << "from #{tweet.place.full_name}" if !tweet.place.nil? && !!tweet.place.full_name
         tail << "via #{tweet.source.gsub( %r{</?[^>]+?>}, "" )}"
 
         # URLs for tweet and replied to:
         urls = []
-        urls << "https://twitter.com/#{tweet.user.screen_name}/status/#{tweet.id}"
+        urls << tweet.url
         urls << "in reply to #{format_reply_url(tweet.in_reply_to_screen_name, tweet.in_reply_to_status_id)}" if tweet.reply?
 
         [Format(:bold, [*head, "»"] * " "), body, ["(", tail * " · ", ")"].join, urls * " "].join(" ")
       end
 
-      def format_reply_url(username, id)
-        "https://twitter.com/#{username}#{"/status/#{id}" if !!id}"
-      end
-
       def expand_uris(t, uris)
-        uris.each_with_object(t) {            |entity, tweet| tweet.gsub!(entity.url, entity.expanded_url)        }
+        uris.each_with_object(t) { |entity, tweet| 
+          tweet.gsub!(entity.url.to_s, entity.expanded_url.to_s) 
+        }
       end
 
       def twitter_client          
@@ -118,5 +117,3 @@ module Cinch
     end
   end
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Mark SeymourRichard Banks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter